Remove selector helpers (#2128)

Author: fisker

rules/no-negated-condition.js

@@ -3,7 +3,6 @@ Based on ESLint builtin `no-negated-condition` rule
 https://github.com/eslint/eslint/blob/5c39425fc55ecc0b97bbd07ac22654c0eb4f789c/lib/rules/no-negated-condition.js
 */
 'use strict';
-const {matches} = require('./selectors/index.js');
 const {
 	removeParentheses,
 	fixSpaceAroundKeyword,
@@ -21,18 +20,6 @@ const messages = {
 	[MESSAGE_ID]: 'Unexpected negated condition.',
 };
 
-const selector = [
-	matches([
-		'IfStatement[alternate][alternate.type!="IfStatement"]',
-		'ConditionalExpression',
-	]),
-	matches([
-		'[test.type="UnaryExpression"][test.operator="!"]',
-		'[test.type="BinaryExpression"][test.operator="!="]',
-		'[test.type="BinaryExpression"][test.operator="!=="]',
-	]),
-].join('');
-
 function * convertNegatedCondition(fixer, node, sourceCode) {
 	const {test} = node;
 	if (test.type === 'UnaryExpression') {
@@ -82,10 +69,32 @@ function * swapConsequentAndAlternate(fixer, node, sourceCode) {
 }
 
 /** @param {import('eslint').Rule.RuleContext} context */
-const create = context => ({
-	[selector](node) {
+const create = context => {
+	context.on([
+		'IfStatement',
+		'ConditionalExpression',
+	], node => {
+		if (
+			node.type === 'IfStatement'
+			&& (
+				!node.alternate
+				|| node.alternate.type === 'IfStatement'
+			)
+		) {
+			return;
+		}
+
+		const {test} = node;
+
+		if (!(
+			(test.type === 'UnaryExpression' && test.operator === '!')
+			|| (test.type === 'BinaryExpression' && (test.operator === '!=' || test.operator === '!=='))
+		)) {
+			return;
+		}
+
 		return {
-			node: node.test,
+			node: test,
 			messageId: MESSAGE_ID,
 			/** @param {import('eslint').Rule.RuleFixer} fixer */
 			* fix(fixer) {
@@ -95,14 +104,14 @@ const create = context => ({
 
 				if (
 					node.type !== 'ConditionalExpression'
-					|| node.test.type !== 'UnaryExpression'
+					|| test.type !== 'UnaryExpression'
 				) {
 					return;
 				}
 
 				yield * fixSpaceAroundKeyword(fixer, node, sourceCode);
 
-				const {test, parent} = node;
+				const {parent} = node;
 				const [firstToken, secondToken] = sourceCode.getFirstTokens(test, 2);
 				if (
 					(parent.type === 'ReturnStatement' || parent.type === 'ThrowStatement')
@@ -121,8 +130,8 @@ const create = context => ({
 				}
 			},
 		};
-	},
-});
+	});
+};
 
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {

rules/prefer-native-coercion-functions.js

@@ -1,6 +1,5 @@
 'use strict';
 const {getFunctionHeadLocation, getFunctionNameWithKind} = require('@eslint-community/eslint-utils');
-const {not} = require('./selectors/index.js');
 
 const MESSAGE_ID = 'prefer-native-coercion-functions';
 const messages = {
@@ -69,19 +68,6 @@ function getCallExpression(node) {
 	}
 }
 
-const functionsSelector = [
-	':function',
-	'[async!=true]',
-	'[generator!=true]',
-	'[params.length>0]',
-	'[params.0.type="Identifier"]',
-	not([
-		'MethodDefinition[kind="constructor"] > .value',
-		'MethodDefinition[kind="set"] > .value',
-		'Property[kind="set"] > .value',
-	]),
-].join('');
-
 function getArrayCallbackProblem(node) {
 	if (!isArrayIdentityCallback(node)) {
 		return;
@@ -129,8 +115,31 @@ function getCoercionFunctionProblem(node) {
 }
 
 /** @param {import('eslint').Rule.RuleContext} context */
-const create = context => ({
-	[functionsSelector](node) {
+const create = context => {
+	context.on([
+		'FunctionDeclaration',
+		'FunctionExpression',
+		'ArrowFunctionExpression',
+	], node => {
+		if (
+			node.async
+			|| node.generator
+			|| node.params.length === 0
+			|| node.params[0].type !== 'Identifier'
+			|| (
+				(
+					(
+						node.parent.type === 'MethodDefinition'
+						&& (node.parent.kind === 'constructor' || node.parent.kind === 'set')
+					)
+					|| (node.parent.type === 'Property' && node.parent.kind === 'set')
+				)
+				&& node.parent.value === node
+			)
+		) {
+			return;
+		}
+
 		let problem = getArrayCallbackProblem(node) || getCoercionFunctionProblem(node);
 
 		if (!problem) {
@@ -162,8 +171,8 @@ const create = context => ({
 		problem.fix = fix;
 
 		return problem;
-	},
-});
+	});
+};
 
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {