Bump to v4.7.0.

fp/_baseConvert.js

@@ -41,10 +41,12 @@ function baseConvert(util, name, func, options) {
   };
 
   var forceRearg = ('rearg' in options) && options.rearg,
-      placeholder = isLib ? func : fallbackHolder;
+      placeholder = isLib ? func : fallbackHolder,
+      pristine = isLib ? func.runInContext() : undefined;
 
   var helpers = isLib ? func : {
     'ary': util.ary,
+    'assign': util.assign,
     'clone': util.clone,
     'curry': util.curry,
     'forEach': util.forEach,
@@ -58,6 +60,7 @@ function baseConvert(util, name, func, options) {
   };
 
   var ary = helpers.ary,
+      assign = helpers.assign,
       clone = helpers.clone,
       curry = helpers.curry,
       each = helpers.forEach,
@@ -112,6 +115,10 @@ function baseConvert(util, name, func, options) {
     return result;
   };
 
+  var convertLib = function(options) {
+    return _.runInContext.convert(options)();
+  };
+
   var createCloner = function(func) {
     return function(object) {
       return func({}, object);
@@ -226,8 +233,19 @@ function baseConvert(util, name, func, options) {
   var wrap = function(name, func) {
     name = mapping.aliasToReal[name] || name;
     var wrapper = wrappers[name];
+
+    var convertMethod = function(options) {
+      var newUtil = isLib ? pristine : helpers,
+          newFunc = isLib ? pristine[name] : func,
+          newOptions = assign(assign({}, config), options);
+
+      return baseConvert(newUtil, name, newFunc, newOptions);
+    };
+
     if (wrapper) {
-      return wrapper(func);
+      var result = wrapper(func);
+      result.convert = convertMethod;
+      return result;
     }
     var wrapped = func;
     if (config.immutable) {
@@ -241,7 +259,6 @@ function baseConvert(util, name, func, options) {
         wrapped = immutWrap(func, cloneByPath);
       }
     }
-    var result;
     each(aryMethodKeys, function(aryKey) {
       each(mapping.aryMethod[aryKey], function(otherName) {
         if (name == otherName) {
@@ -275,9 +292,15 @@ function baseConvert(util, name, func, options) {
     });
 
     result || (result = wrapped);
+    if (result == func) {
+      result = function() {
+        return func.apply(this, arguments);
+      };
+    }
+    result.convert = convertMethod;
     if (mapping.placeholder[name]) {
       setPlaceholder = true;
-      func.placeholder = result.placeholder = placeholder;
+      result.placeholder = func.placeholder = placeholder;
     }
     return result;
   };
@@ -303,10 +326,11 @@ function baseConvert(util, name, func, options) {
     _[pair[0]] = pair[1];
   });
 
+  _.convert = convertLib;
   if (setPlaceholder) {
     _.placeholder = placeholder;
   }
-  // Wrap the lodash method and its aliases.
+  // Reassign aliases.
   each(keys(_), function(key) {
     each(mapping.realToAlias[key] || [], function(alias) {
       _[alias] = _[key];

fp/_mapping.js

@@ -1,22 +1,35 @@
 /** Used to map aliases to their real names. */
 exports.aliasToReal = {
+
+  // Lodash aliases.
+  'each': 'forEach',
+  'eachRight': 'forEachRight',
+  'entries': 'toPairs',
+  'entriesIn': 'toPairsIn',
+  'extend': 'assignIn',
+  'extendWith': 'assignInWith',
+  'first': 'head',
+
+  // Ramda aliases.
   '__': 'placeholder',
-  'all': 'some',
+  'all': 'every',
   'allPass': 'overEvery',
+  'always': 'constant',
+  'any': 'some',
+  'anyPass': 'overSome',
   'apply': 'spread',
   'assoc': 'set',
   'assocPath': 'set',
+  'complement': 'negate',
   'compose': 'flowRight',
   'contains': 'includes',
   'dissoc': 'unset',
   'dissocPath': 'unset',
-  'each': 'forEach',
-  'eachRight': 'forEachRight',
   'equals': 'isEqual',
-  'extend': 'assignIn',
-  'extendWith': 'assignInWith',
-  'first': 'head',
+  'identical': 'eq',
   'init': 'initial',
+  'invertObj': 'invert',
+  'juxt': 'over',
   'mapObj': 'mapValues',
   'omitAll': 'omit',
   'nAry': 'ary',
@@ -28,7 +41,6 @@ exports.aliasToReal = {
   'prop': 'get',
   'propOf': 'propertyOf',
   'propOr': 'getOr',
-  'somePass': 'overSome',
   'unapply': 'rest',
   'unnest': 'flatten',
   'useWith': 'overArgs',
@@ -45,32 +57,35 @@ exports.aryMethod = {
     'spread', 'template', 'trim', 'trimEnd', 'trimStart', 'uniqueId', 'words'
   ],
   '2': [
-    'add', 'after', 'ary', 'assign', 'assignIn', 'at', 'before', 'bind', 'bindKey',
-    'chunk', 'cloneDeepWith', 'cloneWith', 'concat', 'countBy', 'curryN',
+    'add', 'after', 'ary', 'assign', 'assignIn', 'at', 'before', 'bind', 'bindAll',
+    'bindKey', 'chunk', 'cloneDeepWith', 'cloneWith', 'concat', 'countBy', 'curryN',
     'curryRightN', 'debounce', 'defaults', 'defaultsDeep', 'delay', 'difference',
-    'drop', 'dropRight', 'dropRightWhile', 'dropWhile', 'endsWith', 'eq', 'every',
-    'filter', 'find', 'find', 'findIndex', 'findKey', 'findLast', 'findLastIndex',
-    'findLastKey', 'flatMap', 'flattenDepth', 'forEach', 'forEachRight', 'forIn',
-    'forInRight', 'forOwn', 'forOwnRight', 'get', 'groupBy', 'gt', 'gte', 'has',
-    'hasIn', 'includes', 'indexOf', 'intersection', 'invertBy', 'invoke', 'invokeMap',
-    'isEqual', 'isMatch', 'join', 'keyBy', 'lastIndexOf', 'lt', 'lte', 'map',
-    'mapKeys', 'mapValues', 'matchesProperty', 'maxBy', 'merge', 'minBy', 'omit',
-    'omitBy', 'overArgs', 'pad', 'padEnd', 'padStart', 'parseInt', 'partial',
-    'partialRight', 'partition', 'pick', 'pickBy', 'pull', 'pullAll', 'pullAt',
-    'random', 'range', 'rangeRight', 'rearg', 'reject', 'remove', 'repeat', 'result',
+    'divide', 'drop', 'dropRight', 'dropRightWhile', 'dropWhile', 'endsWith',
+    'eq', 'every', 'filter', 'find', 'find', 'findIndex', 'findKey', 'findLast',
+    'findLastIndex', 'findLastKey', 'flatMap', 'flatMapDeep', 'flattenDepth',
+    'forEach', 'forEachRight', 'forIn', 'forInRight', 'forOwn', 'forOwnRight',
+    'get', 'groupBy', 'gt', 'gte', 'has', 'hasIn', 'includes', 'indexOf',
+    'intersection', 'invertBy', 'invoke', 'invokeMap', 'isEqual', 'isMatch',
+    'join', 'keyBy', 'lastIndexOf', 'lt', 'lte', 'map', 'mapKeys', 'mapValues',
+    'matchesProperty', 'maxBy', 'meanBy', 'merge', 'minBy', 'multiply', 'omit', 'omitBy',
+    'overArgs', 'pad', 'padEnd', 'padStart', 'parseInt', 'partial', 'partialRight',
+    'partition', 'pick', 'pickBy', 'pull', 'pullAll', 'pullAt', 'random', 'range',
+    'rangeRight', 'rearg', 'reject', 'remove', 'repeat', 'restFrom', 'result',
     'sampleSize', 'some', 'sortBy', 'sortedIndex', 'sortedIndexOf', 'sortedLastIndex',
-    'sortedLastIndexOf', 'sortedUniqBy', 'split', 'startsWith', 'subtract', 'sumBy',
-    'take', 'takeRight', 'takeRightWhile', 'takeWhile', 'tap', 'throttle', 'thru',
-    'times', 'trimChars', 'trimCharsEnd', 'trimCharsStart', 'truncate', 'union',
-    'uniqBy', 'uniqWith', 'unset', 'unzipWith', 'without', 'wrap', 'xor', 'zip',
-    'zipObject', 'zipObjectDeep'
+    'sortedLastIndexOf', 'sortedUniqBy', 'split', 'spreadFrom', 'startsWith',
+    'subtract', 'sumBy', 'take', 'takeRight', 'takeRightWhile', 'takeWhile', 'tap',
+    'throttle', 'thru', 'times', 'trimChars', 'trimCharsEnd', 'trimCharsStart',
+    'truncate', 'union', 'uniqBy', 'uniqWith', 'unset', 'unzipWith', 'without',
+    'wrap', 'xor', 'zip', 'zipObject', 'zipObjectDeep'
   ],
   '3': [
     'assignInWith', 'assignWith', 'clamp', 'differenceBy', 'differenceWith',
-    'getOr', 'inRange', 'intersectionBy', 'intersectionWith', 'isEqualWith',
-    'isMatchWith', 'mergeWith', 'orderBy', 'pullAllBy', 'pullAllWith', 'reduce',
-    'reduceRight', 'replace', 'set', 'slice', 'sortedIndexBy', 'sortedLastIndexBy',
-    'transform', 'unionBy', 'unionWith', 'update', 'xorBy', 'xorWith', 'zipWith'
+    'getOr', 'inRange', 'intersectionBy', 'intersectionWith', 'invokeArgs',
+    'invokeArgsMap', 'isEqualWith', 'isMatchWith', 'flatMapDepth', 'mergeWith',
+    'orderBy', 'padChars', 'padCharsEnd', 'padCharsStart', 'pullAllBy',
+    'pullAllWith', 'reduce', 'reduceRight', 'replace', 'set', 'slice',
+    'sortedIndexBy', 'sortedLastIndexBy', 'transform', 'unionBy', 'unionWith',
+    'update', 'xorBy', 'xorWith', 'zipWith'
   ],
   '4': [
     'fill', 'setWith', 'updateWith'
@@ -86,10 +101,6 @@ exports.aryRearg = {
 
 /** Used to map method names to their iteratee ary. */
 exports.iterateeAry = {
-  'assignWith': 2,
-  'assignInWith': 2,
-  'cloneDeepWith': 1,
-  'cloneWith': 1,
   'dropRightWhile': 1,
   'dropWhile': 1,
   'every': 1,
@@ -101,14 +112,14 @@ exports.iterateeAry = {
   'findLastIndex': 1,
   'findLastKey': 1,
   'flatMap': 1,
+  'flatMapDeep': 1,
+  'flatMapDepth': 1,
   'forEach': 1,
   'forEachRight': 1,
   'forIn': 1,
   'forInRight': 1,
   'forOwn': 1,
   'forOwnRight': 1,
-  'isEqualWith': 2,
-  'isMatchWith': 2,
   'map': 1,
   'mapKeys': 1,
   'mapValues': 1,
@@ -134,8 +145,12 @@ exports.methodRearg = {
   'assignInWith': [1, 2, 0],
   'assignWith': [1, 2, 0],
   'getOr': [2, 1, 0],
+  'isEqualWith': [1, 2, 0],
   'isMatchWith': [2, 1, 0],
   'mergeWith': [1, 2, 0],
+  'padChars': [2, 1, 0],
+  'padCharsEnd': [2, 1, 0],
+  'padCharsStart': [2, 1, 0],
   'pullAllBy': [2, 1, 0],
   'pullAllWith': [2, 1, 0],
   'setWith': [3, 1, 2, 0],
@@ -147,8 +162,11 @@ exports.methodRearg = {
 
 /** Used to map method names to spread configs. */
 exports.methodSpread = {
+  'invokeArgs': 2,
+  'invokeArgsMap': 2,
   'partial': 1,
-  'partialRight': 1
+  'partialRight': 1,
+  'without': 1
 };
 
 /** Used to identify methods which mutate arrays or objects. */
@@ -214,6 +232,13 @@ exports.remap = {
   'curryN': 'curry',
   'curryRightN': 'curryRight',
   'getOr': 'get',
+  'invokeArgs': 'invoke',
+  'invokeArgsMap': 'invokeMap',
+  'padChars': 'pad',
+  'padCharsEnd': 'padEnd',
+  'padCharsStart': 'padStart',
+  'restFrom': 'rest',
+  'spreadFrom': 'spread',
   'trimChars': 'trim',
   'trimCharsEnd': 'trimEnd',
   'trimCharsStart': 'trimStart'
@@ -224,20 +249,27 @@ exports.skipRearg = {
   'add': true,
   'assign': true,
   'assignIn': true,
+  'bind': true,
+  'bindKey': true,
   'concat': true,
   'difference': true,
+  'divide': true,
+  'eq': true,
   'gt': true,
   'gte': true,
+  'isEqual': true,
   'lt': true,
   'lte': true,
   'matchesProperty': true,
   'merge': true,
+  'multiply': true,
   'partial': true,
   'partialRight': true,
   'random': true,
   'range': true,
   'rangeRight': true,
   'subtract': true,
+  'without': true,
   'zip': true,
   'zipObject': true
 };

fp/_util.js

@@ -1,5 +1,6 @@
 module.exports = {
   'ary': require('../ary'),
+  'assign': require('../_baseAssign'),
   'clone': require('../clone'),
   'curry': require('../curry'),
   'forEach': require('../_arrayEach'),

fp/all.js

@@ -1 +1 @@
-module.exports = require('./some');
+module.exports = require('./every');

fp/always.js

@@ -0,0 +1 @@
+module.exports = require('./constant');

fp/any.js

@@ -0,0 +1 @@
+module.exports = require('./some');

fp/bindAll.js

@@ -1 +1,2 @@
-module.exports = require('../bindAll');
+var convert = require('./convert');
+module.exports = convert('bindAll', require('../bindAll'));

fp/complement.js

@@ -0,0 +1 @@
+module.exports = require('./negate');

fp/divide.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('divide', require('../divide'));

fp/entries.js

@@ -0,0 +1 @@
+module.exports = require('./toPairs');

fp/entriesIn.js

@@ -0,0 +1 @@
+module.exports = require('./toPairsIn');

fp/flatMapDeep.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('flatMapDeep', require('../flatMapDeep'));

fp/flatMapDepth.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('flatMapDepth', require('../flatMapDepth'));

fp/identical.js

@@ -0,0 +1 @@
+module.exports = require('./eq');

fp/invertObj.js

@@ -0,0 +1 @@
+module.exports = require('./invert');

fp/invokeArgs.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('invokeArgs', require('../invoke'));

fp/invokeArgsMap.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('invokeArgsMap', require('../invokeMap'));

fp/juxt.js

@@ -0,0 +1 @@
+module.exports = require('./over');

fp/meanBy.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('meanBy', require('../meanBy'));

fp/multiply.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('multiply', require('../multiply'));

fp/padChars.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('padChars', require('../pad'));

fp/padCharsEnd.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('padCharsEnd', require('../padEnd'));

fp/padCharsStart.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('padCharsStart', require('../padStart'));

fp/restFrom.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('restFrom', require('../rest'));

fp/spreadFrom.js

@@ -0,0 +1,2 @@
+var convert = require('./convert');
+module.exports = convert('spreadFrom', require('../spread'));

fp/wrapperFlatMap.js

@@ -1 +0,0 @@
-module.exports = require('../wrapperFlatMap');