Merge branch 'main' into unwrap

.eslintrc.json

@@ -3,7 +3,13 @@
     "node": true
   },
   "plugins": ["jsdoc"],
-  "extends": ["eslint:recommended", "plugin:jsdoc/recommended", "prettier"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:jsdoc/recommended",
+    "plugin:jest/recommended",
+    "plugin:node/recommended",
+    "prettier"
+  ],
   "globals": { "Set": true, "Symbol": true },
   "rules": {
     "array-callback-return": [
@@ -35,6 +41,7 @@
     "no-use-before-define": [2, "nofunc"],
     "no-void": 2,
     "yoda": 2,
+    "strict": 2,
 
     "jsdoc/require-jsdoc": 0,
     "jsdoc/check-param-names": 2,
@@ -47,7 +54,10 @@
     "jsdoc/require-param-name": 2,
     "jsdoc/require-param-type": 2,
     "jsdoc/require-param": 2,
-    "jsdoc/valid-types": 2
+    "jsdoc/valid-types": 2,
+
+    "node/no-unsupported-features/es-builtins": 0, // TODO
+    "node/shebang": 0
   },
   "settings": {
     "jsdoc": {

benchmark/benchmark.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
+'use strict';
 
 var Suites = require('./suite');
 var suites = new Suites();
 
 var regexIdx = process.argv.indexOf('--regex') + 1;
 if (regexIdx > 0) {
   if (regexIdx === process.argv.length) {
-    console.error('Error: the "--regex" option requires a value');
-    process.exit(1);
+    throw new Error('Error: the "--regex" option requires a value');
   }
   suites.filter(process.argv[regexIdx]);
 }

benchmark/suite.js

@@ -1,3 +1,4 @@
+'use strict';
 var fs = require('fs');
 var path = require('path');
 

index.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * @module cheerio
  * @borrows static.load as load

lib/api/attributes.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Methods for getting and modifying attributes.
  *

lib/api/css.js

@@ -1,3 +1,4 @@
+'use strict';
 /** @module cheerio/css */
 
 var domEach = require('../utils').domEach;

lib/api/forms.js

@@ -1,3 +1,4 @@
+'use strict';
 /** @module cheerio/forms */
 
 // https://github.com/jquery/jquery/blob/2.1.3/src/manipulation/var/rcheckableType.js

lib/api/manipulation.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Methods for modifying the DOM structure.
  *

lib/api/traversing.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Methods for traversing the DOM structure.
  *

lib/cheerio.js

@@ -1,3 +1,4 @@
+'use strict';
 /*
   Module dependencies
 */

lib/options.js

@@ -1,3 +1,4 @@
+'use strict';
 /** Cheerio default options. */
 exports.default = {
   xml: false,

lib/parse.js

@@ -1,3 +1,4 @@
+'use strict';
 /*
   Module Dependencies
 */

lib/parsers/htmlparser2.js

@@ -1,2 +1,3 @@
+'use strict';
 exports.parse = require('htmlparser2').parseDocument;
 exports.render = require('dom-serializer').default;

lib/parsers/parse5.js

@@ -1,3 +1,4 @@
+'use strict';
 var parse5 = require('parse5');
 var htmlparser2Adapter = require('parse5-htmlparser2-tree-adapter');
 

lib/static.js

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * @module cheerio/static
  * @ignore
@@ -117,7 +118,7 @@ exports.html = function (dom, options) {
   options = Object.assign(
     {},
     defaultOptions,
-    this._options,
+    this ? this._options : {},
     flattenOptions(options || {})
   );
 

lib/utils.js

@@ -1,3 +1,4 @@
+'use strict';
 var htmlparser2 = require('htmlparser2');
 var domhandler = require('domhandler');
 

package.json

@@ -43,15 +43,17 @@
     "benchmark": "^2.1.4",
     "eslint": "^7.17.0",
     "eslint-config-prettier": "^7.1.0",
+    "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-jsdoc": "^30.7.13",
+    "eslint-plugin-node": "^11.1.0",
     "husky": "^4.3.6",
     "jest": "^26.6.3",
     "jquery": "^3.5.1",
     "jsdoc": "^3.6.6",
     "jsdom": "^16.4.0",
     "lint-staged": "^10.5.3",
     "prettier": "^2.2.1",
-    "prettier-plugin-jsdoc": "^0.2.12",
+    "prettier-plugin-jsdoc": "^0.2.13",
     "tsd": "^0.14.0"
   },
   "scripts": {
@@ -68,6 +70,7 @@
     "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)\"",
+    "bench": "npm run benchmark",
     "pre-commit": "lint-staged"
   },
   "prettier": {

test/__fixtures__/fixtures.js

@@ -1,3 +1,4 @@
+'use strict';
 exports.fruits = [
   '<ul id="fruits">',
   '<li class="apple">Apple</li>',

test/api/attributes.js

@@ -1,3 +1,4 @@
+'use strict';
 var cheerio = require('../..');
 var fruits = require('../__fixtures__/fixtures').fruits;
 var vegetables = require('../__fixtures__/fixtures').vegetables;
@@ -33,13 +34,13 @@ describe('$(...)', function () {
       expect(attr).toBe('autofocus');
     });
 
-    it('(key, value) : should set attr', function () {
+    it('(key, value) : should set one attr', function () {
       var $pear = $('.pear').attr('id', 'pear');
       expect($('#pear')).toHaveLength(1);
       expect($pear).toBeInstanceOf($);
     });
 
-    it('(key, value) : should set attr', function () {
+    it('(key, value) : should set multiple attr', function () {
       var $el = cheerio('<div></div> <div></div>').attr('class', 'pear');
 
       expect($el[0].attribs['class']).toBe('pear');
@@ -539,26 +540,26 @@ describe('$(...)', function () {
   });
 
   describe('.hasClass', function () {
-    function test(attr) {
+    function withClass(attr) {
       return cheerio('<div class="' + attr + '"></div>');
     }
 
     it('(valid class) : should return true', function () {
       var cls = $('.apple').hasClass('apple');
       expect(cls).toBe(true);
 
-      expect(test('foo').hasClass('foo')).toBe(true);
-      expect(test('foo bar').hasClass('foo')).toBe(true);
-      expect(test('bar foo').hasClass('foo')).toBe(true);
-      expect(test('bar foo bar').hasClass('foo')).toBe(true);
+      expect(withClass('foo').hasClass('foo')).toBe(true);
+      expect(withClass('foo bar').hasClass('foo')).toBe(true);
+      expect(withClass('bar foo').hasClass('foo')).toBe(true);
+      expect(withClass('bar foo bar').hasClass('foo')).toBe(true);
     });
 
     it('(invalid class) : should return false', function () {
       var cls = $('#fruits').hasClass('fruits');
       expect(cls).toBe(false);
-      expect(test('foo-bar').hasClass('foo')).toBe(false);
-      expect(test('foo-bar').hasClass('foo')).toBe(false);
-      expect(test('foo-bar').hasClass('foo-ba')).toBe(false);
+      expect(withClass('foo-bar').hasClass('foo')).toBe(false);
+      expect(withClass('foo-bar').hasClass('foo')).toBe(false);
+      expect(withClass('foo-bar').hasClass('foo-ba')).toBe(false);
     });
 
     it('should check multiple classes', function () {
@@ -573,9 +574,9 @@ describe('$(...)', function () {
     });
 
     it('(empty string argument) : should return false', function () {
-      expect(test('foo').hasClass('')).toBe(false);
-      expect(test('foo bar').hasClass('')).toBe(false);
-      expect(test('foo bar').removeClass('foo').hasClass('')).toBe(false);
+      expect(withClass('foo').hasClass('')).toBe(false);
+      expect(withClass('foo bar').hasClass('')).toBe(false);
+      expect(withClass('foo bar').removeClass('foo').hasClass('')).toBe(false);
     });
   });