Improve compatibility with optional chaining

rules/catch-error-name.js

@@ -21,13 +21,11 @@ const isPromiseCatchParameter = node =>
 			method: 'then',
 			argumentsLength: 2,
 			optionalCall: false,
-			optionalMember: false,
 		})
 		|| isMethodCall(node.parent.parent, {
 			method: 'catch',
 			argumentsLength: 1,
 			optionalCall: false,
-			optionalMember: false,
 		})
 	)
 	&& node.parent.parent.arguments.at(-1) === node.parent;

rules/import-style.js

@@ -261,8 +261,7 @@ const create = context => {
 				isCallExpression(node, {
 					name: 'require',
 					argumentsLength: 1,
-					optionalCall: false,
-					optionalMember: false,
+					optional: false,
 				})
 				&& (node.parent.type === 'ExpressionStatement' && node.parent.expression === node)
 			)) {

rules/no-array-method-this-argument.js

@@ -166,7 +166,6 @@ const create = context => {
 				],
 				argumentsLength: 2,
 				optionalCall: false,
-				optionalMember: false,
 			})
 			|| isNodeMatches(callExpression.callee, ignored)
 			|| isNodeValueNotFunction(callExpression.arguments[0])

rules/no-invalid-remove-event-listener.js

@@ -14,7 +14,6 @@ const create = context => ({
 				method: 'removeEventListener',
 				minimumArguments: 2,
 				optionalCall: false,
-				optionalMember: false,
 			})
 			&& callExpression.arguments[0].type !== 'SpreadElement'
 			&& (

rules/no-null.js

@@ -64,7 +64,6 @@ const create = context => {
 						method: 'insertBefore',
 						argumentsLength: 2,
 						optionalCall: false,
-						optionalMember: false,
 					})
 					&& node.parent.arguments[1] === node
 				)

rules/prefer-array-find.js

@@ -38,12 +38,12 @@ const messages = {
 	[SUGGESTION_LOGICAL_OR_OPERATOR]: 'Replace `.filter(…)` with `.find(…) || …`.',
 };
 
-const isArrayFilterCall = node => isMethodCall(node, {
+const isArrayFilterCall = (node, options) => isMethodCall(node, {
 	method: 'filter',
 	minimumArguments: 1,
 	maximumArguments: 2,
 	optionalCall: false,
-	optionalMember: false,
+	...options,
 });
 
 // Need add `()` to the `AssignmentExpression`
@@ -184,6 +184,8 @@ const create = context => {
 	};
 
 	// Zero index access
+	// `array.filter()[0]`
+	// `array?.filter()[0]`
 	context.on('MemberExpression', node => {
 		if (!(
 			node.computed
@@ -206,6 +208,7 @@ const create = context => {
 	});
 
 	// `array.filter().shift()`
+	// `array?.filter().shift()`
 	context.on('CallExpression', node => {
 		if (!(
 			isMethodCall(node, {
@@ -236,7 +239,7 @@ const create = context => {
 			&& node.id.elements.length === 1
 			&& node.id.elements[0]
 			&& node.id.elements[0].type !== 'RestElement'
-			&& isArrayFilterCall(node.init)
+			&& isArrayFilterCall(node.init, {optionalMember: false})
 		)) {
 			return;
 		}
@@ -255,7 +258,7 @@ const create = context => {
 			&& node.left.elements.length === 1
 			&& node.left.elements[0]
 			&& node.left.elements[0].type !== 'RestElement'
-			&& isArrayFilterCall(node.right)
+			&& isArrayFilterCall(node.right, {optionalMember: false})
 		)) {
 			return;
 		}
@@ -271,7 +274,7 @@ const create = context => {
 	context.on('VariableDeclarator', node => {
 		if (!(
 			node.id.type === 'Identifier'
-			&& isArrayFilterCall(node.init)
+			&& isArrayFilterCall(node.init, {optionalMember: false})
 			&& node.parent.type === 'VariableDeclaration'
 			&& node.parent.declarations.includes(node)
 			// Exclude `export const foo = [];`
@@ -337,6 +340,7 @@ const create = context => {
 	});
 
 	// `array.filter().at(0)`
+	// `array?.filter().at(0)`
 	context.on('CallExpression', node => {
 		if (!(
 			isMethodCall(node, {
@@ -367,6 +371,7 @@ const create = context => {
 	}
 
 	// `array.filter().pop()`
+	// `array?.filter().pop()`
 	context.on('CallExpression', node => {
 		if (!(
 			isMethodCall(node, {
@@ -391,6 +396,7 @@ const create = context => {
 	});
 
 	// `array.filter().at(-1)`
+	// `array?.filter().at(-1)`
 	context.on('CallExpression', node => {
 		if (!(
 			isMethodCall(node, {

rules/prefer-array-flat-map.js

@@ -29,7 +29,6 @@ const create = context => ({
 			&& isMethodCall(callExpression.callee.object, {
 				method: 'map',
 				optionalCall: false,
-				optionalMember: false,
 			})
 		)) {
 			return;

rules/prefer-array-flat.js

@@ -27,7 +27,6 @@
 			method: 'flatMap',
 			argumentsLength: 1,
 			optionalCall: false,
-			optionalMember: false,
 		})) {
 			return false;
 		}
@@ -41,18 +40,20 @@
 		);
 	},
 	getArrayNode: node => node.callee.object,
+	isOptionalArray: node => node.callee.optional,
 	description: 'Array#flatMap()',
 };
 
 // `array.reduce((a, b) => a.concat(b), [])`
+// `array?.reduce((a, b) => a.concat(b), [])`
 // `array.reduce((a, b) => [...a, ...b], [])`
+// `array?.reduce((a, b) => [...a, ...b], [])`
 const arrayReduce = {
 	testFunction(node) {
 		if (!isMethodCall(node, {
 			method: 'reduce',
 			argumentsLength: 2,
 			optionalCall: false,
-			optionalMember: false,
 		})) {
 			return false;
 		}
@@ -94,6 +95,7 @@
 		);
 	},
 	getArrayNode: node => node.callee.object,
+	isOptionalArray: node => node.callee.optional,
 	description: 'Array#reduce()',
 };
 
@@ -159,7 +161,7 @@
 	'underscore.flatten',
 ];
 
-function fix(node, array, sourceCode, shouldSwitchToArray) {
+function fix(node, array, sourceCode, shouldSwitchToArray, optional) {
 	if (typeof shouldSwitchToArray === 'function') {
 		shouldSwitchToArray = shouldSwitchToArray(node);
 	}
@@ -177,7 +179,7 @@
 			fixed = `(${fixed})`;
 		}
 
-		fixed = `${fixed}.flat()`;
+		fixed = `${fixed}${optional ? '?' : ''}.flat()`;
 
 		const tokenBefore = sourceCode.getTokenBefore(node);
 		if (needsSemicolon(tokenBefore, sourceCode, fixed)) {
@@ -214,12 +216,13 @@
 
 	return {
 		* CallExpression(node) {
-			for (const {testFunction, description, getArrayNode, shouldSwitchToArray} of cases) {
+			for (const {testFunction, description, getArrayNode, shouldSwitchToArray, isOptionalArray} of cases) {
 				if (!testFunction(node)) {
 					continue;
 				}
 
 				const array = getArrayNode(node);
+				const optional = isOptionalArray?.(node);
 
 				const data = {
 					description: typeof description === 'string' ? description : description(node),
@@ -238,7 +241,7 @@
 					sourceCode.getCommentsInside(node).length
 					=== sourceCode.getCommentsInside(array).length
 				) {
-					problem.fix = fix(node, array, sourceCode, shouldSwitchToArray);
+					problem.fix = fix(node, array, sourceCode, shouldSwitchToArray, optional);
 				}
 
 				yield problem;

rules/prefer-at.js

@@ -147,8 +147,7 @@ function create(context) {
 	// Index access
 	context.on('MemberExpression', node => {
 		if (
-			node.optional
-			|| !node.computed
+			!node.computed
 			|| isLeftHandSide(node)
 		) {
 			return;
@@ -202,8 +201,9 @@ function create(context) {
 				}
 			}
 
+			const isOptional = node.optional;
 			const openingBracketToken = sourceCode.getTokenBefore(indexNode, isOpeningBracketToken);
-			yield fixer.replaceText(openingBracketToken, '.at(');
+			yield fixer.replaceText(openingBracketToken, `${isOptional ? '' : '.'}at(`);
 
 			const closingBracketToken = sourceCode.getTokenAfter(indexNode, isClosingBracketToken);
 			yield fixer.replaceText(closingBracketToken, ')');
@@ -218,7 +218,6 @@ function create(context) {
 			method: 'charAt',
 			argumentsLength: 1,
 			optionalCall: false,
-			optionalMember: false,
 		})) {
 			return;
 		}
@@ -254,7 +253,6 @@ function create(context) {
 			minimumArguments: 1,
 			maximumArguments: 2,
 			optionalCall: false,
-			optionalMember: false,
 		})) {
 			return;
 		}

rules/prefer-code-point.js

@@ -11,7 +11,6 @@ const getReplacement = node => {
 	if (isMethodCall(node, {
 		method: 'charCodeAt',
 		optionalCall: false,
-		optionalMember: false,
 	})) {
 		return 'codePointAt';
 	}

rules/prefer-dom-node-dataset.js

@@ -14,7 +14,7 @@
 	const method = callExpression.callee.property.name;
 
 	// `foo?.bar = ''` is invalid
 	// TODO: Remove this restriction if https://github.com/nicolo-ribaudo/ecma262/pull/4 get merged
 	if (method === 'setAttribute' && hasOptionalChainElement(callExpression.callee)) {
 		return;
 	}
@@ -33,7 +33,7 @@
 		const name = dashToCamelCase(nameNode.value.toLowerCase().slice(5));
 		const {sourceCode} = context;
 		let text = '';
-		const datasetText = `${sourceCode.getText(callExpression.callee.object)}.dataset`;
+		const datasetText = `${sourceCode.getText(callExpression.callee.object)}${callExpression.callee.optional ? '?' : ''}.dataset`;
 		switch (method) {
 			case 'setAttribute':
 			case 'getAttribute':
@@ -76,11 +76,16 @@
 					optionalMember: false,
 				})
 				|| isMethodCall(callExpression, {
-					methods: ['getAttribute', 'removeAttribute', 'hasAttribute'],
+					methods: ['removeAttribute', 'hasAttribute'],
 					argumentsLength: 1,
 					optionalCall: false,
 					optionalMember: false,
 				})
+				|| isMethodCall(callExpression, {
+					method: 'getAttribute',
+					argumentsLength: 1,
+					optionalCall: false,
+				})
 			)
 			&& isStringLiteral(callExpression.arguments[0])
 		)) {

rules/prefer-string-replace-all.js

@@ -113,7 +113,6 @@ const create = context => ({
 			methods: ['replace', 'replaceAll'],
 			argumentsLength: 2,
 			optionalCall: false,
-			optionalMember: false,
 		})) {
 			return;
 		}

rules/require-number-to-fixed-digits-argument.js

@@ -14,7 +14,6 @@ const create = context => ({
 				method: 'toFixed',
 				argumentsLength: 0,
 				optionalCall: false,
-				optionalMember: false,
 			})
 			|| node.callee.object.type === 'NewExpression'
 		) {

rules/require-post-message-target-origin.js

@@ -17,7 +17,6 @@ function create(context) {
 				method: 'postMessage',
 				argumentsLength: 1,
 				optionalCall: false,
-				optionalMember: false,
 			})) {
 				return;
 			}

rules/shared/simple-array-search-rule.js

@@ -57,7 +57,6 @@ export default function simpleArraySearchRule({method, replacement}) {
 					method,
 					argumentsLength: 1,
 					optionalCall: false,
-					optionalMember: false,
 				})
 				|| !isSimpleCompareCallbackFunction(callExpression.arguments[0])
 			) {

test/catch-error-name.js

@@ -73,8 +73,11 @@
 			}
 		`,
 		'obj.catch(error => {})',
+		'obj.catch?.(error => {})',
 		'obj.then(undefined, error => {})',
 		'obj.then(result => {}, error => {})',
+		'obj.then?.(undefined, error => {})',
+		'obj.then?.(result => {}, error => {})',
 		outdent`
 			const handleError = error => {
 				obj.catch(error_ => { });
@@ -321,6 +324,11 @@
 			output: 'obj.catch(error => error)',
 			errors: [generateError('err', 'error')],
 		}),
+		invalidTestCase({
+			code: 'obj?.catch(err => err)',
+			output: 'obj?.catch(error => error)',
+			errors: [generateError('err', 'error')],
+		}),
 		invalidTestCase({
 			code: 'obj.then(undefined, err => err)',
 			output: 'obj.then(undefined, error => error)',
@@ -338,6 +346,12 @@
 			name: 'err',
 			errors: [generateError('error', 'err')],
 		}),
+		invalidTestCase({
+			code: 'obj?.then(undefined, error => error.stack)',
+			output: 'obj?.then(undefined, err => err.stack)',
+			name: 'err',
+			errors: [generateError('error', 'err')],
+		}),
 		invalidTestCase({
 			code: outdent`
 				obj.catch(function (err) {
@@ -364,7 +378,7 @@
 			`,
 			errors: [generateError('err', 'error')],
 		}),
 		// TODO: this could fix to `error`
 		invalidTestCase({
 			code: outdent`
 				obj.then(

test/no-array-method-this-argument.js

@@ -8,7 +8,6 @@ test.snapshot({
 		'array.unknownMethod(() => {}, thisArgument)',
 		'new array.map(() => {}, thisArgument)',
 		'array.map?.(() => {}, thisArgument)',
-		'array?.map(() => {}, thisArgument)',
 		'Array.unknownMethod(iterableOrArrayLike, () => {}, thisArgument)',
 		'new Array.from(iterableOrArrayLike, () => {}, thisArgument)',
 		'Array.from?.(iterableOrArrayLike, () => {}, thisArgument)',
@@ -25,6 +24,7 @@ test.snapshot({
 		'array.map(() => {}, ...thisArgument)',
 		'array.map(...() => {}, thisArgument)',
 		'array.map(() => {}, thisArgument, extraArgument)',
+		'Array?.from(iterableOrArrayLike, () => {}, thisArgument)',
 		'Array.from()',
 		'Array.from(iterableOrArrayLike)',
 		'Array.from(iterableOrArrayLike, () => {},)',
@@ -39,6 +39,7 @@ test.snapshot({
 		'Array.fromAsync(iterableOrArrayLike, ...() => {}, thisArgument)',
 		'Array.fromAsync(...iterableOrArrayLike, () => {}, thisArgument)',
 		'Array.fromAsync(iterableOrArrayLike, () => {}, thisArgument, extraArgument)',
+		'Array?.fromAsync(iterableOrArrayLike, () => {}, thisArgument)',
 
 		// Ignored
 		'lodash.every(array, () => {})',
@@ -79,6 +80,7 @@ test.snapshot({
 		'array.flatMap(() => {}, thisArgument)',
 		'array.forEach(() => {}, thisArgument)',
 		'array.map(() => {}, thisArgument)',
+		'array?.map(() => {}, thisArgument)',
 		'Array.from(iterableOrArrayLike, () => {}, thisArgument)',
 		'Array.fromAsync(iterableOrArrayLike, () => {}, thisArgument)',
 		// Comma
@@ -88,6 +90,7 @@ test.snapshot({
 		'Array.fromAsync(iterableOrArrayLike, () => {}, thisArgument,)',
 		// Side effect
 		'array.map(() => {}, thisArgumentHasSideEffect())',
+		'array?.map(() => {}, thisArgumentHasSideEffect())',
 		'Array.from(iterableOrArrayLike, () => {}, thisArgumentHasSideEffect())',
 		'Array.fromAsync(iterableOrArrayLike, () => {}, thisArgumentHasSideEffect())',
 	],