eslint-plugin-unicorn 20.0.0 → 23.0.0

package/index.js

@@ -10,7 +10,7 @@ module.exports = {
 				es6: true
 			},
 			parserOptions: {
-				ecmaVersion: 2020,
+				ecmaVersion: 2021,
 				sourceType: 'module'
 			},
 			plugins: [
@@ -27,6 +27,7 @@ module.exports = {
 				'unicorn/explicit-length-check': 'error',
 				'unicorn/filename-case': 'error',
 				'unicorn/import-index': 'error',
+				'unicorn/import-style': 'error',
 				'unicorn/new-for-builtins': 'error',
 				'unicorn/no-abusive-eslint-disable': 'error',
 				'unicorn/no-array-instanceof': 'error',
@@ -39,6 +40,7 @@ module.exports = {
 				'unicorn/no-nested-ternary': 'error',
 				'unicorn/no-new-buffer': 'error',
 				'unicorn/no-null': 'error',
+				'unicorn/no-object-as-default-parameter': 'error',
 				'unicorn/no-process-exit': 'error',
 				'unicorn/no-reduce': 'error',
 				'unicorn/no-unreadable-array-destructuring': 'error',
@@ -47,11 +49,16 @@ module.exports = {
 				'unicorn/no-useless-undefined': 'error',
 				'unicorn/no-zero-fractions': 'error',
 				'unicorn/number-literal-case': 'error',
+				// TODO: Enable this by default when it's shipping in a Node.js LTS version.
+				'unicorn/numeric-separators-style': 'off',
 				'unicorn/prefer-add-event-listener': 'error',
+				'unicorn/prefer-array-find': 'error',
 				'unicorn/prefer-dataset': 'error',
 				'unicorn/prefer-event-key': 'error',
-				'unicorn/prefer-flat-map': 'error',
+				// TODO: Enable this by default when targeting Node.js 12.
+				'unicorn/prefer-flat-map': 'off',
 				'unicorn/prefer-includes': 'error',
+				'unicorn/prefer-math-trunc': 'error',
 				'unicorn/prefer-modern-dom-apis': 'error',
 				'unicorn/prefer-negative-index': 'error',
 				'unicorn/prefer-node-append': 'error',
@@ -66,6 +73,7 @@ module.exports = {
 				'unicorn/prefer-spread': 'error',
 				'unicorn/prefer-starts-ends-with': 'error',
 				'unicorn/prefer-string-slice': 'error',
+				'unicorn/prefer-ternary': 'error',
 				'unicorn/prefer-text-content': 'error',
 				'unicorn/prefer-trim-start-end': 'error',
 				'unicorn/prefer-type-error': 'error',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eslint-plugin-unicorn",
-	"version": "20.0.0",
+	"version": "23.0.0",
 	"description": "Various awesome ESLint rules",
 	"license": "MIT",
 	"repository": "sindresorhus/eslint-plugin-unicorn",
@@ -36,10 +36,11 @@
 		"ci-info": "^2.0.0",
 		"clean-regexp": "^1.0.0",
 		"eslint-ast-utils": "^1.1.0",
-		"eslint-template-visitor": "^1.1.0",
-		"eslint-utils": "^2.0.0",
+		"eslint-template-visitor": "^2.2.1",
+		"eslint-utils": "^2.1.0",
 		"import-modules": "^2.0.0",
-		"lodash": "^4.17.15",
+		"lodash": "^4.17.20",
+		"pluralize": "^8.0.0",
 		"read-pkg-up": "^7.0.1",
 		"regexp-tree": "^0.1.21",
 		"reserved-words": "^0.1.2",
@@ -48,25 +49,27 @@
 	},
 	"devDependencies": {
 		"@ava/babel": "^1.0.1",
+		"@babel/code-frame": "7.10.4",
 		"@lubien/fixture-beta-package": "^1.0.0-beta.1",
-		"@typescript-eslint/parser": "^2.33.0",
-		"ava": "^3.8.2",
+		"@typescript-eslint/parser": "^4.4.1",
+		"ava": "^3.13.0",
 		"babel-eslint": "^10.1.0",
-		"chalk": "^4.0.0",
-		"eslint": "^7.0.0",
+		"chalk": "^4.1.0",
+		"eslint": "^7.11.0",
 		"eslint-ava-rule-tester": "^4.0.0",
-		"eslint-plugin-eslint-plugin": "^2.2.1",
-		"execa": "^4.0.1",
+		"eslint-plugin-eslint-plugin": "^2.3.0",
+		"execa": "^4.0.3",
 		"listr": "^0.14.3",
-		"nyc": "^15.0.1",
+		"mem": "8.0.0",
+		"nyc": "^15.1.0",
 		"outdent": "^0.7.1",
 		"pify": "^5.0.0",
-		"typescript": "^3.9.2",
-		"vue-eslint-parser": "^7.0.0",
-		"xo": "^0.30.0"
+		"typescript": "^4.0.3",
+		"vue-eslint-parser": "^7.1.1",
+		"xo": "^0.33.1"
 	},
 	"peerDependencies": {
-		"eslint": ">=7.0.0"
+		"eslint": ">=7.11.0"
 	},
 	"ava": {
 		"babel": true,
@@ -90,10 +93,14 @@
 		"extends": [
 			"plugin:eslint-plugin/all"
 		],
+		"ignores": [
+			"test/integration/{fixtures,unicorn}/**"
+		],
 		"overrides": [
 			{
 				"files": "rules/utils/*.js",
 				"rules": {
+					"eslint-plugin/prefer-object-rule": "off",
 					"eslint-plugin/require-meta-docs-url": "off"
 				}
 			},
@@ -106,14 +113,15 @@
 		],
 		"rules": {
 			"strict": "error",
-			"array-callback-return": [
+			"unicorn/no-null": "error",
+			"unicorn/prevent-abbreviations": [
 				"error",
 				{
-					"allowImplicit": true
+					"replacements": {
+						"fn": false
+					}
 				}
-			],
-			"unicorn/no-null": "error",
-			"unicorn/string-content": "off"
+			]
 		}
 	}
 }

package/readme.md

@@ -26,7 +26,7 @@ Configure it in `package.json`.
 			"es6": true
 		},
 		"parserOptions": {
-			"ecmaVersion": 2020,
+			"ecmaVersion": 2021,
 			"sourceType": "module"
 		},
 		"plugins": [
@@ -43,6 +43,7 @@ Configure it in `package.json`.
 			"unicorn/explicit-length-check": "error",
 			"unicorn/filename-case": "error",
 			"unicorn/import-index": "error",
+			"unicorn/import-style": "error",
 			"unicorn/new-for-builtins": "error",
 			"unicorn/no-abusive-eslint-disable": "error",
 			"unicorn/no-array-instanceof": "error",
@@ -55,6 +56,7 @@ Configure it in `package.json`.
 			"unicorn/no-nested-ternary": "error",
 			"unicorn/no-new-buffer": "error",
 			"unicorn/no-null": "error",
+			"unicorn/no-object-as-default-parameter": "error",
 			"unicorn/no-process-exit": "error",
 			"unicorn/no-reduce": "error",
 			"unicorn/no-unreadable-array-destructuring": "error",
@@ -63,11 +65,14 @@ Configure it in `package.json`.
 			"unicorn/no-useless-undefined": "error",
 			"unicorn/no-zero-fractions": "error",
 			"unicorn/number-literal-case": "error",
+			"unicorn/numeric-separators-style": "off",
 			"unicorn/prefer-add-event-listener": "error",
+			"unicorn/prefer-array-find": "error",
 			"unicorn/prefer-dataset": "error",
 			"unicorn/prefer-event-key": "error",
 			"unicorn/prefer-flat-map": "error",
 			"unicorn/prefer-includes": "error",
+			"unicorn/prefer-math-trunc": "error",
 			"unicorn/prefer-modern-dom-apis": "error",
 			"unicorn/prefer-negative-index": "error",
 			"unicorn/prefer-node-append": "error",
@@ -81,6 +86,7 @@ Configure it in `package.json`.
 			"unicorn/prefer-spread": "error",
 			"unicorn/prefer-starts-ends-with": "error",
 			"unicorn/prefer-string-slice": "error",
+			"unicorn/prefer-ternary": "off",
 			"unicorn/prefer-text-content": "error",
 			"unicorn/prefer-trim-start-end": "error",
 			"unicorn/prefer-type-error": "error",
@@ -104,6 +110,7 @@ Configure it in `package.json`.
 - [explicit-length-check](docs/rules/explicit-length-check.md) - Enforce explicitly comparing the `length` property of a value. *(partly fixable)*
 - [filename-case](docs/rules/filename-case.md) - Enforce a case style for filenames.
 - [import-index](docs/rules/import-index.md) - Enforce importing index files with `.`. *(fixable)*
+- [import-style](docs/rules/import-style.md) - Enforce specific import styles per module.
 - [new-for-builtins](docs/rules/new-for-builtins.md) - Enforce the use of `new` for all builtins, except `String`, `Number`, `Boolean`, `Symbol` and `BigInt`. *(fixable)*
 - [no-abusive-eslint-disable](docs/rules/no-abusive-eslint-disable.md) - Enforce specifying rules to disable in `eslint-disable` comments.
 - [no-array-instanceof](docs/rules/no-array-instanceof.md) - Require `Array.isArray()` instead of `instanceof Array`. *(fixable)*
@@ -115,6 +122,7 @@ Configure it in `package.json`.
 - [no-nested-ternary](docs/rules/no-nested-ternary.md) - Disallow nested ternary expressions. *(partly fixable)*
 - [no-new-buffer](docs/rules/no-new-buffer.md) - Enforce the use of `Buffer.from()` and `Buffer.alloc()` instead of the deprecated `new Buffer()`. *(fixable)*
 - [no-null](docs/rules/no-null.md) - Disallow the use of the `null` literal.
+- [no-object-as-default-parameter](docs/rules/no-object-as-default-parameter.md) - Disallow the use of objects as default parameters.
 - [no-process-exit](docs/rules/no-process-exit.md) - Disallow `process.exit()`.
 - [no-reduce](docs/rules/no-reduce.md) - Disallow `Array#reduce()` and `Array#reduceRight()`.
 - [no-unreadable-array-destructuring](docs/rules/no-unreadable-array-destructuring.md) - Disallow unreadable array destructuring.
@@ -123,11 +131,14 @@ Configure it in `package.json`.
 - [no-useless-undefined](docs/rules/no-useless-undefined.md) - Disallow useless `undefined`. *(fixable)*
 - [no-zero-fractions](docs/rules/no-zero-fractions.md) - Disallow number literals with zero fractions or dangling dots. *(fixable)*
 - [number-literal-case](docs/rules/number-literal-case.md) - Enforce proper case for numeric literals. *(fixable)*
+- [numeric-separators-style](docs/rules/numeric-separators-style.md) - Enforce the style of numeric separators by correctly grouping digits. *(fixable)*
 - [prefer-add-event-listener](docs/rules/prefer-add-event-listener.md) - Prefer `.addEventListener()` and `.removeEventListener()` over `on`-functions. *(partly fixable)*
+- [prefer-array-find](docs/rules/prefer-array-find.md) - Prefer `.find(…)` over the first element from `.filter(…)`. *(partly fixable)*
 - [prefer-dataset](docs/rules/prefer-dataset.md) - Prefer using `.dataset` on DOM elements over `.setAttribute(…)`. *(fixable)*
 - [prefer-event-key](docs/rules/prefer-event-key.md) - Prefer `KeyboardEvent#key` over `KeyboardEvent#keyCode`. *(partly fixable)*
 - [prefer-flat-map](docs/rules/prefer-flat-map.md) - Prefer `.flatMap(…)` over `.map(…).flat()`. *(fixable)*
 - [prefer-includes](docs/rules/prefer-includes.md) - Prefer `.includes()` over `.indexOf()` when checking for existence or non-existence. *(fixable)*
+- [prefer-math-trunc](docs/rules/prefer-math-trunc.md) - Enforce the use of `Math.trunc` instead of bitwise operators. *(partly fixable)*
 - [prefer-modern-dom-apis](docs/rules/prefer-modern-dom-apis.md) - Prefer `.before()` over `.insertBefore()`, `.replaceWith()` over `.replaceChild()`, prefer one of `.before()`, `.after()`, `.append()` or `.prepend()` over `insertAdjacentText()` and `insertAdjacentElement()`. *(fixable)*
 - [prefer-negative-index](docs/rules/prefer-negative-index.md) - Prefer negative index over `.length - index` for `{String,Array,TypedArray}#slice()` and `Array#splice()`. *(fixable)*
 - [prefer-node-append](docs/rules/prefer-node-append.md) - Prefer `Node#append()` over `Node#appendChild()`. *(fixable)*
@@ -141,6 +152,7 @@ Configure it in `package.json`.
 - [prefer-spread](docs/rules/prefer-spread.md) - Prefer the spread operator over `Array.from()`. *(fixable)*
 - [prefer-starts-ends-with](docs/rules/prefer-starts-ends-with.md) - Prefer `String#startsWith()` & `String#endsWith()` over more complex alternatives. *(partly fixable)*
 - [prefer-string-slice](docs/rules/prefer-string-slice.md) - Prefer `String#slice()` over `String#substr()` and `String#substring()`. *(partly fixable)*
+- [prefer-ternary](docs/rules/prefer-ternary.md) - Prefer ternary expressions over simple `if-else` statements. *(fixable)*
 - [prefer-text-content](docs/rules/prefer-text-content.md) - Prefer `.textContent` over `.innerText`. *(fixable)*
 - [prefer-trim-start-end](docs/rules/prefer-trim-start-end.md) - Prefer `String#trimStart()` / `String#trimEnd()` over `String#trimLeft()` / `String#trimRight()`. *(fixable)*
 - [prefer-type-error](docs/rules/prefer-type-error.md) - Enforce throwing `TypeError` in type checking conditions. *(fixable)*

package/rules/better-regex.js

@@ -4,7 +4,10 @@ const {optimize} = require('regexp-tree');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const quoteString = require('./utils/quote-string');
 
-const message = '{{original}} can be optimized to {{optimized}}';
+const MESSAGE_ID = 'better-regex';
+const messages = {
+	[MESSAGE_ID]: '{{original}} can be optimized to {{optimized}}.'
+};
 
 const create = context => {
 	const {sortCharacterClasses} = context.options[0] || {};
@@ -37,7 +40,7 @@ const create = context => {
 
 			context.report({
 				node,
-				message,
+				messageId: MESSAGE_ID,
 				data: {
 					original,
 					optimized
@@ -64,7 +67,7 @@ const create = context => {
 			if (oldPattern !== newPattern) {
 				context.report({
 					node,
-					message,
+					messageId: MESSAGE_ID,
 					data: {
 						original: oldPattern,
 						optimized: newPattern
@@ -99,6 +102,7 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		fixable: 'code',
-		schema
+		schema,
+		messages
 	}
 };

package/rules/catch-error-name.js

@@ -5,7 +5,10 @@ const getDocumentationUrl = require('./utils/get-documentation-url');
 const renameVariable = require('./utils/rename-variable');
 const methodSelector = require('./utils/method-selector');
 
-const ERROR_MESSAGE_ID = 'error';
+const MESSAGE_ID = 'catch-error-name';
+const messages = {
+	[MESSAGE_ID]: 'The catch parameter `{{originalName}}` should be named `{{fixedName}}`.'
+};
 
 const promiseMethodSelector = (method, argumentsLength, argumentIndex) => [
 	methodSelector({
@@ -78,7 +81,7 @@ const create = context => {
 
 		context.report({
 			node,
-			messageId: ERROR_MESSAGE_ID,
+			messageId: MESSAGE_ID,
 			data: {
 				originalName,
 				fixedName
@@ -124,8 +127,6 @@ module.exports = {
 		},
 		fixable: 'code',
 		schema,
-		messages: {
-			[ERROR_MESSAGE_ID]: 'The catch parameter `{{originalName}}` should be named `{{fixedName}}`.'
-		}
+		messages
 	}
 };

package/rules/consistent-function-scoping.js

@@ -1,9 +1,12 @@
 'use strict';
+const {getFunctionHeadLocation, getFunctionNameWithKind} = require('eslint-utils');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const getReferences = require('./utils/get-references');
 
-const MESSAGE_ID_NAMED = 'named';
-const MESSAGE_ID_ANONYMOUS = 'anonymous';
+const MESSAGE_ID = 'consistent-function-scoping';
+const messages = {
+	[MESSAGE_ID]: 'Move {{functionNameWithKind}} to the outer scope.'
+};
 
 const isSameScope = (scope1, scope2) =>
 	scope1 && scope2 && (scope1 === scope2 || scope1.block === scope2.block);
@@ -105,7 +108,8 @@ const iifeFunctionTypes = new Set([
 const isIife = node => node &&
 	iifeFunctionTypes.has(node.type) &&
 	node.parent &&
-	node.parent.type === 'CallExpression';
+	node.parent.type === 'CallExpression' &&
+	node.parent.callee === node;
 
 function checkNode(node, scopeManager) {
 	const scope = scopeManager.acquire(node);
@@ -152,44 +156,30 @@ const create = context => {
 	const {scopeManager} = sourceCode;
 
 	const functions = [];
-	let hasJsx = false;
 
 	return {
-		'ArrowFunctionExpression, FunctionDeclaration': node => functions.push(node),
+		':function': () => {
+			functions.push(false);
+		},
 		JSXElement: () => {
 			// Turn off this rule if we see a JSX element because scope
 			// references does not include JSXElement nodes.
-			hasJsx = true;
+			if (functions.length > 0) {
+				functions[functions.length - 1] = true;
+			}
 		},
-		':matches(ArrowFunctionExpression, FunctionDeclaration):exit': node => {
-			if (!hasJsx && !checkNode(node, scopeManager)) {
-				const functionType = node.type === 'ArrowFunctionExpression' ? 'arrow function' : 'function';
-				let functionName = '';
-				if (node.id) {
-					functionName = node.id.name;
-				} else if (
-					node.parent &&
-					node.parent.type === 'VariableDeclarator' &&
-					node.parent.id &&
-					node.parent.id.type === 'Identifier'
-				) {
-					functionName = node.parent.id.name;
-				}
-
+		':function:exit': node => {
+			const currentFunctionHasJsx = functions.pop();
+			if (!currentFunctionHasJsx && !checkNode(node, scopeManager)) {
 				context.report({
 					node,
-					messageId: functionName ? MESSAGE_ID_NAMED : MESSAGE_ID_ANONYMOUS,
+					loc: getFunctionHeadLocation(node, sourceCode),
+					messageId: MESSAGE_ID,
 					data: {
-						functionType,
-						functionName
+						functionNameWithKind: getFunctionNameWithKind(node)
 					}
 				});
 			}
-
-			functions.pop();
-			if (functions.length === 0) {
-				hasJsx = false;
-			}
 		}
 	};
 };
@@ -201,9 +191,6 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		messages: {
-			[MESSAGE_ID_NAMED]: 'Move {{functionType}} `{{functionName}}` to the outer scope.',
-			[MESSAGE_ID_ANONYMOUS]: 'Move {{functionType}} to the outer scope.'
-		}
+		messages
 	}
 };

package/rules/custom-error-definition.js

@@ -3,6 +3,9 @@ const {upperFirst} = require('lodash');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
 const MESSAGE_ID_INVALID_EXPORT = 'invalidExport';
+const messages = {
+	[MESSAGE_ID_INVALID_EXPORT]: 'Exported error name should match error class'
+};
 
 const nameRegexp = /^(?:[A-Z][\da-z]*)*Error$/;
 
@@ -122,25 +125,19 @@ const customErrorDefinition = (context, node) => {
 		context.report({
 			node: superExpression,
 			message: 'Pass the error message to `super()` instead of setting `this.message`.',
-			fix: fixer => {
-				const fixings = [];
+			* fix(fixer) {
 				if (superExpression.expression.arguments.length === 0) {
 					const rhs = expression.expression.right;
-					fixings.push(
-						fixer.insertTextAfterRange([
-							superExpression.range[0],
-							superExpression.range[0] + 6
-						], rhs.raw || rhs.name)
-					);
+					yield fixer.insertTextAfterRange([
+						superExpression.range[0],
+						superExpression.range[0] + 6
+					], rhs.raw || rhs.name);
 				}
 
-				fixings.push(
-					fixer.removeRange([
-						messageExpressionIndex === 0 ? constructorBodyNode.range[0] : constructorBody[messageExpressionIndex - 1].range[1],
-						expression.range[1]
-					])
-				);
-				return fixings;
+				yield fixer.removeRange([
+					messageExpressionIndex === 0 ? constructorBodyNode.range[0] : constructorBody[messageExpressionIndex - 1].range[1],
+					expression.range[1]
+				]);
 			}
 		});
 	}
@@ -218,8 +215,6 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		fixable: 'code',
-		messages: {
-			[MESSAGE_ID_INVALID_EXPORT]: 'Exported error name should match error class'
-		}
+		messages
 	}
 };

package/rules/error-message.js

@@ -1,6 +1,13 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
+const MESSAGE_ID_MISSING_MESSAGE = 'constructorMissingMessage';
+const MESSAGE_ID_EMPTY_MESSAGE = 'emptyMessage';
+const messages = {
+	[MESSAGE_ID_MISSING_MESSAGE]: 'Pass a message to the error constructor.',
+	[MESSAGE_ID_EMPTY_MESSAGE]: 'Error message should not be an empty string.'
+};
+
 const errorConstructors = new Set([
 	'Error',
 	'EvalError',
@@ -55,14 +62,14 @@ const reportError = (expressionNode, context) => {
 		if (expressionNode.arguments.length === 0) {
 			context.report({
 				node: expressionNode.parent,
-				message: 'Pass a message to the error constructor.'
+				messageId: MESSAGE_ID_MISSING_MESSAGE
 			});
 		}
 
 		if (isEmptyMessageString(expressionNode)) {
 			context.report({
 				node: expressionNode.parent,
-				message: 'Error message should not be an empty string.'
+				messageId: MESSAGE_ID_EMPTY_MESSAGE
 			});
 		}
 	}
@@ -99,6 +106,7 @@ module.exports = {
 		type: 'problem',
 		docs: {
 			url: getDocumentationUrl(__filename)
-		}
+		},
+		messages
 	}
 };

package/rules/escape-case.js

@@ -2,9 +2,13 @@
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const replaceTemplateElement = require('./utils/replace-template-element');
 
+const MESSAGE_ID = 'escape-case';
+const messages = {
+	[MESSAGE_ID]: 'Use uppercase characters for the value of the escape sequence.'
+};
+
 const escapeWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+})/g;
 const escapePatternWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+}|c[a-z])/g;
-const message = 'Use uppercase characters for the value of the escape sequence.';
 
 const create = context => {
 	const check = ({node, original, regex = escapeWithLowercase, fix}) => {
@@ -13,7 +17,7 @@ const create = context => {
 		if (fixed !== original) {
 			context.report({
 				node,
-				message,
+				messageId: MESSAGE_ID,
 				fix: fixer => fix ? fix(fixer, fixed) : fixer.replaceText(node, fixed)
 			});
 		}
@@ -54,6 +58,7 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		fixable: 'code'
+		fixable: 'code',
+		messages
 	}
 };

package/rules/expiring-todo-comments.js

@@ -16,8 +16,31 @@ const MESSAGE_ID_HAVE_PACKAGE = 'unicorn/havePackage';
 const MESSAGE_ID_DONT_HAVE_PACKAGE = 'unicorn/dontHavePackage';
 const MESSAGE_ID_VERSION_MATCHES = 'unicorn/versionMatches';
 const MESSAGE_ID_ENGINE_MATCHES = 'unicorn/engineMatches';
-const MESSAGE_ID_REMOVE_WHITESPACES = 'unicorn/removeWhitespaces';
+const MESSAGE_ID_REMOVE_WHITESPACE = 'unicorn/removeWhitespaces';
 const MESSAGE_ID_MISSING_AT_SYMBOL = 'unicorn/missingAtSymbol';
+const messages = {
+	[MESSAGE_ID_AVOID_MULTIPLE_DATES]:
+		'Avoid using multiple expiration dates in TODO: {{expirationDates}}. {{message}}',
+	[MESSAGE_ID_EXPIRED_TODO]:
+		'There is a TODO that is past due date: {{expirationDate}}. {{message}}',
+	[MESSAGE_ID_REACHED_PACKAGE_VERSION]:
+		'There is a TODO that is past due package version: {{comparison}}. {{message}}',
+	[MESSAGE_ID_AVOID_MULTIPLE_PACKAGE_VERSIONS]:
+		'Avoid using multiple package versions in TODO: {{versions}}. {{message}}',
+	[MESSAGE_ID_HAVE_PACKAGE]:
+		'There is a TODO that is deprecated since you installed: {{package}}. {{message}}',
+	[MESSAGE_ID_DONT_HAVE_PACKAGE]:
+		'There is a TODO that is deprecated since you uninstalled: {{package}}. {{message}}',
+	[MESSAGE_ID_VERSION_MATCHES]:
+		'There is a TODO match for package version: {{comparison}}. {{message}}',
+	[MESSAGE_ID_ENGINE_MATCHES]:
+		'There is a TODO match for Node.js version: {{comparison}}. {{message}}',
+	[MESSAGE_ID_REMOVE_WHITESPACE]:
+		'Avoid using whitespace on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
+	[MESSAGE_ID_MISSING_AT_SYMBOL]:
+		'Missing \'@\' on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
+	...baseRule.meta.messages
+};
 
 const packageResult = readPkgUp.sync();
 const hasPackage = Boolean(packageResult);
@@ -448,16 +471,16 @@ const create = context => {
 				}
 			}
 
-			const withoutWhitespaces = unknown.replace(/ /g, '');
+			const withoutWhitespace = unknown.replace(/ /g, '');
 
-			if (parseArgument(withoutWhitespaces).type !== 'unknowns') {
+			if (parseArgument(withoutWhitespace).type !== 'unknowns') {
 				uses++;
 				context.report({
 					loc: comment.loc,
-					messageId: MESSAGE_ID_REMOVE_WHITESPACES,
+					messageId: MESSAGE_ID_REMOVE_WHITESPACE,
 					data: {
 						original: unknown,
-						fix: withoutWhitespaces,
+						fix: withoutWhitespace,
 						message: parseTodoMessage(comment.value)
 					}
 				});
@@ -509,29 +532,7 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		messages: {
-			[MESSAGE_ID_AVOID_MULTIPLE_DATES]:
-				'Avoid using multiple expiration dates in TODO: {{expirationDates}}. {{message}}',
-			[MESSAGE_ID_EXPIRED_TODO]:
-				'There is a TODO that is past due date: {{expirationDate}}. {{message}}',
-			[MESSAGE_ID_REACHED_PACKAGE_VERSION]:
-				'There is a TODO that is past due package version: {{comparison}}. {{message}}',
-			[MESSAGE_ID_AVOID_MULTIPLE_PACKAGE_VERSIONS]:
-				'Avoid using multiple package versions in TODO: {{versions}}. {{message}}',
-			[MESSAGE_ID_HAVE_PACKAGE]:
-				'There is a TODO that is deprecated since you installed: {{package}}. {{message}}',
-			[MESSAGE_ID_DONT_HAVE_PACKAGE]:
-				'There is a TODO that is deprecated since you uninstalled: {{package}}. {{message}}',
-			[MESSAGE_ID_VERSION_MATCHES]:
-				'There is a TODO match for package version: {{comparison}}. {{message}}',
-			[MESSAGE_ID_ENGINE_MATCHES]:
-				'There is a TODO match for Node.js version: {{comparison}}. {{message}}',
-			[MESSAGE_ID_REMOVE_WHITESPACES]:
-				'Avoid using whitespaces on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
-			[MESSAGE_ID_MISSING_AT_SYMBOL]:
-				'Missing \'@\' on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
-			...baseRule.meta.messages
-		},
+		messages,
 		schema
 	}
 };