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

Reorg build, fp, and lib files.

Browse Source
This commit is contained in:
John-David Dalton
2016-01-16 11:18:56 -08:00
parent f555cd2303
commit 9d2d4f39bc
13 changed files with 45 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
lib/fp/baseConvert.js
View File

@@ -1,226 +0,0 @@
var mapping = require('./mapping.js'),
mutateMap = mapping.mutate,
placeholder = {};
/**
* The base implementation of `convert` which accepts a `util` object of methods
* required to perform conversions.
*
* @param {Object} util The util object.
* @param {string} name The name of the function to wrap.
* @param {Function} func The function to wrap.
* @returns {Function|Object} Returns the converted function or object.
*/
function baseConvert(util, name, func) {
if (typeof func != 'function') {
func = name;
name = undefined;
}
if (func == null) {
throw new TypeError;
}
var isLib = name === undefined && typeof func.VERSION == 'string';
var _ = isLib ? func : {
'ary': util.ary,
'cloneDeep': util.cloneDeep,
'curry': util.curry,
'forEach': util.forEach,
'isFunction': util.isFunction,
'iteratee': util.iteratee,
'keys': util.keys,
'rearg': util.rearg
};
var ary = _.ary,
cloneDeep = _.cloneDeep,
curry = _.curry,
each = _.forEach,
isFunction = _.isFunction,
keys = _.keys,
rearg = _.rearg;
var baseArity = function(func, n) {
return n == 2
? function(a, b) { return func.apply(undefined, arguments); }
: function(a) { return func.apply(undefined, arguments); };
};
var baseAry = function(func, n) {
return n == 2
? function(a, b) { return func(a, b); }
: function(a) { return func(a); };
};
var cloneArray = function(array) {
var length = array ? array.length : 0,
result = Array(length);
while (length--) {
result[length] = array[length];
}
return result;
};
var createCloner = function(func) {
return function(object) {
return func({}, object);
};
};
var immutWrap = function(func, cloner) {
return overArg(func, cloner, true);
};
var iterateeAry = function(func, n) {
return overArg(func, function(func) {
return baseAry(func, n);
});
};
var iterateeRearg = function(func, indexes) {
return overArg(func, function(func) {
var n = indexes.length;
return baseArity(rearg(baseAry(func, n), indexes), n);
});
};
var overArg = function(func, iteratee, retArg) {
return function() {
var length = arguments.length,
args = Array(length);
while (length--) {
args[length] = arguments[length];
}
args[0] = iteratee(args[0]);
var result = func.apply(undefined, args);
return retArg ? args[0] : result;
};
};
var wrappers = {
'iteratee': function(iteratee) {
return function() {
var func = arguments[0],
arity = arguments[1];
arity = arity > 2 ? (arity - 2) : 1;
func = iteratee(func);
var length = func.length;
return (length && length <= arity) ? func : baseAry(func, arity);
};
},
'mixin': function(mixin) {
return function(source) {
var func = this;
if (!isFunction(func)) {
return mixin(func, Object(source));
}
var methods = [],
methodNames = [];
each(keys(source), function(key) {
var value = source[key];
if (isFunction(value)) {
methodNames.push(key);
methods.push(func.prototype[key]);
}
});
mixin(func, Object(source));
each(methodNames, function(methodName, index) {
var method = methods[index];
if (isFunction(method)) {
func.prototype[methodName] = method;
} else {
delete func.prototype[methodName];
}
});
return func;
};
},
'runInContext': function(runInContext) {
return function(context) {
return baseConvert(util, runInContext(context));
};
}
};
var wrap = function(name, func) {
var wrapper = wrappers[name];
if (wrapper) {
return wrapper(func);
}
if (mutateMap.array[name]) {
func = immutWrap(func, cloneArray);
}
else if (mutateMap.object[name]) {
func = immutWrap(func, createCloner(func));
}
else if (mutateMap.set[name]) {
func = immutWrap(func, cloneDeep);
}
var result;
each(mapping.caps, function(cap) {
each(mapping.aryMethod[cap], function(otherName) {
if (name == otherName) {
var indexes = mapping.iterateeRearg[name],
n = !isLib && mapping.aryIteratee[name];
result = ary(func, cap);
if (cap > 1 && !mapping.skipRearg[name]) {
result = rearg(result, mapping.methodRearg[name] || mapping.aryRearg[cap]);
}
if (indexes) {
result = iterateeRearg(result, indexes);
} else if (n) {
result = iterateeAry(result, n);
}
if (cap > 1) {
result = curry(result, cap);
}
return false;
}
});
return !result;
});
result || (result = func);
if (mapping.placeholder[name]) {
result.placeholder = placeholder;
}
return result;
};
if (!isLib) {
return wrap(name, func);
}
// Iterate over methods for the current ary cap.
var pairs = [];
each(mapping.caps, function(cap) {
each(mapping.aryMethod[cap], function(key) {
var func = _[mapping.key[key] || key];
if (func) {
pairs.push([key, wrap(key, func)]);
}
});
});
// Assign to `_` leaving `_.prototype` unchanged to allow chaining.
each(pairs, function(pair) {
_[pair[0]] = pair[1];
});
// Wrap the lodash method and its aliases.
each(keys(_), function(key) {
each(mapping.alias[key] || [], function(alias) {
_[alias] = _[key];
});
});
return _;
}
module.exports = baseConvert;

6
lib/fp/build.js → lib/fp/build-dist.js
View File

@@ -2,7 +2,6 @@
var _ = require('lodash'),
async = require('async'),
fs = require('fs-extra'),
path = require('path'),
webpack = require('webpack');
@@ -10,10 +9,11 @@ var minify = require('../common/minify.js');
var basePath = path.join(__dirname, '..', '..'),
distPath = path.join(basePath, 'dist'),
fpPath = path.join(basePath, 'fp'),
filename = 'lodash.fp.js';
var fpConfig = {
'entry': path.join(__dirname, 'convert.browser.js'),
'entry': path.join(fpPath, '_convertBrowser.js'),
'output': {
'path': distPath,
'filename': filename,
@@ -27,7 +27,7 @@ var fpConfig = {
};
var mappingConfig = {
'entry': path.join(__dirname, 'mapping.js'),
'entry': path.join(fpPath, '_mapping.js'),
'output': {
'path': distPath,
'filename': 'mapping.fp.js',

13
lib/fp/convert.browser.js
View File

@@ -1,13 +0,0 @@
var baseConvert = require('./baseConvert.js');
/**
* Converts `lodash` to an auto-curried iteratee-first data-last version.
*
* @param {Function} lodash The lodash function.
* @returns {Function} Returns the converted lodash function.
*/
function browserConvert(lodash) {
return baseConvert(lodash, lodash);
}
module.exports = browserConvert;

21
lib/fp/convert.js
View File

@@ -1,21 +0,0 @@
var _ = require('lodash'),
baseConvert = require('./baseConvert.js'),
util = require('./fp-util.js');
/**
* Converts `func` of `name` to an auto-curried iteratee-first data-last version.
* If `name` is an object, the methods on it will be converted and the object returned.
*
* @param {string} [name] The name of the function to wrap.
* @param {Function} [func] The function to wrap.
* @returns {Function|Object} Returns the converted function or object.
*/
function convert() {
var args = arguments,
name = args.length ? args[0] : _.noConflict().runInContext(),
func = args[1];
return baseConvert(util, name, func);
}
module.exports = convert;

16
lib/fp/convert.node.js
View File

@@ -1,16 +0,0 @@
var baseConvert = require('./baseConvert.js'),
util = require('./util.js');
/**
* Converts `func` of `name` to an auto-curried iteratee-first data-last version.
* If `name` is an object, the methods on it will be converted and the object returned.
*
* @param {string} name The name of the function to wrap.
* @param {Function} func The function to wrap.
* @returns {Function|Object} Returns the converted function or object.
*/
function nodeConvert(name, func) {
return baseConvert(util, name, func);
}
module.exports = nodeConvert;

10
lib/fp/fp-util.js
View File

@@ -1,10 +0,0 @@
module.exports = {
'ary': require('lodash/ary'),
'cloneDeep': require('lodash/cloneDeep'),
'curry': require('lodash/curry'),
'forEach': require('lodash/internal/arrayEach'),
'isFunction': require('lodash/isFunction'),
'iteratee': require('lodash/iteratee'),
'keys': require('lodash/internal/baseKeys'),
'rearg': require('lodash/rearg')
};

202
lib/fp/mapping.js
View File

@@ -1,202 +0,0 @@
module.exports = {
/** Used to map method names to their aliases. */
'alias': {
'ary': ['nAry'],
'assignIn': ['extend'],
'assignInWith': ['extendWith'],
'filter': ['whereEq'],
'flatten': ['unnest'],
'flow': ['pipe'],
'flowRight': ['compose'],
'forEach': ['each'],
'forEachRight': ['eachRight'],
'get': ['path', 'prop'],
'getOr': ['pathOr', 'propOr'],
'head': ['first'],
'includes': ['contains'],
'initial': ['init'],
'isEqual': ['equals'],
'mapValues': ['mapObj'],
'matchesProperty': ['pathEq'],
'omit': ['dissoc', 'omitAll'],
'overArgs': ['useWith'],
'overEvery': ['allPass'],
'overSome': ['somePass'],
'pick': ['pickAll'],
'propertyOf': ['propOf'],
'rest': ['unapply'],
'some': ['all'],
'spread': ['apply'],
'zipObject': ['zipObj']
},
/** Used to map method names to their iteratee ary. */
'aryIteratee': {
'assignWith': 2,
'assignInWith': 2,
'cloneDeepWith': 1,
'cloneWith': 1,
'dropRightWhile': 1,
'dropWhile': 1,
'every': 1,
'filter': 1,
'find': 1,
'findIndex': 1,
'findKey': 1,
'findLast': 1,
'findLastIndex': 1,
'findLastKey': 1,
'flatMap': 1,
'forEach': 1,
'forEachRight': 1,
'forIn': 1,
'forInRight': 1,
'forOwn': 1,
'forOwnRight': 1,
'isEqualWith': 2,
'isMatchWith': 2,
'map': 1,
'mapKeys': 1,
'mapValues': 1,
'partition': 1,
'reduce': 2,
'reduceRight': 2,
'reject': 1,
'remove': 1,
'some': 1,
'takeRightWhile': 1,
'takeWhile': 1,
'times': 1,
'transform': 2
},
/** Used to map ary to method names. */
'aryMethod': {
1:[
'attempt', 'ceil', 'create', 'curry', 'curryRight', 'floor', 'fromPairs',
'invert', 'iteratee', 'memoize', 'method', 'methodOf', 'mixin', 'over',
'overEvery', 'overSome', 'rest', 'reverse', 'round', 'runInContext',
'template', 'trim', 'trimEnd', 'trimStart', 'uniqueId', 'words'
],
2:[
'add', 'after', 'ary', 'assign', 'at', 'before', 'bind', 'bindKey',
'chunk', 'cloneDeepWith', 'cloneWith', 'concat', 'countBy', 'curryN',
'curryRightN', 'debounce', 'defaults', 'defaultsDeep', 'delay', 'difference',
'drop', 'dropRight', 'dropRightWhile', 'dropWhile', 'endsWith', 'eq',
'every', 'extend', 'filter', 'find', 'find', 'findIndex', 'findKey',
'findLast', 'findLastIndex', 'findLastKey', 'flatMap', 'forEach',
'forEachRight', 'forIn', 'forInRight', 'forOwn', 'forOwnRight', 'get',
'groupBy', 'gt', 'gte', 'has', 'hasIn', 'includes', 'indexOf', 'intersection',
'invoke', 'invokeMap', 'isEqual', 'isMatch', 'join', 'keyBy', 'lastIndexOf',
'lt', 'lte', 'map', 'mapKeys', 'mapValues', 'matchesProperty', 'maxBy',
'merge', 'minBy', 'omit', 'omitBy', 'orderBy', 'overArgs', 'pad', 'padEnd',
'padStart', 'parseInt', 'partition', 'pick', 'pickBy', 'pull', 'pullAll',
'pullAt', 'random', 'range', 'rangeRight', 'rearg', 'reject', 'remove',
'repeat', 'result', 'sampleSize', 'some', 'sortBy', 'sortedIndex',
'sortedIndexOf', 'sortedLastIndex', 'sortedLastIndexOf', 'sortedUniqBy',
'split', 'startsWith', 'subtract', 'sumBy', 'take', 'takeRight', 'takeRightWhile',
'takeWhile', 'tap', 'throttle', 'thru', 'times', 'truncate', 'union', 'uniqBy',
'uniqWith', 'unset', 'unzipWith', 'without', 'wrap', 'xor', 'zip', 'zipObject'
],
3:[
'assignInWith', 'assignWith', 'clamp', 'differenceBy', 'differenceWith',
'getOr', 'inRange', 'intersectionBy', 'intersectionWith', 'isEqualWith',
'isMatchWith', 'mergeWith', 'pullAllBy', 'reduce', 'reduceRight', 'replace',
'set', 'slice', 'sortedIndexBy', 'sortedLastIndexBy', 'transform', 'unionBy',
'unionWith', 'xorBy', 'xorWith', 'zipWith'
],
4:[
'fill', 'setWith'
]
},
/** Used to map ary to rearg configs. */
'aryRearg': {
2: [1, 0],
3: [2, 1, 0],
4: [3, 2, 0, 1]
},
/** Used to map method names to iteratee rearg configs. */
'iterateeRearg': {
'findKey': [1],
'findLastKey': [1],
'mapKeys': [1]
},
/** Used to map method names to rearg configs. */
'methodRearg': {
'clamp': [2, 0, 1],
'reduce': [2, 0, 1],
'reduceRight': [2, 0, 1],
'set': [2, 0, 1],
'setWith': [3, 1, 2, 0],
'slice': [2, 0, 1],
'transform': [2, 0, 1]
},
/** Used to iterate `mapping.aryMethod` keys. */
'caps': [1, 2, 3, 4],
/** Used to map keys to other keys. */
'key': {
'curryN': 'curry',
'curryRightN': 'curryRight',
'getOr': 'get'
},
/** Used to identify methods which mutate arrays or objects. */
'mutate': {
'array': {
'fill': true,
'pull': true,
'pullAll': true,
'pullAllBy': true,
'pullAt': true,
'remove': true,
'reverse': true
},
'object': {
'assign': true,
'assignIn': true,
'assignInWith': true,
'assignWith': true,
'defaults': true,
'defaultsDeep': true,
'merge': true,
'mergeWith': true
},
'set': {
'set': true,
'setWith': true
}
},
/** Used to track methods with placeholder support */
'placeholder': {
'bind': true,
'bindKey': true,
'curry': true,
'curryRight': true,
'partial': true,
'partialRight': true
},
/** Used to track methods that skip `_.rearg`. */
'skipRearg': {
'assign': true,
'assignIn': true,
'concat': true,
'defaults': true,
'defaultsDeep': true,
'difference': true,
'matchesProperty': true,
'merge': true,
'random': true,
'range': true,
'rangeRight': true,
'zip': true,
'zipObject': true
}
};

95
lib/fp/precompile.js
View File

@@ -1,95 +0,0 @@
var path = require('path');
var Module = require('module');
var _ = require('lodash/fp');
var mutatingAssign = require('lodash').assign;
var fs = require('fs');
var collectionModules = [
'array.js',
'collection.js',
'date.js',
'function.js',
'lang.js',
'math.js',
'number.js',
'object.js',
'string.js',
'util.js'
];
var utilityModules = [
'util.js', // XXX: Remove! Not actually an utility but a collection module but it interferes testing with the current releases...
'lodash.js',
'fp.js',
'chain.js'
];
var lodashPath = path.dirname(Module._resolveFilename('lodash', mutatingAssign(new Module, {
'paths': Module._nodeModulePaths(process.cwd())
})));
var mapping = require(lodashPath + '/fp/mapping');
var singleArgFns = mapping.aryMethod[1];
var extPattern = /\.js$/;
var isJSfile = extPattern.test.bind(extPattern);
var removeJSExt = function(filename) {
return filename.replace(extPattern, '');
};
var isCollectionModule = _.includes(_, collectionModules);
var isNotUtilityModule = _.negate(_.includes(_, utilityModules));
var isSingleArgFn = _.includes(_, singleArgFns);
var lodashModules = fs.readdirSync(lodashPath)
.filter(isJSfile)
.filter(isNotUtilityModule)
.map(removeJSExt);
var convertTemplate = _.template(
"var convert = require('./convert');\n" +
"module.exports = convert('<%= name %>', require('../<%= name %>'));\n"
);
var collectionTemplate = _.template(
"var convert = require('./convert');\n" +
"module.exports = convert(require('../<%= name %>'));\n"
);
var passThroughTemplate = _.template(
"module.exports = require('../<%= name %>');\n"
);
var moduleTemplate = function(name) {
var context = {name: name};
if (isCollectionModule(name + '.js')) {
return collectionTemplate(context);
}
if (isSingleArgFn(name)) {
return passThroughTemplate(context);
}
return convertTemplate(context);
};
function precompileFpWrappers(target) {
_.forEach(function(moduleName) {
fs.writeFileSync(
path.join(target, moduleName + '.js'),
moduleTemplate(moduleName)
);
}, lodashModules);
_.forEach(function(aliases, origName) {
_.forEach(function aliasName() {
fs.writeFileSync(
path.join(target, aliasName + '.js'),
moduleTemplate(origName)
);
}, aliases);
}, mapping.alias);
}
module.exports = precompileFpWrappers;

10
lib/fp/template/_util.jst Normal file
View File

@@ -0,0 +1,10 @@
module.exports = {
'ary': require('../ary'),
'cloneDeep': require('../cloneDeep'),
'curry': require('../curry'),
'forEach': require('../internal/arrayEach'),
'isFunction': require('../isFunction'),
'iteratee': require('../iteratee'),
'keys': require('../internal/baseKeys'),
'rearg': require('../rearg')
};

16
lib/fp/template/convert.jst Normal file
View File

@@ -0,0 +1,16 @@
var baseConvert = require('./_baseConvert'),
util = require('./_util');
/**
* Converts `func` of `name` to an immutable auto-curried iteratee-first data-last
* version. If `name` is an object its methods will be converted.
*
* @param {string} name The name of the function to wrap.
* @param {Function} [func] The function to wrap.
* @returns {Function|Object} Returns the converted function or object.
*/
function convert(name, func) {
return baseConvert(util, name, func);
}
module.exports = convert;