Refactor options for selector functions (#1423)

Author: fisker

rules/better-regex.js

@@ -10,7 +10,7 @@ const messages = {
 };
 
 const newRegExp = [
-	newExpressionSelector({name: 'RegExp', min: 1}),
+	newExpressionSelector({name: 'RegExp', minimumArguments: 1}),
 	'[arguments.0.type="Literal"]',
 ].join('');
 

rules/catch-error-name.js

@@ -22,8 +22,8 @@ const selector = matches([
 	// - `promise.catch(function(foo) {})`
 	[
 		matches([
-			methodCallSelector({name: 'then', length: 2}),
-			methodCallSelector({name: 'catch', length: 1}),
+			methodCallSelector({method: 'then', argumentsLength: 2}),
+			methodCallSelector({method: 'catch', argumentsLength: 1}),
 		]),
 		' > ',
 		':matches(FunctionExpression, ArrowFunctionExpression).arguments:last-child',

rules/error-message.js

@@ -11,20 +11,18 @@ const messages = {
 	[MESSAGE_ID_NOT_STRING]: 'Error message should be a string.',
 };
 
-const selector = callOrNewExpressionSelector({
-	names: [
-		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
-		'Error',
-		'EvalError',
-		'RangeError',
-		'ReferenceError',
-		'SyntaxError',
-		'TypeError',
-		'URIError',
-		'InternalError',
-		'AggregateError',
-	],
-});
+const selector = callOrNewExpressionSelector([
+	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
+	'Error',
+	'EvalError',
+	'RangeError',
+	'ReferenceError',
+	'SyntaxError',
+	'TypeError',
+	'URIError',
+	'InternalError',
+	'AggregateError',
+]);
 
 const create = context => {
 	return {

rules/import-style.js

@@ -281,7 +281,7 @@ const create = context => {
 		visitor = {
 			...visitor,
 
-			[`ExpressionStatement > ${callExpressionSelector({name: 'require', length: 1})}.expression`](node) {
+			[`ExpressionStatement > ${callExpressionSelector({name: 'require', argumentsLength: 1})}.expression`](node) {
 				const moduleName = getStringIfConstant(node.arguments[0], context.getScope());
 				const allowedImportStyles = styles.get(moduleName);
 				const actualImportStyles = ['unassigned'];

rules/no-array-callback-reference.js

@@ -147,9 +147,9 @@ const create = context => {
 		const selector = [
 			method === 'reduce' || method === 'reduceRight' ? '' : ':not(AwaitExpression) > ',
 			methodCallSelector({
-				name: method,
-				min: 1,
-				max: 2,
+				method,
+				minimumArguments: 1,
+				maximumArguments: 2,
 			}),
 			options.extraSelector,
 			ignoredFirstArgumentSelector,

rules/no-array-for-each.js

@@ -22,7 +22,7 @@ const messages = {
 };
 
 const arrayForEachCallSelector = methodCallSelector({
-	name: 'forEach',
+	method: 'forEach',
 	includeOptionalCall: true,
 	includeOptionalMember: true,
 });

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

@@ -56,7 +56,7 @@ const ignored = [
 
 const selector = [
 	methodCallSelector({
-		names: [
+		methods: [
 			'every',
 			'filter',
 			'find',
@@ -66,7 +66,7 @@ const selector = [
 			'map',
 			'some',
 		],
-		length: 2,
+		argumentsLength: 2,
 	}),
 	notFunctionSelector('arguments.0'),
 ].join('');

rules/no-array-push-push.js

@@ -14,7 +14,7 @@ const messages = {
 
 const arrayPushExpressionStatement = [
 	'ExpressionStatement',
-	methodCallSelector({path: 'expression', name: 'push'}),
+	methodCallSelector({path: 'expression', method: 'push'}),
 ].join('');
 
 const selector = `${arrayPushExpressionStatement} + ${arrayPushExpressionStatement}`;

rules/no-array-reduce.js

@@ -11,13 +11,13 @@ const prototypeSelector = method => [
 	methodCallSelector(method),
 	arrayPrototypeMethodSelector({
 		path: 'callee.object',
-		names: ['reduce', 'reduceRight'],
+		methods: ['reduce', 'reduceRight'],
 	}),
 ].join('');
 const selector = matches([
 	// `array.{reduce,reduceRight}()`
 	[
-		methodCallSelector({names: ['reduce', 'reduceRight'], min: 1, max: 2}),
+		methodCallSelector({methods: ['reduce', 'reduceRight'], minimumArguments: 1, maximumArguments: 2}),
 		notFunctionSelector('arguments.0'),
 		' > .callee > .property',
 	].join(''),

rules/no-console-spaces.js

@@ -16,8 +16,8 @@ const methods = [
 ];
 
 const selector = methodCallSelector({
-	names: methods,
-	min: 1,
+	methods,
+	minimumArguments: 1,
 	object: 'console',
 });