[lint] fix parens/curlies/semis/etc

Author: ljharb

.eslintrc

@@ -18,20 +18,13 @@
 
 	"rules": {
 		"consistent-return": "warn",
-		"curly": "warn",
-		"dot-notation": [2, { "allowKeywords": true, "allowPattern": "throws" }],
 		"func-style": "warn",
 		"id-denylist": "warn",
 		"max-params": "warn",
-		"max-statements-per-line": "warn",
 		"multiline-comment-style": "off",
-		"no-else-return": "warn",
-		"no-extra-parens": "warn",
 		"no-param-reassign": "warn",
 		"no-use-before-define": "warn",
-		"semi": ["error", "never"],
 		"sort-keys": "warn",
-		"strict": "warn",
 	},
 
 	"ignorePatterns": [
@@ -43,18 +36,13 @@
 			"files": "bench/*",
 			"extends": "@ljharb/eslint-config/node/4",
 			"rules": {
-				"curly": "warn",
 				"func-style": "warn",
 				"max-params": "warn",
-				"no-extra-parens": "warn",
-				"no-mixed-operators": "warn",
 				"no-param-reassign": "warn",
 				"no-use-before-define": "warn",
 				"no-var": "off",
 				"prefer-arrow-callback": "off",
 				"prefer-template": "off",
-				"semi": ["error", "never"],
-				"strict": "warn",
 			},
 		},
 	],

bench/index.js

@@ -1,35 +1,38 @@
-var Benchmark = require('benchmark')
-var current = require('../lib/sync')
-var old = require('./old')
+'use strict';
 
-run('hello', 'world', 100, 32, 'md5')
-run('hello', 'world', 100, 32, 'sha256')
-run('hello', 'world', 10000, 70, 'md5')
-run('hello', 'world', 10000, 70, 'sha256')
+var Benchmark = require('benchmark');
+var current = require('../lib/sync');
+var old = require('./old');
+
+run('hello', 'world', 100, 32, 'md5');
+run('hello', 'world', 100, 32, 'sha256');
+run('hello', 'world', 10000, 70, 'md5');
+run('hello', 'world', 10000, 70, 'sha256');
 function run(password, salt, iterations, keylen, digest) {
-	var suite = new Benchmark.Suite()
-	console.log(`password: ${password}`)
-	console.log(`salt: ${salt}`)
-	console.log(`iterations: ${iterations}`)
-	console.log(`keylen: ${keylen}`)
-	console.log(`digest: ${digest}`)
+	var suite = new Benchmark.Suite();
+	console.log(`password: ${password}`);
+	console.log(`salt: ${salt}`);
+	console.log(`iterations: ${iterations}`);
+	console.log(`keylen: ${keylen}`);
+	console.log(`digest: ${digest}`);
 
 	// add tests
 	suite
 		.add('current', function () {
-			current(password, salt, iterations, keylen, digest)
+			current(password, salt, iterations, keylen, digest);
 		})
 		.add('old', function () {
-			old(password, salt, iterations, keylen, digest)
+			old(password, salt, iterations, keylen, digest);
 		})
 
 	// add listeners
 		.on('cycle', function (event) {
-			console.log(String(event.target))
+			console.log(String(event.target));
 		})
 		.on('complete', function () {
-			console.log('Fastest is ' + this.filter('fastest').map('name'))
-			console.log('')
+			// eslint-disable-next-line no-invalid-this
+			console.log('Fastest is ' + this.filter('fastest').map('name'));
+			console.log('');
 		})
-		.run()
+		.run();
 }

bench/old.js

@@ -1,47 +1,55 @@
-var createHmac = require('create-hmac')
-var checkParameters = require('../lib/precondition')
-var defaultEncoding = require('../lib/default-encoding')
-var Buffer = require('safe-buffer').Buffer
-module.exports = pbkdf2
+'use strict';
+
+var createHmac = require('create-hmac');
+var checkParameters = require('../lib/precondition');
+var defaultEncoding = require('../lib/default-encoding');
+var Buffer = require('safe-buffer').Buffer;
+module.exports = pbkdf2;
 function pbkdf2(password, salt, iterations, keylen, digest) {
-	if (!Buffer.isBuffer(password)) password = Buffer.from(password, defaultEncoding)
-	if (!Buffer.isBuffer(salt)) salt = Buffer.from(salt, defaultEncoding)
+	if (!Buffer.isBuffer(password)) {
+		password = Buffer.from(password, defaultEncoding);
+	}
+	if (!Buffer.isBuffer(salt)) {
+		salt = Buffer.from(salt, defaultEncoding);
+	}
 
-	checkParameters(iterations, keylen)
+	checkParameters(iterations, keylen);
 
-	digest = digest || 'sha1'
+	digest = digest || 'sha1';
 
-	var hLen
-	var l = 1
-	var DK = Buffer.allocUnsafe(keylen)
-	var block1 = Buffer.allocUnsafe(salt.length + 4)
-	salt.copy(block1, 0, 0, salt.length)
+	var hLen;
+	var l = 1;
+	var DK = Buffer.allocUnsafe(keylen);
+	var block1 = Buffer.allocUnsafe(salt.length + 4);
+	salt.copy(block1, 0, 0, salt.length);
 
-	var r
-	var T
+	var r;
+	var T;
 
 	for (var i = 1; i <= l; i++) {
-		block1.writeUInt32BE(i, salt.length)
-		var U = createHmac(digest, password).update(block1).digest()
+		block1.writeUInt32BE(i, salt.length);
+		var U = createHmac(digest, password).update(block1).digest();
 
 		if (!hLen) {
-			hLen = U.length
-			T = Buffer.allocUnsafe(hLen)
-			l = Math.ceil(keylen / hLen)
-			r = keylen - (l - 1) * hLen
+			hLen = U.length;
+			T = Buffer.allocUnsafe(hLen);
+			l = Math.ceil(keylen / hLen);
+			r = keylen - ((l - 1) * hLen);
 		}
 
-		U.copy(T, 0, 0, hLen)
+		U.copy(T, 0, 0, hLen);
 
 		for (var j = 1; j < iterations; j++) {
-			U = createHmac(digest, password).update(U).digest()
-			for (var k = 0; k < hLen; k++) T[k] ^= U[k]
+			U = createHmac(digest, password).update(U).digest();
+			for (var k = 0; k < hLen; k++) {
+				T[k] ^= U[k];
+			}
 		}
 
-		var destPos = (i - 1) * hLen
-		var len = (i === l ? r : hLen)
-		T.copy(DK, destPos, 0, len)
+		var destPos = (i - 1) * hLen;
+		var len = i === l ? r : hLen;
+		T.copy(DK, destPos, 0, len);
 	}
 
-	return DK
+	return DK;
 }

browser.js

@@ -1,2 +1,4 @@
-exports.pbkdf2 = require('./lib/async')
-exports.pbkdf2Sync = require('./lib/sync')
+'use strict';
+
+exports.pbkdf2 = require('./lib/async');
+exports.pbkdf2Sync = require('./lib/sync');

index.js

@@ -1,39 +1,43 @@
-var native = require('crypto')
+'use strict';
 
-var checkParameters = require('./lib/precondition')
-var defaultEncoding = require('./lib/default-encoding')
-var toBuffer = require('./lib/to-buffer')
+var native = require('crypto');
+
+var checkParameters = require('./lib/precondition');
+var defaultEncoding = require('./lib/default-encoding');
+var toBuffer = require('./lib/to-buffer');
 
 function nativePBKDF2(password, salt, iterations, keylen, digest, callback) {
-	checkParameters(iterations, keylen)
-	password = toBuffer(password, defaultEncoding, 'Password')
-	salt = toBuffer(salt, defaultEncoding, 'Salt')
+	checkParameters(iterations, keylen);
+	password = toBuffer(password, defaultEncoding, 'Password');
+	salt = toBuffer(salt, defaultEncoding, 'Salt');
 
 	if (typeof digest === 'function') {
-		callback = digest
-		digest = 'sha1'
+		callback = digest;
+		digest = 'sha1';
+	}
+	if (typeof callback !== 'function') {
+		throw new Error('No callback provided to pbkdf2');
 	}
-	if (typeof callback !== 'function') { throw new Error('No callback provided to pbkdf2') }
 
-	return native.pbkdf2(password, salt, iterations, keylen, digest, callback)
+	return native.pbkdf2(password, salt, iterations, keylen, digest, callback);
 }
 
 function nativePBKDF2Sync(password, salt, iterations, keylen, digest) {
-	checkParameters(iterations, keylen)
-	password = toBuffer(password, defaultEncoding, 'Password')
-	salt = toBuffer(salt, defaultEncoding, 'Salt')
-	digest = digest || 'sha1'
-	return native.pbkdf2Sync(password, salt, iterations, keylen, digest)
+	checkParameters(iterations, keylen);
+	password = toBuffer(password, defaultEncoding, 'Password');
+	salt = toBuffer(salt, defaultEncoding, 'Salt');
+	digest = digest || 'sha1';
+	return native.pbkdf2Sync(password, salt, iterations, keylen, digest);
 }
 
 /* istanbul ignore next */
 if (!native.pbkdf2Sync || native.pbkdf2Sync.toString().indexOf('keylen, digest') === -1) {
 	/* eslint global-require: 0 */
-	exports.pbkdf2Sync = require('./lib/sync')
-	exports.pbkdf2 = require('./lib/async')
+	exports.pbkdf2Sync = require('./lib/sync');
+	exports.pbkdf2 = require('./lib/async');
 
 // native
 } else {
-	exports.pbkdf2Sync = nativePBKDF2Sync
-	exports.pbkdf2 = nativePBKDF2
+	exports.pbkdf2Sync = nativePBKDF2Sync;
+	exports.pbkdf2 = nativePBKDF2;
 }