add static methods and ES6 collection methods to prefer-lodash-method

wix-incubator · Nov 25, 2015 · 7bcd3f2 · 7bcd3f2
1 parent 23c7723
commit 7bcd3f2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/lib/rules/prefer-lodash-chain.js b/lib/rules/prefer-lodash-chain.js
@@ -16,7 +16,7 @@ module.exports = function (context) {
     return {
         CallExpression: function (node) {
             var isLodashWrapperMethod = lodashUtil.isLodashWrapperMethod(node);
-            if (!lodashUtil.isLodashCall(node) && (lodashUtil.canBeLodashMethod(astUtil.getMethodName(node)) || isLodashWrapperMethod)) {
+            if (!lodashUtil.isLodashCall(node) && (lodashUtil.isNativeCollectionMethodCall(node) || isLodashWrapperMethod)) {
                 var caller = astUtil.getCaller(node);
                 if (lodashUtil.isLodashCall(caller) && astUtil.getMethodName(caller) !== 'chain' && !isLodashWrapperMethod ||
                     lodashUtil.isLodashWrapper(astUtil.getCaller(caller)) && lodashUtil.isChainBreaker(caller)) {

diff --git a/lib/rules/prefer-lodash-method.js b/lib/rules/prefer-lodash-method.js
@@ -8,14 +8,24 @@
 //------------------------------------------------------------------------------
 
 module.exports = function (context) {
+    var _ = require('lodash');
     var lodashUtil = require('../util/lodashUtil');
     var astUtil = require('../util/astUtil');
 
     var REPORT_MESSAGE = 'Prefer \'_.{{method}}\' over the native function.';
 
+    function isStaticNativeMethodCall(node) {
+        var staticMethods = {
+            Object: ['assign', 'create', 'keys', 'values'],
+            Array: ['isArray']
+        };
+        var callerName = _.get(node, 'callee.object.name');
+        return (callerName in staticMethods) && _.includes(staticMethods[callerName], astUtil.getMethodName(node));
+    }
+
     return {
         CallExpression: function (node) {
-            if (!lodashUtil.isLodashCall(node) && !lodashUtil.isLodashWrapper(astUtil.getCaller(node)) && lodashUtil.canBeLodashMethod(astUtil.getMethodName(node))) {
+            if (!(lodashUtil.isLodashCall(node) || lodashUtil.isLodashWrapper(astUtil.getCaller(node))) && (lodashUtil.isNativeCollectionMethodCall(node) || isStaticNativeMethodCall(node))) {
                 context.report(node, REPORT_MESSAGE, {method: astUtil.getMethodName(node)});
             }
         }

diff --git a/lib/util/lodashUtil.js b/lib/util/lodashUtil.js
@@ -59,8 +59,8 @@ function getIsTypeMethod(name) {
     return _.includes(types, name) ? 'is' + _.capitalize(name) : null;
 }
 
-function canBeLodashMethod(name) {
-    return _.includes(['forEach', 'map', 'reduce', 'filter', 'every', 'some'], name);
+function isNativeCollectionMethodCall(node) {
+    return _.includes(['every', 'fill', 'filter', 'find', 'findIndex', 'forEach', 'includes', 'indexOf', 'lastIndexOf', 'map', 'reduce', 'reduceRight', 'some'], astUtil.getMethodName(node));
 }
 
 function isLodashCollectionMethod(node) {
@@ -82,6 +82,6 @@ module.exports = {
     isCallToMethod: isCallToMethod,
     isLodashWrapperMethod: isLodashWrapperMethod,
     getIsTypeMethod: getIsTypeMethod,
-    canBeLodashMethod: canBeLodashMethod,
-    isLodashCollectionMethod: isLodashCollectionMethod
+    isLodashCollectionMethod: isLodashCollectionMethod,
+    isNativeCollectionMethodCall: isNativeCollectionMethodCall
 };
diff --git a/tests/lib/rules/prefer-lodash-chain.js b/tests/lib/rules/prefer-lodash-chain.js
@@ -13,7 +13,7 @@ var RuleTester = require('eslint').RuleTester;
 
 var ruleTester = new RuleTester();
 var errors = [{message: 'Prefer lodash chain'}];
-ruleTester.run('prefer-lodash-method', rule, {
+ruleTester.run('prefer-lodash-chain', rule, {
     valid: [
         'var userNames = users.map(function(user) { return user.name; });',
         'var userNames = _(users).filter({active: true}).map("name").value();',

diff --git a/tests/lib/rules/prefer-lodash-method.js b/tests/lib/rules/prefer-lodash-method.js
@@ -12,19 +12,22 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var errors = [{message: 'Prefer \'_.map\' over the native function.'}];
 ruleTester.run('prefer-lodash-method', rule, {
     valid: [
         'var x = _.map(arr, f)',
         'var x = _(arr).map(f).reduce(g)',
-        'var x = _.chain(arr).map(f).reduce(g).value()'
+        'var x = _.chain(arr).map(f).reduce(g).value()',
+        'var x = _.keys(obj)'
     ],
     invalid: [{
         code: 'var x = a.map(function(x) {return x.f()});',
-        errors: errors
+        errors: [{message: 'Prefer \'_.map\' over the native function.'}]
     }, {
-        code: 'var x = arr.map(x => x.f())',
+        code: 'var x = arr.filter(x => x.f())',
         ecmaFeatures: {arrowFunctions: true},
-        errors: errors
+        errors: [{message: 'Prefer \'_.filter\' over the native function.'}]
+    }, {
+        code: 'var x = Object.keys(node)',
+        errors: [{message: "Prefer '_.keys' over the native function."}]
     }]
 });