prefer-single-call: Check optional chaining (#2788)

Author: fisker

rules/prefer-single-call.js

@@ -14,7 +14,6 @@ const messages = {
 
 const isClassList = node => isMemberExpression(node, {
 	property: 'classList',
-	optional: false,
 	computed: false,
 });
 
@@ -24,7 +23,6 @@ const cases = [
 		test: callExpression => isMethodCall(callExpression, {
 			method: 'push',
 			optionalCall: false,
-			optionalMember: false,
 		}),
 		ignore: [
 			'stream.push',
@@ -57,10 +55,7 @@ const cases = [
 	},
 	{
 		description: 'importScripts()',
-		test: callExpression => isCallExpression(callExpression, {
-			name: 'importScripts',
-			optional: false,
-		}),
+		test: callExpression => isCallExpression(callExpression, {name: 'importScripts'}),
 	},
 ];
 
@@ -76,7 +71,7 @@ function create(context) {
 	return {
 		* CallExpression(secondCall) {
 			for (const {description, test, ignore = []} of cases) {
-				if (!test(secondCall) || secondCall.parent.type !== 'ExpressionStatement') {
+				if (!test(secondCall)) {
 					continue;
 				}
 
@@ -85,12 +80,26 @@ function create(context) {
 					continue;
 				}
 
-				const previousNode = getPreviousNode(secondCall.parent, context);
-				if (previousNode?.type !== 'ExpressionStatement') {
+				let secondExpressionStatement = secondCall.parent;
+				if (secondExpressionStatement.type === 'ChainExpression' && secondCall === secondExpressionStatement.expression) {
+					secondExpressionStatement = secondExpressionStatement.parent;
+				}
+
+				if (secondExpressionStatement.type !== 'ExpressionStatement') {
 					continue;
 				}
 
-				const firstCall = previousNode.expression;
+				const firstExpressionStatement = getPreviousNode(secondExpressionStatement, context);
+				if (firstExpressionStatement?.type !== 'ExpressionStatement') {
+					continue;
+				}
+
+				let firstCall = firstExpressionStatement.expression;
+
+				if (firstCall.type === 'ChainExpression') {
+					firstCall = firstCall.expression;
+				}
+
 				if (!test(firstCall) || !isSameReference(firstCall.callee, secondCall.callee)) {
 					continue;
 				}
@@ -118,12 +127,10 @@ function create(context) {
 						);
 					}
 
-					const firstExpression = firstCall.parent;
-					const secondExpression = secondCall.parent;
-					const shouldKeepSemicolon = !isSemicolonToken(sourceCode.getLastToken(firstExpression))
-						&& isSemicolonToken(sourceCode.getLastToken(secondExpression));
-					const [, start] = sourceCode.getRange(firstExpression);
-					const [, end] = sourceCode.getRange(secondExpression);
+					const shouldKeepSemicolon = !isSemicolonToken(sourceCode.getLastToken(firstExpressionStatement))
+						&& isSemicolonToken(sourceCode.getLastToken(secondExpressionStatement));
+					const [, start] = sourceCode.getRange(firstExpressionStatement);
+					const [, end] = sourceCode.getRange(secondExpressionStatement);
 
 					yield fixer.replaceTextRange([start, end], shouldKeepSemicolon ? ';' : '');
 				};

test/prefer-single-call.js

@@ -90,6 +90,19 @@ test.snapshot({
 			function bar() {}
 			foo.push(bindEvents);
 		`,
+		outdent`
+			foo.push?.(1);
+			foo.push?.(2);
+		`,
+		// Does not allow optional call
+		outdent`
+			foo.push(1);
+			foo.push?.(2);
+		`,
+		outdent`
+			foo.push?.(1);
+			foo.push(2);
+		`,
 	],
 	invalid: [
 		outdent`
@@ -208,6 +221,22 @@ test.snapshot({
 				},
 			],
 		},
+		outdent`
+			foo.push(1);
+			foo?.push(2);
+		`,
+		outdent`
+			foo?.push(1);
+			foo.push(2);
+		`,
+		outdent`
+			foo?.push(1);
+			foo?.push(2);
+		`,
+		outdent`
+			foo?.bar.push(1);
+			foo?.bar.push(2);
+		`,
 	],
 });
 
@@ -255,7 +284,7 @@ test.snapshot({
 		`,
 		outdent`
 			foo.classList.add("foo");
-			foo?.classList.add("bar");
+			foo.classList.add?.("bar");
 		`,
 		outdent`
 			foo.notClassList.add("foo");
@@ -283,6 +312,39 @@ test.snapshot({
 			foo().bar.classList.add("foo");
 			foo().bar.classList.add("bar");
 		`,
+		// Optional
+		outdent`
+			foo.classList?.add("foo");
+			foo.classList.add("bar");
+		`,
+		outdent`
+			foo.classList.add("foo");
+			foo.classList?.add("bar");
+		`,
+		outdent`
+			foo.classList.add?.("foo");
+			foo.classList.add("bar");
+		`,
+		outdent`
+			foo.classList.add("foo");
+			foo.classList.add?.("bar");
+		`,
+		outdent`
+			foo.classList?.remove("foo");
+			foo.classList.remove("bar");
+		`,
+		outdent`
+			foo.classList.remove("foo");
+			foo.classList?.remove("bar");
+		`,
+		outdent`
+			foo.classList.remove?.("foo");
+			foo.classList.remove("bar");
+		`,
+		outdent`
+			foo.classList.remove("foo");
+			foo.classList.remove?.("bar");
+		`,
 	],
 	invalid: [
 		outdent`
@@ -383,6 +445,18 @@ test.snapshot({
 			foo.bar.classList.add(a);
 			(foo)['bar'].classList.add(b);
 		`,
+		outdent`
+			foo?.classList.add("foo");
+			foo.classList.add("bar");
+		`,
+		outdent`
+			foo.classList.add("foo");
+			foo?.classList.add("bar");
+		`,
+		outdent`
+			foo?.classList.add("foo");
+			foo?.classList.add("bar");
+		`,
 	],
 });
 
@@ -504,6 +578,18 @@ test.snapshot({
 			importScripts(b)
 			;[foo].forEach(bar)
 		`,
+		outdent`
+			importScripts?.("foo.js");
+			importScripts("bar.js");
+		`,
+		outdent`
+			importScripts("foo.js");
+			importScripts?.("bar.js");
+		`,
+		outdent`
+			importScripts?.("foo.js");
+			importScripts?.("bar.js");
+		`,
 	],
 });