eslint-plugin-unicorn 4.0.0 → 5.0.0

package/index.js

@@ -34,7 +34,7 @@ module.exports = {
 				'unicorn/regex-shorthand': 'error',
 				'unicorn/prefer-spread': 'error',
 				'unicorn/error-message': 'error',
-				'unicorn/no-unsafe-regex': 'error',
+				'unicorn/no-unsafe-regex': 'off',
 				'unicorn/prefer-add-event-listener': 'error'
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eslint-plugin-unicorn",
-	"version": "4.0.0",
+	"version": "5.0.0",
 	"description": "Various awesome ESLint rules",
 	"license": "MIT",
 	"repository": "sindresorhus/eslint-plugin-unicorn",
@@ -10,10 +10,10 @@
 		"url": "sindresorhus.com"
 	},
 	"engines": {
-		"node": ">=4"
+		"node": ">=6"
 	},
 	"scripts": {
-		"test": "xo && nyc ava",
+		"test": "nyc ava",
 		"integration": "./test/integration/test.js",
 		"coveralls": "nyc report --reporter=text-lcov | coveralls"
 	},
@@ -46,17 +46,17 @@
 		"chalk": "^2.0.1",
 		"coveralls": "^3.0.0",
 		"del": "^3.0.0",
-		"eslint": "^4.0.0",
+		"eslint": "^5.0.0",
 		"eslint-ava-rule-tester": "^2.0.0",
-		"execa": "^0.9.0",
-		"listr": "^0.13.0",
-		"nyc": "^11.0.3",
+		"execa": "^0.10.0",
+		"listr": "^0.14.1",
+		"nyc": "^12.0.2",
 		"pify": "^3.0.0",
 		"tempy": "^0.2.1",
 		"xo": "*"
 	},
 	"peerDependencies": {
-		"eslint": ">=4"
+		"eslint": ">=5.0.0"
 	},
 	"ava": {
 		"files": [

package/readme.md

@@ -4,7 +4,7 @@
 
 > Various awesome ESLint rules
 
-You might want to check out [XO](https://github.com/sindresorhus/xo), which includes this plugin.
+You might want to check out [XO](https://github.com/xojs/xo), which includes this plugin.
 
 
 ## Install
@@ -26,7 +26,7 @@ Configure it in `package.json`.
 			"es6": true
 		},
 		"parserOptions": {
-			"ecmaVersion": 2017,
+			"ecmaVersion": 2018,
 			"sourceType": "module"
 		},
 		"plugins": [
@@ -53,7 +53,7 @@ Configure it in `package.json`.
 			"unicorn/regex-shorthand": "error",
 			"unicorn/prefer-spread": "error",
 			"unicorn/error-message": "error",
-			"unicorn/no-unsafe-regex": "error",
+			"unicorn/no-unsafe-regex": "off",
 			"unicorn/prefer-add-event-listener": "error"
 		}
 	}

package/rules/catch-error-name.js

@@ -4,13 +4,13 @@ const getDocsUrl = require('./utils/get-docs-url');
 
 // Matches `someObj.then([FunctionExpression | ArrowFunctionExpression])`
 function isLintablePromiseCatch(node) {
-	const callee = node.callee;
+	const {callee} = node;
 
 	if (callee.type !== 'MemberExpression') {
 		return false;
 	}
 
-	const property = callee.property;
+	const {property} = callee;
 
 	if (property.type !== 'Identifier' || property.name !== 'catch') {
 		return false;
@@ -20,7 +20,7 @@ function isLintablePromiseCatch(node) {
 		return false;
 	}
 
-	const arg0 = node.arguments[0];
+	const [arg0] = node.arguments;
 
 	return arg0.type === 'FunctionExpression' || arg0.type === 'ArrowFunctionExpression';
 }
@@ -42,7 +42,7 @@ const create = context => {
 		caughtErrorsIgnorePattern: '^_$'
 	}, context.options[0]);
 
-	const name = options.name;
+	const {name} = options;
 	const caughtErrorsIgnorePattern = new RegExp(options.caughtErrorsIgnorePattern);
 	const stack = [];
 
@@ -68,7 +68,7 @@ const create = context => {
 	return {
 		CallExpression: node => {
 			if (isLintablePromiseCatch(node)) {
-				const params = node.arguments[0].params;
+				const {params} = node.arguments[0];
 
 				if (params.length > 0 && params[0].name === '_') {
 					push(!astUtils.containsIdentifier('_', node.arguments[0].body));
@@ -115,7 +115,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		schema
 	}

package/rules/custom-error-definition.js

@@ -18,10 +18,10 @@ const hasValidSuperClass = node => {
 		return false;
 	}
 
-	let name = node.superClass.name;
+	let {name} = node.superClass;
 
 	if (node.superClass.type === 'MemberExpression') {
-		name = node.superClass.property.name;
+		({name} = node.superClass.property);
 	}
 
 	return nameRegexp.test(name);
@@ -48,7 +48,7 @@ const customErrorDefinition = (context, node) => {
 		return;
 	}
 
-	const name = node.id.name;
+	const {name} = node.id;
 	const className = getClassName(name);
 
 	if (name !== className) {
@@ -58,8 +58,7 @@ const customErrorDefinition = (context, node) => {
 		});
 	}
 
-	const body = node.body.body;
-
+	const {body} = node.body;
 	const constructor = body.find(x => x.kind === 'constructor');
 
 	if (!constructor) {
@@ -132,7 +131,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/error-message.js

@@ -91,7 +91,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		}
 	}
 };

package/rules/escape-case.js

@@ -56,7 +56,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/explicit-length-check.js

@@ -12,7 +12,8 @@ function reportError(context, node, message, fixDetails) {
 		node,
 		message,
 		fix: fixDetails && (fixer => {
-			return fixer.replaceText(node,
+			return fixer.replaceText(
+				node,
 				`${context.getSourceCode().getText(fixDetails.node)} ${fixDetails.operator} ${fixDetails.value}`
 			);
 		})
@@ -21,7 +22,8 @@ function reportError(context, node, message, fixDetails) {
 
 function checkZeroType(context, node) {
 	if (node.operator === '<' && node.right.value === 1) {
-		reportError(context,
+		reportError(
+			context,
 			node,
 			'Zero `.length` should be compared with `=== 0`.',
 			{
@@ -34,15 +36,17 @@ function checkZeroType(context, node) {
 }
 
 function checkNonZeroType(context, node, type) {
-	const value = node.right.value;
-	const operator = node.operator;
+	const {value} = node.right;
+	const {operator} = node;
 
 	switch (type) {
 		case 'greater-than':
-			if ((operatorTypes.gte.indexOf(operator) !== -1 && value === 1) ||
-				(operatorTypes.ne.indexOf(operator) !== -1 && value === 0)
+			if (
+				(operatorTypes.gte.includes(operator) && value === 1) ||
+				(operatorTypes.ne.includes(operator) && value === 0)
 			) {
-				reportError(context,
+				reportError(
+					context,
 					node,
 					'Non-zero `.length` should be compared with `> 0`.',
 					{
@@ -54,10 +58,12 @@ function checkNonZeroType(context, node, type) {
 			}
 			break;
 		case 'greater-than-or-equal':
-			if ((operatorTypes.gt.indexOf(operator) !== -1 && value === 0) ||
-				(operatorTypes.ne.indexOf(operator) !== -1 && value === 0)
+			if (
+				(operatorTypes.gt.includes(operator) && value === 0) ||
+				(operatorTypes.ne.includes(operator) && value === 0)
 			) {
-				reportError(context,
+				reportError(
+					context,
 					node,
 					'Non-zero `.length` should be compared with `>= 1`.',
 					{
@@ -69,10 +75,12 @@ function checkNonZeroType(context, node, type) {
 			}
 			break;
 		case 'not-equal':
-			if ((operatorTypes.gt.indexOf(operator) !== -1 && value === 0) ||
-				(operatorTypes.gte.indexOf(operator) !== -1 && value === 1)
+			if (
+				(operatorTypes.gt.includes(operator) && value === 0) ||
+				(operatorTypes.gte.includes(operator) && value === 1)
 			) {
-				reportError(context,
+				reportError(
+					context,
 					node,
 					'Non-zero `.length` should be compared with `!== 0`.',
 					{
@@ -128,6 +136,9 @@ const create = context => {
 	return {
 		IfStatement: node => {
 			checkExpression(context, node.test);
+		},
+		ConditionalExpression: node => {
+			checkExpression(context, node.test);
 		}
 	};
 };
@@ -149,7 +160,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code',
 		schema

package/rules/filename-case.js

@@ -116,7 +116,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		schema
 	}

package/rules/import-index.js

@@ -26,7 +26,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/new-for-builtins.js

@@ -36,7 +36,7 @@ const disallowNew = new Set([
 const create = context => {
 	return {
 		CallExpression: node => {
-			const name = node.callee.name;
+			const {name} = node.callee;
 
 			if (enforceNew.has(name)) {
 				context.report({
@@ -47,7 +47,7 @@ const create = context => {
 			}
 		},
 		NewExpression: node => {
-			const name = node.callee.name;
+			const {name} = node.callee;
 
 			if (disallowNew.has(name)) {
 				context.report({
@@ -67,7 +67,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/no-abusive-eslint-disable.js

@@ -5,11 +5,12 @@ const disableRegex = /^eslint-disable(-next-line|-line)?($|(\s+(@[\w-]+\/[\w-]+\
 
 const create = context => ({
 	Program: node => {
-		node.comments.forEach(comment => {
+		for (const comment of node.comments) {
 			const value = comment.value.trim();
 			const res = disableRegex.exec(value);
 
-			if (res && // It's a eslint-disable comment
+			if (
+				res && // It's a eslint-disable comment
 				!res[2] // But it did not specify any rules
 			) {
 				context.report({
@@ -24,7 +25,7 @@ const create = context => ({
 					data: comment.loc.start
 				});
 			}
-		});
+		}
 	}
 });
 
@@ -32,7 +33,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		}
 	}
 };

package/rules/no-array-instanceof.js

@@ -20,7 +20,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/no-fn-reference-in-iterator.js

@@ -34,7 +34,7 @@ const fix = (context, node) => {
 const create = context => ({
 	'CallExpression[callee.object.name!="Promise"]': node => {
 		if (isIteratorMethod(node) && hasFunctionArgument(node)) {
-			const arg = node.arguments[0];
+			const [arg] = node.arguments;
 
 			context.report({
 				node: arg,
@@ -49,7 +49,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/no-hex-escape.js

@@ -29,7 +29,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/no-new-buffer.js

@@ -25,7 +25,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/no-process-exit.js

@@ -12,7 +12,7 @@ const create = context => {
 
 	return {
 		CallExpression: node => {
-			const callee = node.callee;
+			const {callee} = node;
 
 			if (callee.type === 'MemberExpression' && callee.object.name === 'process') {
 				if (callee.property.name === 'on' || callee.property.name === 'once') {
@@ -40,7 +40,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		}
 	}
 };

package/rules/no-unsafe-regex.js

@@ -32,7 +32,7 @@ const create = context => {
 			let flags = null;
 
 			if (hasRegExp) {
-				pattern = args[0].regex.pattern;
+				({pattern} = args[0].regex);
 				flags = args[1] && args[1].type === 'Literal' ? args[1].value : args[0].regex.flags;
 			} else {
 				pattern = args[0].value;
@@ -53,7 +53,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		}
 	}
 };

package/rules/number-literal-case.js

@@ -33,7 +33,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/prefer-add-event-listener.js

@@ -18,7 +18,7 @@ const fix = (fixer, sourceCode, assignmentNode, memberExpression) => {
 const isOnEvent = memberExpression => {
 	if (memberExpression.type === 'MemberExpression') {
 		const eventMethodName = getEventMethodName(memberExpression);
-		if (eventMethodName.startsWith('on')) {
+		if (eventMethodName && eventMethodName.startsWith('on')) {
 			return eventTypes.has(getEventTypeName(eventMethodName));
 		}
 	}
@@ -45,7 +45,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/prefer-spread.js

@@ -2,7 +2,7 @@
 const getDocsUrl = require('./utils/get-docs-url');
 
 const isArrayFrom = node => {
-	const callee = node.callee;
+	const {callee} = node;
 	return (
 		callee.type === 'MemberExpression' &&
 		callee.object.type === 'Identifier' &&
@@ -12,6 +12,8 @@ const isArrayFrom = node => {
 	);
 };
 
+const isArrayLike = arg => arg && arg.type !== 'ObjectExpression';
+
 const parseArgument = (context, arg) => {
 	if (arg.type === 'Identifier') {
 		return arg.name;
@@ -23,7 +25,7 @@ const parseArgument = (context, arg) => {
 const create = context => {
 	return {
 		CallExpression(node) {
-			if (isArrayFrom(node)) {
+			if (isArrayFrom(node) && isArrayLike(node.arguments[0])) {
 				context.report({
 					node,
 					message: 'Prefer the spread operator over `Array.from()`.',
@@ -51,7 +53,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/prefer-starts-ends-with.js

@@ -11,7 +11,7 @@ const isSimpleString = string => doesNotContain(
 const create = context => {
 	return {
 		CallExpression(node) {
-			const callee = node.callee;
+			const {callee} = node;
 			const prop = callee.property;
 
 			if (!(prop && callee.type === 'MemberExpression')) {
@@ -22,9 +22,9 @@ const create = context => {
 
 			let regex;
 			if (prop.name === 'test' && callee.object.regex) {
-				regex = callee.object.regex;
+				({regex} = callee.object);
 			} else if (prop.name === 'match' && args && args[0] && args[0].regex) {
-				regex = args[0].regex;
+				({regex} = args[0]);
 			} else {
 				return;
 			}
@@ -33,7 +33,7 @@ const create = context => {
 				return;
 			}
 
-			const pattern = regex.pattern;
+			const {pattern} = regex;
 			if (pattern.startsWith('^') && isSimpleString(pattern.slice(1))) {
 				context.report({
 					node,
@@ -53,7 +53,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		}
 	}
 };

package/rules/prefer-type-error.js

@@ -120,7 +120,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/regex-shorthand.js

@@ -8,7 +8,7 @@ const create = context => {
 	return {
 		'Literal[regex]': node => {
 			const oldPattern = node.regex.pattern;
-			const flags = node.regex.flags;
+			const {flags} = node.regex;
 
 			const newPattern = cleanRegexp(oldPattern, flags);
 
@@ -62,7 +62,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/throw-new-error.js

@@ -22,7 +22,7 @@ module.exports = {
 	create,
 	meta: {
 		docs: {
-			url: getDocsUrl()
+			url: getDocsUrl(__filename)
 		},
 		fixable: 'code'
 	}

package/rules/utils/get-docs-url.js

@@ -4,7 +4,7 @@ const pkg = require('../../package');
 
 const repoUrl = 'https://github.com/sindresorhus/eslint-plugin-unicorn';
 
-module.exports = ruleName => {
-	ruleName = ruleName || path.basename(module.parent.filename, '.js');
+module.exports = filename => {
+	const ruleName = path.basename(filename, '.js');
 	return `${repoUrl}/blob/v${pkg.version}/docs/rules/${ruleName}.md`;
 };