Remove esquery (#2825)

Author: fisker

package.json

@@ -63,7 +63,6 @@
 		"ci-info": "^4.3.1",
 		"clean-regexp": "^1.0.0",
 		"core-js-compat": "^3.46.0",
-		"esquery": "^1.6.0",
 		"find-up-simple": "^1.0.1",
 		"globals": "^16.4.0",
 		"indent-string": "^5.0.0",

rules/isolated-functions.js

@@ -1,21 +1,11 @@
 import globals from 'globals';
-import esquery from 'esquery';
 import {functionTypes} from './ast/index.js';
 
 const MESSAGE_ID_EXTERNALLY_SCOPED_VARIABLE = 'externally-scoped-variable';
 const messages = {
 	[MESSAGE_ID_EXTERNALLY_SCOPED_VARIABLE]: 'Variable {{name}} not defined in scope of isolated function. Function is isolated because: {{reason}}.',
 };
 
-const parsedEsquerySelectors = new Map();
-const parseEsquerySelector = selector => {
-	if (!parsedEsquerySelectors.has(selector)) {
-		parsedEsquerySelectors.set(selector, esquery.parse(selector));
-	}
-
-	return parsedEsquerySelectors.get(selector);
-};
-
 /** @type {{functions: string[], selectors: string[], comments: string[], overrideGlobals?: import('eslint').Linter.Globals}} */
 const defaultOptions = {
 	functions: ['makeSynchronous'],
@@ -40,14 +30,16 @@ const create = context => {
 		...context.languageOptions.globals,
 		...options.overrideGlobals,
 	};
+	const checked = new WeakSet();
 
 	/** @param {import('estree').Node} node */
-	const checkForExternallyScopedVariables = node => {
-		let reason = reasonForBeingIsolatedFunction(node);
-		if (!reason) {
+	const checkForExternallyScopedVariables = (node, reason) => {
+		if (checked.has(node) || !functionTypes.includes(node.type)) {
 			return;
 		}
 
+		checked.add(node);
+
 		const nodeScope = sourceCode.getScope(node);
 
 		// `through`: "The array of references which could not be resolved in this scope" https://eslint.org/docs/latest/extend/scope-manager-interface#scope-interface
@@ -136,20 +128,29 @@ const create = context => {
 		) {
 			return `callee of function named ${JSON.stringify(node.parent.callee.name)}`;
 		}
+	};
 
-		if (options.selectors.length > 0) {
-			const ancestors = sourceCode.getAncestors(node);
-			const matchedSelector = options.selectors.find(selector => esquery.matches(node, parseEsquerySelector(selector), ancestors));
-			if (matchedSelector) {
-				return `matches selector ${JSON.stringify(matchedSelector)}`;
+	context.onExit(
+		functionTypes,
+		node => {
+			const reason = reasonForBeingIsolatedFunction(node);
+			if (!reason) {
+				return;
 			}
-		}
-	};
 
-	context.on(
-		functionTypes.map(type => `${type}:exit`),
-		checkForExternallyScopedVariables,
+			return checkForExternallyScopedVariables(node, reason);
+		},
 	);
+
+	for (const selector of options.selectors) {
+		context.onExit(
+			selector,
+			node => {
+				const reason = `matches selector ${JSON.stringify(selector)}`;
+				return checkForExternallyScopedVariables(node, reason);
+			},
+		);
+	}
 };
 
 /** @type {import('json-schema').JSONSchema7[]} */

rules/template-indent.js

@@ -1,6 +1,5 @@
 import stripIndent from 'strip-indent';
 import indentString from 'indent-string';
-import esquery from 'esquery';
 import {replaceTemplateElement} from './fix/index.js';
 import {isTaggedTemplateLiteral} from './ast/index.js';
 import {isNodeMatches} from './utils/index.js';
@@ -11,15 +10,6 @@ const messages = {
 	[MESSAGE_ID_IMPROPERLY_INDENTED_TEMPLATE]: 'Templates should be properly indented.',
 };
 
-const parsedEsquerySelectors = new Map();
-const parseEsquerySelector = selector => {
-	if (!parsedEsquerySelectors.has(selector)) {
-		parsedEsquerySelectors.set(selector, esquery.parse(selector));
-	}
-
-	return parsedEsquerySelectors.get(selector);
-};
-
 /** @param {import('eslint').Rule.RuleContext} context */
 const create = context => {
 	const {sourceCode} = context;
@@ -32,9 +22,16 @@ const create = context => {
 	};
 
 	options.comments = options.comments.map(comment => comment.toLowerCase());
+	const checked = new WeakSet();
 
 	/** @param {import('@babel/core').types.TemplateLiteral} node */
 	const getProblem = node => {
+		if (node.type !== 'TemplateLiteral' || checked.has(node)) {
+			return;
+		}
+
+		checked.add(node);
+
 		const delimiter = '__PLACEHOLDER__' + Math.random();
 		const joined = node.quasis
 			.map(quasi => {
@@ -114,13 +111,6 @@ const create = context => {
 			return true;
 		}
 
-		if (options.selectors.length > 0) {
-			const ancestors = sourceCode.getAncestors(node).toReversed();
-			if (options.selectors.some(selector => esquery.matches(node, parseEsquerySelector(selector), ancestors))) {
-				return true;
-			}
-		}
-
 		return false;
 	};
 
@@ -131,6 +121,8 @@ const create = context => {
 
 		return getProblem(node);
 	});
+
+	context.on(options.selectors, /** @param {import('@babel/core').types.TemplateLiteral} node */ node => getProblem(node));
 };
 
 /** @type {import('json-schema').JSONSchema7[]} */