empty-brace-spaces: Use simple selector (#2123)

Author: fisker

rules/empty-brace-spaces.js

@@ -1,48 +1,62 @@
 'use strict';
 const {isOpeningBraceToken} = require('@eslint-community/eslint-utils');
-const {matches} = require('./selectors/index.js');
 
 const MESSAGE_ID = 'empty-brace-spaces';
 const messages = {
 	[MESSAGE_ID]: 'Do not add spaces between braces.',
 };
 
-const selector = matches([
-	'BlockStatement[body.length=0]',
-	'ClassBody[body.length=0]',
-	'ObjectExpression[properties.length=0]',
-	'StaticBlock[body.length=0]',
-	// Experimental https://github.com/tc39/proposal-record-tuple
-	'RecordExpression[properties.length=0]',
-]);
+const getProblem = (node, context) => {
+	const {sourceCode} = context;
+	const filter = node.type === 'RecordExpression'
+		? token => token.type === 'Punctuator' && (token.value === '#{' || token.value === '{|')
+		: isOpeningBraceToken;
+	const openingBrace = sourceCode.getFirstToken(node, {filter});
+	const closingBrace = sourceCode.getLastToken(node);
+	const [, start] = openingBrace.range;
+	const [end] = closingBrace.range;
+	const textBetween = sourceCode.text.slice(start, end);
+
+	if (!/^\s+$/.test(textBetween)) {
+		return;
+	}
+
+	return {
+		loc: {
+			start: openingBrace.loc.end,
+			end: closingBrace.loc.start,
+		},
+		messageId: MESSAGE_ID,
+		fix: fixer => fixer.removeRange([start, end]),
+	};
+};
 
 /** @param {import('eslint').Rule.RuleContext} context */
-const create = context => ({
-	[selector](node) {
-		const {sourceCode} = context;
-		const filter = node.type === 'RecordExpression'
-			? token => token.type === 'Punctuator' && (token.value === '#{' || token.value === '{|')
-			: isOpeningBraceToken;
-		const openingBrace = sourceCode.getFirstToken(node, {filter});
-		const closingBrace = sourceCode.getLastToken(node);
-		const [, start] = openingBrace.range;
-		const [end] = closingBrace.range;
-		const textBetween = sourceCode.text.slice(start, end);
-
-		if (!/^\s+$/.test(textBetween)) {
+const create = context => {
+	context.on([
+		'BlockStatement',
+		'ClassBody',
+		'StaticBlock',
+	], node => {
+		if (node.body.length > 0) {
 			return;
 		}
 
-		return {
-			loc: {
-				start: openingBrace.loc.end,
-				end: closingBrace.loc.start,
-			},
-			messageId: MESSAGE_ID,
-			fix: fixer => fixer.removeRange([start, end]),
-		};
-	},
-});
+		return getProblem(node, context);
+	});
+
+	context.on([
+		'ObjectExpression',
+		// Experimental https://github.com/tc39/proposal-record-tuple
+		'RecordExpression',
+	], node => {
+		if (node.properties.length > 0) {
+			return;
+		}
+
+		return getProblem(node, context);
+	});
+};
 
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {

rules/utils/rule.js

@@ -86,7 +86,12 @@ function reportProblems(create) {
 		const contextProxy = new Proxy(context, {
 			get(target, property, receiver) {
 				if (property === 'on') {
-					return addListener;
+					return (selectorOrSelectors, listener) => {
+						const selectors = Array.isArray(selectorOrSelectors) ? selectorOrSelectors : [selectorOrSelectors];
+						for (const selector of selectors) {
+							addListener(selector, listener);
+						}
+					};
 				}
 
 				return Reflect.get(target, property, receiver);