Merge pull request #624 from bmish/eslint-plugin-unicorn

Add eslint-plugin-unicorn internally and fix recommended rules

Author: bmish

.eslintrc.js

@@ -4,13 +4,15 @@ module.exports = {
   root: true,
   parserOptions: {
     ecmaVersion: 2017,
+    sourceType: 'script'
   },
   plugins: [
     'eslint-plugin',
     'filenames',
     'import',
     'node',
-    'prettier'
+    'prettier',
+    'unicorn'
   ],
   extends: [
     'eslint:recommended',
@@ -19,6 +21,7 @@ module.exports = {
     'plugin:import/errors',
     'plugin:import/warnings',
     'plugin:node/recommended',
+    'plugin:unicorn/recommended',
     'prettier'
   ],
   env: {
@@ -117,6 +120,9 @@ module.exports = {
     'import/no-useless-path-segments': 'error',
     'import/no-webpack-loader-syntax': 'error',
     'import/unambiguous': 'error',
+
+    // Unicorn rules:
+    'unicorn/prevent-abbreviations': 'off'
   },
   overrides: [
     // test files

lib/rules/alias-model-in-controller.js

@@ -42,8 +42,8 @@ module.exports = {
           const parsedArgs = utils.parseArgs(property.value);
 
           if (
-            parsedCallee.length &&
-            ['alias', 'readOnly', 'reads'].indexOf(parsedCallee.pop()) > -1 &&
+            parsedCallee.length > 0 &&
+            ['alias', 'readOnly', 'reads'].includes(parsedCallee.pop()) &&
             (parsedArgs[0] === 'model' || String(parsedArgs[0]).startsWith('model.'))
           ) {
             aliasPresent = true;

lib/rules/avoid-leaking-state-in-ember-objects.js

@@ -87,7 +87,7 @@ module.exports = {
         const properties = ember.getModuleProperties(node);
 
         properties
-          .filter(property => property.key && ignoredProperties.indexOf(property.key.name) === -1)
+          .filter(property => property.key && !ignoredProperties.includes(property.key.name))
           .forEach(property => {
             if (!isAllowed(property.value)) {
               report(property);

lib/rules/computed-property-getters.js

@@ -43,7 +43,7 @@ module.exports = {
 
     const requireGetterOnlyWithASetterInComputedProperty = function(node) {
       const objectExpressions = node.arguments.filter(arg => types.isObjectExpression(arg));
-      if (objectExpressions.length) {
+      if (objectExpressions.length > 0) {
         const { properties } = objectExpressions[0];
         const getters = properties.filter(
           prop => prop.key && prop.key.name && prop.key.name === 'get'
@@ -62,7 +62,7 @@ module.exports = {
 
     const preventGetterInComputedProperty = function(node) {
       const objectExpressions = node.arguments.filter(arg => types.isObjectExpression(arg));
-      if (objectExpressions.length) {
+      if (objectExpressions.length > 0) {
         const { properties } = objectExpressions[0];
         const getters = properties.filter(
           prop => prop.key && prop.key.name && prop.key.name === 'get'
@@ -80,7 +80,7 @@ module.exports = {
       const objectExpressions = node.arguments.filter(arg => types.isObjectExpression(arg));
       const functionExpressions = node.arguments.filter(arg => types.isFunctionExpression(arg));
 
-      if (objectExpressions.length) {
+      if (objectExpressions.length > 0) {
         const { properties } = objectExpressions[0];
 
         const getters = properties.filter(
@@ -89,14 +89,14 @@ module.exports = {
         if (getters.length === 0) {
           report(node, ALWAYS_GETTER_MESSAGE);
         }
-      } else if (functionExpressions.length) {
+      } else if (functionExpressions.length > 0) {
         report(node, ALWAYS_GETTER_MESSAGE);
       }
     };
 
     return {
       CallExpression(node) {
-        if (ember.isComputedProp(node) && node.arguments.length) {
+        if (ember.isComputedProp(node) && node.arguments.length > 0) {
           if (requireGetters === 'always-with-setter') {
             requireGetterOnlyWithASetterInComputedProperty(node);
           }

lib/rules/jquery-ember-run.js

@@ -46,7 +46,7 @@ module.exports = {
         const callee = node.callee;
         const fnNodes = utils.findNodes(node.arguments, 'ArrowFunctionExpression');
 
-        if (isJqueryUsed(callee) && fnNodes.length) {
+        if (isJqueryUsed(callee) && fnNodes.length > 0) {
           fnNodes.forEach(fnNode => {
             const fnBody = fnNode.body.body;
             const fnExpressions = utils.findNodes(fnBody, 'ExpressionStatement');

lib/rules/named-functions-in-promises.js

@@ -58,16 +58,16 @@ module.exports = {
         }
       },
     };
-
-    function hasPromiseExpression(node) {
-      const callee = node.callee;
-      const promisesMethods = ['then', 'catch', 'finally'];
-
-      return (
-        types.isCallExpression(callee.object) &&
-        types.isIdentifier(callee.property) &&
-        promisesMethods.indexOf(callee.property.name) > -1
-      );
-    }
   },
 };
+
+function hasPromiseExpression(node) {
+  const callee = node.callee;
+  const promisesMethods = ['then', 'catch', 'finally'];
+
+  return (
+    types.isCallExpression(callee.object) &&
+    types.isIdentifier(callee.property) &&
+    promisesMethods.includes(callee.property.name)
+  );
+}

lib/rules/new-module-imports.js

@@ -102,8 +102,8 @@ module.exports = {
         const fullNames = getFullNames(fullName, node);
 
         // find a matching expression starting at the end
-        for (let i = 0; i < fullNames.length; i++) {
-          fullName = fullNames[i];
+        for (const element of fullNames) {
+          fullName = element;
 
           const key = fullName.replace(/^Ember\./, '');
           const match = GLOBALS[fullName];

lib/rules/no-actions-hash.js

@@ -20,14 +20,6 @@ module.exports = {
   },
 
   create: context => {
-    function inClassWhichCanContainActions(context, node) {
-      return (
-        ember.isEmberComponent(context, node) ||
-        ember.isEmberController(context, node) ||
-        ember.isEmberRoute(context, node)
-      );
-    }
-
     function reportActionsProp(properties) {
       const actionsProp = properties.find(property => ember.isActionsProp(property));
       if (actionsProp) {
@@ -49,3 +41,11 @@ module.exports = {
     };
   },
 };
+
+function inClassWhichCanContainActions(context, node) {
+  return (
+    ember.isEmberComponent(context, node) ||
+    ember.isEmberController(context, node) ||
+    ember.isEmberRoute(context, node)
+  );
+}

lib/rules/no-attrs-in-components.js

@@ -23,10 +23,6 @@ module.exports = {
   },
 
   create(context) {
-    function isThisAttrsExpression(node) {
-      return types.isThisExpression(node.object) && node.property.name === 'attrs';
-    }
-
     return {
       MemberExpression(node) {
         if (isThisAttrsExpression(node)) {
@@ -36,3 +32,7 @@ module.exports = {
     };
   },
 };
+
+function isThisAttrsExpression(node) {
+  return types.isThisExpression(node.object) && node.property.name === 'attrs';
+}

lib/rules/no-empty-attrs.js

@@ -40,7 +40,7 @@ module.exports = {
         );
 
         isDSAttr.forEach(attr => {
-          if (!attr.value.arguments.length) {
+          if (attr.value.arguments.length === 0) {
             report(attr.value);
           }
         });