eslint-plugin-unicorn 69.0.0 → 71.0.0

package/rules/consistent-compound-words.js

@@ -1,10 +1,10 @@
-import helperValidatorIdentifier from '@babel/helper-validator-identifier';
 import {
 	getAvailableVariableName,
 	getScopes,
 	isShorthandPropertyValue,
 	lowerFirst,
 	upperFirst,
+	isIdentifierName,
 } from './utils/index.js';
 import {
 	isClassVariable,
@@ -17,7 +17,6 @@ import {renameVariable} from './fix/index.js';
 
 const MESSAGE_ID_ERROR = 'consistent-compound-words/error';
 const MESSAGE_ID_RENAME = 'consistent-compound-words/rename';
-const {isIdentifierName} = helperValidatorIdentifier;
 
 const messages = {
 	[MESSAGE_ID_ERROR]: 'Prefer `{{replacement}}` over `{{name}}`.',

package/rules/consistent-json-file-read.js

@@ -113,15 +113,12 @@ function isBufferEncoding(node, scope) {
 
 function isJsonReadFileCall(node, scope) {
 	if (
-		!(
-			node
+		!(node
 			&& node.type === 'CallExpression'
 			&& !node.optional
 			&& (node.arguments.length === 1 || node.arguments.length === 2)
 			&& node.arguments.every(node => node.type !== 'SpreadElement')
-			&& node.callee.type === 'MemberExpression'
-			&& !node.callee.optional
-		)
+			&& node.callee.type === 'MemberExpression') || node.callee.optional
 	) {
 		return false;
 	}

package/rules/dom-node-dataset.js

@@ -1,4 +1,3 @@
-import helperValidatorIdentifier from '@babel/helper-validator-identifier';
 import {findVariable} from '@eslint-community/eslint-utils';
 import {
 	escapeString,
@@ -12,6 +11,7 @@ import {
 	needsSemicolon,
 	shouldAddParenthesesToMemberExpressionObject,
 	wouldRemoveComments,
+	isIdentifierName,
 } from './utils/index.js';
 import {removeStatement} from './fix/index.js';
 import {
@@ -21,7 +21,6 @@ import {
 	isExpressionStatement,
 } from './ast/index.js';
 
-const {isIdentifierName} = helperValidatorIdentifier;
 const MESSAGE_ID = 'prefer-dataset';
 const INVERSE_MESSAGE_ID = 'prefer-attributes';
 const messages = {
@@ -106,11 +105,8 @@ function getDatasetVariableReadMembers(variable) {
 
 		const {identifier} = reference;
 		const member = identifier.parent;
-		if (!(
-			member.type === 'MemberExpression'
-			&& member.object === identifier
-			&& !member.optional
-		)) {
+		if (!(member.type === 'MemberExpression'
+			&& member.object === identifier) || member.optional) {
 			return;
 		}
 

package/rules/escape-case.js

@@ -24,14 +24,14 @@ const getProblem = ({node, original, regex = escapeCase, lowercase, fix}) => {
 
 /** @param {import('eslint').Rule.RuleContext} context */
 const create = context => {
-	const lowercase = context.options[0] === 'lowercase';
+	const isLowercase = context.options[0] === 'lowercase';
 
 	context.on('Literal', node => {
 		if (isStringLiteral(node)) {
 			return getProblem({
 				node,
 				original: node.raw,
-				lowercase,
+				lowercase: isLowercase,
 			});
 		}
 	});
@@ -42,7 +42,7 @@ const create = context => {
 				node,
 				original: node.raw,
 				regex: escapePatternCase,
-				lowercase,
+				lowercase: isLowercase,
 			});
 		}
 	});
@@ -55,7 +55,7 @@ const create = context => {
 		return getProblem({
 			node,
 			original: node.value.raw,
-			lowercase,
+			lowercase: isLowercase,
 			fix: (fixer, fixed) => replaceTemplateElement(node, fixed, context, fixer),
 		});
 	});

package/rules/expiring-todo-comments.js

@@ -23,6 +23,7 @@ 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_PEER_VERSION_MATCHES = 'unicorn/peerVersionMatches';
+const MESSAGE_ID_UNSUPPORTED_CATALOG_PROTOCOL = 'unicorn/unsupportedCatalogProtocol';
 const MESSAGE_ID_ENGINE_MATCHES = 'unicorn/engineMatches';
 const MESSAGE_ID_REMOVE_WHITESPACE = 'unicorn/removeWhitespaces';
 const MESSAGE_ID_MISSING_AT_SYMBOL = 'unicorn/missingAtSymbol';
@@ -46,6 +47,8 @@ const messages = {
 		'Due since package version matched: {{comparison}}. {{message}}',
 	[MESSAGE_ID_PEER_VERSION_MATCHES]:
 		'Due since peer dependency version matched: {{comparison}}. {{message}}',
+	[MESSAGE_ID_UNSUPPORTED_CATALOG_PROTOCOL]:
+		'Cannot check {{dependencyType}} version because {{package}} uses the unsupported `catalog:` protocol. {{message}}',
 	[MESSAGE_ID_ENGINE_MATCHES]:
 		'Due since Node.js version matched: {{comparison}}. {{message}}',
 	[MESSAGE_ID_REMOVE_WHITESPACE]:
@@ -188,8 +191,8 @@ function getPackageHelpers(dirname) {
 
 		// Check if have to skip colon
 		// @example "TODO [...]: message here"
-		const dropColon = afterArguments[0] === ':';
-		if (dropColon) {
+		const isDropColon = afterArguments[0] === ':';
+		if (isDropColon) {
 			return afterArguments.slice(1).trim();
 		}
 
@@ -284,6 +287,10 @@ function getRangeFloor(range) {
 	return semver.validRange(range) ? semver.minVersion(range) : undefined;
 }
 
+function isCatalogProtocol(rawVersion) {
+	return typeof rawVersion === 'string' && rawVersion.startsWith('catalog:');
+}
+
 const DEFAULT_OPTIONS = {
 	terms: ['todo', 'fixme', 'xxx'],
 	ignore: [],
@@ -480,6 +487,14 @@ const create = context => {
 				continue;
 			}
 
+			if (isCatalogProtocol(targetPackageRawVersion)) {
+				report(MESSAGE_ID_UNSUPPORTED_CATALOG_PROTOCOL, {
+					dependencyType: 'dependency',
+					package: dependency.name,
+				});
+				continue;
+			}
+
 			const targetPackageVersion = tryToCoerceVersion(targetPackageRawVersion);
 
 			/* c8 ignore start */
@@ -505,6 +520,14 @@ const create = context => {
 				continue;
 			}
 
+			if (isCatalogProtocol(targetPeerRawVersion)) {
+				report(MESSAGE_ID_UNSUPPORTED_CATALOG_PROTOCOL, {
+					dependencyType: 'peer dependency',
+					package: peerDependency.name,
+				});
+				continue;
+			}
+
 			const targetPeerVersion = getRangeFloor(targetPeerRawVersion);
 
 			if (targetPeerVersion && satisfiesRange(targetPeerVersion, peerDependency.condition, peerDependency.version)) {

package/rules/explicit-length-check.js

@@ -250,7 +250,7 @@ function create(context) {
 		}
 
 		let node;
-		let autoFix = true;
+		let isAutoFix = true;
 		let {isZeroLengthCheck, node: lengthCheckNode} = getLengthCheckNode(lengthNode);
 		if (lengthCheckNode) {
 			const {isNegative, node: ancestor} = getBooleanAncestor(lengthCheckNode, context);
@@ -266,7 +266,7 @@ function create(context) {
 			} else if (isLogicalExpression(lengthNode.parent) && lengthNode.parent.operator === '&&') {
 				isZeroLengthCheck = isNegative;
 				node = lengthNode;
-				autoFix = false;
+				isAutoFix = false;
 			}
 		}
 
@@ -287,7 +287,7 @@ function create(context) {
 				node,
 				isZeroLengthCheck,
 				lengthNode,
-				autoFix: autoFix && !isUnsafeNegationInBinaryExpression,
+				autoFix: isAutoFix && !isUnsafeNegationInBinaryExpression,
 				shouldSuggest: !isUnsafeNegationInBinaryExpression,
 			});
 		}

package/rules/filename-case.js

@@ -280,8 +280,8 @@ const create = context => {
 
 		return new RegExp(item, 'u');
 	});
-	const multipleFileExtensions = options.multipleFileExtensions !== false;
-	const checkDirectories = options.checkDirectories !== false;
+	const isMultipleFileExtensions = options.multipleFileExtensions !== false;
+	const isCheckDirectories = options.checkDirectories !== false;
 	const chosenCasesFunctions = chosenCases.map(case_ => cases[case_].fn);
 
 	onRoot(context, () => {
@@ -292,13 +292,13 @@ const create = context => {
 			filename,
 			middle,
 			extension,
-		} = getFilenameParts(basenameWithExtension, {multipleFileExtensions});
+		} = getFilenameParts(basenameWithExtension, {multipleFileExtensions: isMultipleFileExtensions});
 
 		if (pathSegments.some(segment => ignore.some(regexp => regexp.test(segment)))) {
 			return;
 		}
 
-		if (checkDirectories) {
+		if (isCheckDirectories) {
 			for (const directory of pathSegments.slice(0, -1)) {
 				const report = getInvalidDirectoryReport(directory, chosenCases, chosenCasesFunctions);
 

package/rules/fix/{add-parenthesizes-to-return-or-throw-expression.js → add-parentheses-to-return-or-throw-expression.js}

@@ -11,7 +11,7 @@ import {isSemicolonToken} from '@eslint-community/eslint-utils';
 @param {ESLint.Rule.RuleContext} context - The ESLint rule context object.
 @returns {ESLint.Rule.ReportFixer}
 */
-export default function * addParenthesizesToReturnOrThrowExpression(fixer, node, context) {
+export default function * addParenthesesToReturnOrThrowExpression(fixer, node, context) {
 	if (node.type !== 'ReturnStatement' && node.type !== 'ThrowStatement') {
 		return;
 	}

package/rules/fix/index.js

@@ -21,4 +21,4 @@ export {default as replaceReferenceIdentifier} from './replace-reference-identif
 export {default as replaceNodeOrTokenAndSpacesBefore} from './replace-node-or-token-and-spaces-before.js';
 export {default as fixSpaceAroundKeyword} from './fix-space-around-keywords.js';
 export {default as replaceStringRaw} from './replace-string-raw.js';
-export {default as addParenthesizesToReturnOrThrowExpression} from './add-parenthesizes-to-return-or-throw-expression.js';
+export {default as addParenthesesToReturnOrThrowExpression} from './add-parentheses-to-return-or-throw-expression.js';

package/rules/fix/remove-argument.js

@@ -1,5 +1,5 @@
 import {isCommaToken} from '@eslint-community/eslint-utils';
-import {getParentheses} from '../utils/index.js';
+import {getParentheses, hasCommentInRange} from '../utils/index.js';
 
 /**
 @import {TSESTree as ESTree} from '@typescript-eslint/types';
@@ -22,17 +22,22 @@ function getArgumentRemovalRange(node, context) {
 	let [start] = sourceCode.getRange(firstToken);
 	let [, end] = sourceCode.getRange(lastToken);
 
-	if (index !== 0) {
-		const commaToken = sourceCode.getTokenBefore(firstToken);
-		[start] = sourceCode.getRange(commaToken);
-	}
-
-	// If the removed argument is the only argument, the trailing comma must be removed too
 	if (callOrNewExpression.arguments.length === 1) {
+		// The only argument: also drop a dangling trailing comma if present (`fn(a,)`).
 		const tokenAfter = sourceCode.getTokenAfter(lastToken);
 		if (isCommaToken(tokenAfter)) {
 			[, end] = sourceCode.getRange(tokenAfter);
 		}
+	} else if (index === 0) {
+		// First of several: remove it through the following comma and the gap after it, so
+		// `fn(a, b)` becomes `fn(b)` rather than `fn( b)`.
+		const commaToken = sourceCode.getTokenAfter(lastToken);
+		const tokenAfterComma = sourceCode.getTokenAfter(commaToken, {includeComments: true});
+		[end] = sourceCode.getRange(tokenAfterComma);
+	} else {
+		// Otherwise remove the comma that precedes it.
+		const commaToken = sourceCode.getTokenBefore(firstToken);
+		[start] = sourceCode.getRange(commaToken);
 	}
 
 	return [start, end];
@@ -45,7 +50,28 @@ function getArgumentRemovalRange(node, context) {
 @returns {ESLint.Rule.Fix}
 */
 export default function removeArgument(fixer, node, context) {
-	return fixer.removeRange(getArgumentRemovalRange(node, context));
+	const removalRange = getArgumentRemovalRange(node, context);
+	const callOrNewExpression = node.parent;
+	const index = callOrNewExpression.arguments.indexOf(node);
+
+	if (
+		index === 0
+		&& callOrNewExpression.arguments.length > 1
+		&& hasCommentInRange(context, removalRange)
+	) {
+		const {sourceCode} = context;
+		const parentheses = getParentheses(node, context);
+		const lastToken = parentheses.at(-1) || node;
+		const [, argumentEnd] = sourceCode.getRange(lastToken);
+		const commaToken = sourceCode.getTokenAfter(lastToken);
+		const [commaStart, commaEnd] = sourceCode.getRange(commaToken);
+		const rangeText = sourceCode.text.slice(...removalRange);
+		const replacement = rangeText.slice(argumentEnd - removalRange[0], commaStart - removalRange[0]) + rangeText.slice(commaEnd - removalRange[0]);
+
+		return fixer.replaceTextRange(removalRange, replacement);
+	}
+
+	return fixer.removeRange(removalRange);
 }
 
 export {

package/rules/fix/remove-statement.js

@@ -3,7 +3,7 @@ import {isSemicolonToken} from '@eslint-community/eslint-utils';
 const isWhitespaceOnly = text => /^\s*$/.test(text);
 
 // Removes a statement node along with its surrounding whitespace, while preserving comments.
-function removeStatement(statement, context, fixer, preserveSemiColon = false) {
+export default function removeStatement(statement, context, fixer, preserveSemiColon = false) {
 	const {sourceCode} = context;
 	const {lines} = sourceCode;
 	let endToken = statement;
@@ -44,5 +44,3 @@ function removeStatement(statement, context, fixer, preserveSemiColon = false) {
 
 	return fixer.removeRange([start, end]);
 }
-
-export default removeStatement;

package/rules/fix/switch-new-expression-to-call-expression.js

@@ -3,7 +3,7 @@ import {
 	isParenthesized,
 	isOnSameLine,
 } from '../utils/index.js';
-import addParenthesizesToReturnOrThrowExpression from './add-parenthesizes-to-return-or-throw-expression.js';
+import addParenthesesToReturnOrThrowExpression from './add-parentheses-to-return-or-throw-expression.js';
 import removeSpaceAfter from './remove-spaces-after.js';
 
 /**
@@ -39,6 +39,6 @@ export default function * switchNewExpressionToCallExpression(newExpression, con
 	if (!isOnSameLine(newToken, newExpression.callee, context) && !isParenthesized(newExpression, context)) {
 		// Ideally, we should use first parenthesis of the `callee`, and should check spaces after the `new` token
 		// But adding extra parentheses is harmless, no need to be too complicated
-		yield addParenthesizesToReturnOrThrowExpression(fixer, newExpression.parent, context);
+		yield addParenthesesToReturnOrThrowExpression(fixer, newExpression.parent, context);
 	}
 }

package/rules/id-match.js

@@ -26,11 +26,11 @@ const shouldIgnoreNamedSpecifierReport = (problem, checkNamedSpecifiers) =>
 @param {import('eslint').Rule.RuleContext} context
 */
 const create = context => {
-	const checkNamedSpecifiers = context.options[1]?.checkNamedSpecifiers !== false;
+	const isCheckNamedSpecifiers = context.options[1]?.checkNamedSpecifiers !== false;
 	const fakeContext = Object.create(context, {
 		report: {
 			value(problem) {
-				if (shouldIgnoreNamedSpecifierReport(problem, checkNamedSpecifiers)) {
+				if (shouldIgnoreNamedSpecifierReport(problem, isCheckNamedSpecifiers)) {
 					return;
 				}
 

package/rules/index.js

@@ -53,6 +53,7 @@ export {default as 'no-array-sort-for-min-max'} from './no-array-sort-for-min-ma
 export {default as 'no-array-sort'} from './no-array-sort.js';
 export {default as 'no-array-splice'} from './no-array-splice.js';
 export {default as 'no-asterisk-prefix-in-documentation-comments'} from './no-asterisk-prefix-in-documentation-comments.js';
+export {default as 'no-async-promise-finally'} from './no-async-promise-finally.js';
 export {default as 'no-await-expression-member'} from './no-await-expression-member.js';
 export {default as 'no-await-in-promise-methods'} from './no-await-in-promise-methods.js';
 export {default as 'no-blob-to-file'} from './no-blob-to-file.js';
@@ -129,9 +130,11 @@ export {default as 'no-typeof-undefined'} from './no-typeof-undefined.js';
 export {default as 'no-uncalled-method'} from './no-uncalled-method.js';
 export {default as 'no-undeclared-class-members'} from './no-undeclared-class-members.js';
 export {default as 'no-unnecessary-array-flat-depth'} from './no-unnecessary-array-flat-depth.js';
+export {default as 'no-unnecessary-array-flat-map'} from './no-unnecessary-array-flat-map.js';
 export {default as 'no-unnecessary-array-splice-count'} from './no-unnecessary-array-splice-count.js';
 export {default as 'no-unnecessary-await'} from './no-unnecessary-await.js';
 export {default as 'no-unnecessary-boolean-comparison'} from './no-unnecessary-boolean-comparison.js';
+export {default as 'no-unnecessary-fetch-options'} from './no-unnecessary-fetch-options.js';
 export {default as 'no-unnecessary-global-this'} from './no-unnecessary-global-this.js';
 export {default as 'no-unnecessary-nested-ternary'} from './no-unnecessary-nested-ternary.js';
 export {default as 'no-unnecessary-polyfills'} from './no-unnecessary-polyfills.js';
@@ -144,6 +147,7 @@ export {default as 'no-unreadable-new-expression'} from './no-unreadable-new-exp
 export {default as 'no-unreadable-object-destructuring'} from './no-unreadable-object-destructuring.js';
 export {default as 'no-unsafe-buffer-conversion'} from './no-unsafe-buffer-conversion.js';
 export {default as 'no-unsafe-dom-html'} from './no-unsafe-dom-html.js';
+export {default as 'no-unsafe-promise-all-settled-values'} from './no-unsafe-promise-all-settled-values.js';
 export {default as 'no-unsafe-property-key'} from './no-unsafe-property-key.js';
 export {default as 'no-unsafe-string-replacement'} from './no-unsafe-string-replacement.js';
 export {default as 'no-unused-array-method-return'} from './no-unused-array-method-return.js';
@@ -173,6 +177,7 @@ export {default as 'no-zero-fractions'} from './no-zero-fractions.js';
 export {default as 'number-literal-case'} from './number-literal-case.js';
 export {default as 'numeric-separators-style'} from './numeric-separators-style.js';
 export {default as 'operator-assignment'} from './operator-assignment.js';
+export {default as 'prefer-abort-signal-any'} from './prefer-abort-signal-any.js';
 export {default as 'prefer-abort-signal-timeout'} from './prefer-abort-signal-timeout.js';
 export {default as 'prefer-add-event-listener-options'} from './prefer-add-event-listener-options.js';
 export {default as 'prefer-add-event-listener'} from './prefer-add-event-listener.js';
@@ -182,6 +187,7 @@ export {default as 'prefer-array-flat-map'} from './prefer-array-flat-map.js';
 export {default as 'prefer-array-flat'} from './prefer-array-flat.js';
 export {default as 'prefer-array-from-async'} from './prefer-array-from-async.js';
 export {default as 'prefer-array-from-map'} from './prefer-array-from-map.js';
+export {default as 'prefer-array-from-range'} from './prefer-array-from-range.js';
 export {default as 'prefer-array-index-of'} from './prefer-array-index-of.js';
 export {default as 'prefer-array-iterable-methods'} from './prefer-array-iterable-methods.js';
 export {default as 'prefer-array-last-methods'} from './prefer-array-last-methods.js';
@@ -191,6 +197,7 @@ export {default as 'prefer-at'} from './prefer-at.js';
 export {default as 'prefer-await'} from './prefer-await.js';
 export {default as 'prefer-bigint-literals'} from './prefer-bigint-literals.js';
 export {default as 'prefer-blob-reading-methods'} from './prefer-blob-reading-methods.js';
+export {default as 'prefer-block-statement-over-iife'} from './prefer-block-statement-over-iife.js';
 export {default as 'prefer-boolean-return'} from './prefer-boolean-return.js';
 export {default as 'prefer-class-fields'} from './prefer-class-fields.js';
 export {default as 'prefer-classlist-toggle'} from './prefer-classlist-toggle.js';
@@ -214,6 +221,7 @@ export {default as 'prefer-flat-math-min-max'} from './prefer-flat-math-min-max.
 export {default as 'prefer-get-or-insert-computed'} from './prefer-get-or-insert-computed.js';
 export {default as 'prefer-global-number-constants'} from './prefer-global-number-constants.js';
 export {default as 'prefer-global-this'} from './prefer-global-this.js';
+export {default as 'prefer-group-by'} from './prefer-group-by.js';
 export {default as 'prefer-has-check'} from './prefer-has-check.js';
 export {default as 'prefer-hoisting-branch-code'} from './prefer-hoisting-branch-code.js';
 export {default as 'prefer-https'} from './prefer-https.js';
@@ -223,6 +231,7 @@ export {default as 'prefer-includes-over-repeated-comparisons'} from './prefer-i
 export {default as 'prefer-includes'} from './prefer-includes.js';
 export {default as 'prefer-iterable-in-constructor'} from './prefer-iterable-in-constructor.js';
 export {default as 'prefer-iterator-concat'} from './prefer-iterator-concat.js';
+export {default as 'prefer-iterator-helpers'} from './prefer-iterator-helpers.js';
 export {default as 'prefer-iterator-to-array-at-end'} from './prefer-iterator-to-array-at-end.js';
 export {default as 'prefer-iterator-to-array'} from './prefer-iterator-to-array.js';
 export {default as 'prefer-keyboard-event-key'} from './prefer-keyboard-event-key.js';
@@ -267,6 +276,7 @@ export {default as 'prefer-set-size'} from './prefer-set-size.js';
 export {default as 'prefer-short-arrow-method'} from './prefer-short-arrow-method.js';
 export {default as 'prefer-simple-condition-first'} from './prefer-simple-condition-first.js';
 export {default as 'prefer-simple-sort-comparator'} from './prefer-simple-sort-comparator.js';
+export {default as 'prefer-simplified-conditions'} from './prefer-simplified-conditions.js';
 export {default as 'prefer-single-array-predicate'} from './prefer-single-array-predicate.js';
 export {default as 'prefer-single-call'} from './prefer-single-call.js';
 export {default as 'prefer-single-object-destructuring'} from './prefer-single-object-destructuring.js';