chore(lint): Enable several rules (#1617)

* Add back `--ignore-path .gitignore`

* Disable `allowElseIf` in `no-else-return` rule

* Enable `no-void` rule

* Enable `array-callback-return` rule

* Enable `no-useless-call` rule

* api/traversing.js: replace if statement with a ternary

* Use `Array.isArray`

* Use `new Error` instead of `Error`

* Enable `no-lonely-if` rule

* test/cheerio.js: fix require

* Enable `yoda` rule

.eslintrc.json

@@ -6,12 +6,27 @@
   "extends": ["eslint:recommended", "plugin:jsdoc/recommended", "prettier"],
   "globals": { "Set": true, "Symbol": true },
   "rules": {
+    "array-callback-return": [
+      "error",
+      {
+        "allowImplicit": true
+      }
+    ],
+    "no-lonely-if": 2,
     "no-proto": 2,
     "curly": [2, "multi-line"],
     "one-var": [2, "never"],
-    "no-else-return": 2,
+    "no-else-return": [
+      2,
+      {
+        "allowElseIf": false
+      }
+    ],
     "no-shadow": 2,
+    "no-useless-call": 2,
     "no-use-before-define": [2, "nofunc"],
+    "no-void": 2,
+    "yoda": 2,
 
     "jsdoc/require-jsdoc": 0,
     "jsdoc/check-param-names": 2,

.gitignore

@@ -1,5 +1,5 @@
 node_modules
 npm-debug.log
 .DS_Store
-/coverage
-/docs/out/
+/coverage/
+/docs/

benchmark/suite.js

@@ -71,7 +71,7 @@ Suites.prototype._benchJsDom = function (suite, markup, options) {
   var setupData = options.setup && options.setup.call(null, dom.window.$);
 
   suite.add('jsdom', function () {
-    testFn.call(null, dom.window.$, setupData);
+    testFn(dom.window.$, setupData);
   });
   suite.run();
 };
@@ -82,6 +82,6 @@ Suites.prototype._benchCheerio = function (suite, markup, options) {
   var setupData = options.setup && options.setup.call(null, $);
 
   suite.add('cheerio', function () {
-    testFn.call(null, $, setupData);
+    testFn($, setupData);
   });
 };

lib/api/attributes.js

@@ -346,7 +346,8 @@ exports.data = function (name, value) {
       setData(el, name, value);
     });
     return this;
-  } else if (hasOwn.call(elem.data, name)) {
+  }
+  if (hasOwn.call(elem.data, name)) {
     return elem.data[name];
   }
 

lib/api/css.js

@@ -38,7 +38,7 @@ exports.css = function (prop, val) {
  * @param {number} [idx] - Optional index within the selection.
  */
 function setCss(el, prop, val, idx) {
-  if ('string' == typeof prop) {
+  if (typeof prop == 'string') {
     var styles = getCss(el);
     if (typeof val === 'function') {
       val = val.call(el, idx, styles[prop]);
@@ -51,7 +51,7 @@ function setCss(el, prop, val, idx) {
     }
 
     el.attribs.style = stringify(styles);
-  } else if ('object' == typeof prop) {
+  } else if (typeof prop == 'object') {
     Object.keys(prop).forEach(function (k) {
       setCss(el, k, prop[k]);
     });
@@ -73,7 +73,8 @@ function getCss(el, prop) {
   var styles = parse(el.attribs.style);
   if (typeof prop === 'string') {
     return styles[prop];
-  } else if (Array.isArray(prop)) {
+  }
+  if (Array.isArray(prop)) {
     var newStyles = {};
     prop.forEach(function (item) {
       if (styles[item] != null) {

lib/api/manipulation.js

@@ -28,16 +28,19 @@ var DomUtils = require('htmlparser2').DomUtils;
 exports._makeDomArray = function makeDomArray(elem, clone) {
   if (elem == null) {
     return [];
-  } else if (elem.cheerio) {
+  }
+  if (elem.cheerio) {
     return clone ? cloneDom(elem.get()) : elem.get();
-  } else if (Array.isArray(elem)) {
+  }
+  if (Array.isArray(elem)) {
     return elem.reduce(
       function (newElems, el) {
         return newElems.concat(this._makeDomArray(el, clone));
       }.bind(this),
       []
     );
-  } else if (typeof elem === 'string') {
+  }
+  if (typeof elem === 'string') {
     return parse(elem, this.options, false).children;
   }
   return clone ? cloneDom([elem]) : [elem];
@@ -798,7 +801,8 @@ exports.text = function (str) {
   // If `str` is undefined, act as a "getter"
   if (str === undefined) {
     return text(this);
-  } else if (typeof str === 'function') {
+  }
+  if (typeof str === 'function') {
     // Function support
     return domEach(this, function (i, el) {
       return exports.text.call(this._make(el), str.call(el, i, text([el])));

lib/api/traversing.js

@@ -603,7 +603,8 @@ function getFilterFn(match) {
     return function (el, i) {
       return match.call(el, i, el);
     };
-  } else if (match.cheerio) {
+  }
+  if (match.cheerio) {
     return match.is.bind(match);
   }
   return function (el) {
@@ -644,11 +645,10 @@ exports.filter = function (match, container) {
   container = container || this;
   var elements = this.toArray ? this.toArray() : this;
 
-  if (typeof match === 'string') {
-    elements = select.filter(match, elements, container.options);
-  } else {
-    elements = elements.filter(getFilterFn(match));
-  }
+  elements =
+    typeof match === 'string'
+      ? select.filter(match, elements, container.options)
+      : elements.filter(getFilterFn(match));
 
   return container._make(elements);
 };

lib/static.js

@@ -31,7 +31,7 @@ exports.load = function (content, options, isDocument) {
 
   options = Object.assign({}, defaultOptions, flattenOptions(options));
 
-  if (isDocument === void 0) isDocument = true;
+  if (typeof isDocument === 'undefined') isDocument = true;
 
   var root = parse(content, options, isDocument);
 

package.json

@@ -61,12 +61,12 @@
     "test:jest:cov": "npm run test:jest -- --coverage",
     "test:types": "tsd",
     "lint": "npm run lint:es && npm run lint:prettier",
-    "lint:es": "eslint .",
+    "lint:es": "eslint --ignore-path .gitignore .",
     "lint:prettier": "npm run format:prettier:raw -- --check",
     "format": "npm run format:es && npm run format:prettier",
     "format:es": "npm run lint:es -- --fix",
     "format:prettier": "npm run format:prettier:raw -- --write",
-    "format:prettier:raw": "prettier \"**/*.{js,ts,md,json,yml}\"",
+    "format:prettier:raw": "prettier \"**/*.{js,ts,md,json,yml}\" --ignore-path .gitignore",
     "build:docs": "jsdoc --configure jsdoc-config.json",
     "benchmark": "node benchmark/benchmark.js --regex \"^(?!.*highmem)\"",
     "pre-commit": "lint-staged"

test/api/deprecated.js

@@ -51,7 +51,7 @@ describe('deprecated APIs', function () {
       it('(arraylike, arraylike) : should return an array', function () {
         var ret = cheerio.merge(arr1, arr2);
         expect(typeof ret).toBe('object');
-        expect(ret instanceof Array).toBeTruthy();
+        expect(Array.isArray(ret)).toBe(true);
       });
 
       it('(arraylike, arraylike) : should modify the first array', function () {

test/api/traversing.js

@@ -18,7 +18,7 @@ describe('$(...)', function () {
           cheerio.load();
         })();
 
-        throw Error('Function did not throw');
+        throw new Error('Function did not throw');
       } catch (err) {
         expect(err).toBeInstanceOf(Error);
         expect(err.message).toBe('cheerio.load() expects a string');
@@ -86,7 +86,7 @@ describe('$(...)', function () {
           $('#fruits').find(':bah');
         })();
 
-        throw Error('Function did not throw');
+        throw new Error('Function did not throw');
       } catch (err) {
         expect(err).toBeInstanceOf(Error);
         expect(err.message).toContain('unmatched pseudo-class');
@@ -469,7 +469,7 @@ describe('$(...)', function () {
           $('.orange').siblings(':bah');
         })();
 
-        throw Error('Function did not throw');
+        throw new Error('Function did not throw');
       } catch (err) {
         expect(err).toBeInstanceOf(Error);
         expect(err.message).toContain('unmatched pseudo-class');
@@ -704,7 +704,7 @@ describe('$(...)', function () {
       var args = [];
       var thisVals = [];
 
-      $fruits.map(function () {
+      $fruits.each(function () {
         args.push(Array.prototype.slice.call(arguments));
         thisVals.push(this);
       });

test/api/utils.js

@@ -255,7 +255,7 @@ describe('cheerio', function () {
     it('(arraylike, arraylike) : should return an array', function () {
       var ret = $.merge(arr1, arr2);
       expect(typeof ret).toBe('object');
-      expect(ret instanceof Array).toBeTruthy();
+      expect(Array.isArray(ret)).toBe(true);
     });
 
     it('(arraylike, arraylike) : should modify the first array', function () {

test/cheerio.js

@@ -1,5 +1,5 @@
 var htmlparser2 = require('htmlparser2');
-var cheerio = require('../');
+var cheerio = require('..');
 var fixtures = require('./__fixtures__/fixtures');
 var fruits = fixtures.fruits;
 var food = fixtures.food;