Remove eslint-template-visitor dependency (#1665)

Author: fisker

package.json

@@ -49,7 +49,6 @@
 		"@babel/helper-validator-identifier": "^7.15.7",
 		"ci-info": "^3.3.0",
 		"clean-regexp": "^1.0.0",
-		"eslint-template-visitor": "^2.3.2",
 		"eslint-utils": "^3.0.0",
 		"esquery": "^1.4.0",
 		"indent-string": "^4.0.0",

rules/import-style.js

@@ -1,7 +1,6 @@
 'use strict';
 const {defaultsDeep} = require('lodash');
 const {getStringIfConstant} = require('eslint-utils');
-const eslintTemplateVisitor = require('eslint-template-visitor');
 const {callExpressionSelector} = require('./selectors/index.js');
 
 const MESSAGE_ID = 'importStyle';
@@ -131,24 +130,18 @@ const defaultStyles = {
 	},
 };
 
-const templates = eslintTemplateVisitor({
-	parserOptions: {
-		sourceType: 'module',
-		ecmaVersion: 2018,
-	},
-});
-
-const variableDeclarationVariable = templates.variableDeclarationVariable();
-const assignmentTargetVariable = templates.variable();
-const moduleNameVariable = templates.variable();
-
-const assignedDynamicImportTemplate = templates.template`async () => {
-	${variableDeclarationVariable} ${assignmentTargetVariable} = await import(${moduleNameVariable});
-}`.narrow('BlockStatement > :has(AwaitExpression)');
+const assignedDynamicImportSelector = [
+	'VariableDeclarator',
+	'[init.type="AwaitExpression"]',
+	'[init.argument.type="ImportExpression"]',
+].join('');
 
-const assignedRequireTemplate = templates.template`
-	${variableDeclarationVariable} ${assignmentTargetVariable} = require(${moduleNameVariable});
-`;
+const assignedRequireSelector = [
+	'VariableDeclarator',
+	'[init.type="CallExpression"]',
+	'[init.callee.type="Identifier"]',
+	'[init.callee.name="require"]',
+].join('');
 
 /** @param {import('eslint').Rule.RuleContext} context */
 const create = context => {
@@ -235,9 +228,9 @@ const create = context => {
 				report(node, moduleName, actualImportStyles, allowedImportStyles);
 			},
 
-			[assignedDynamicImportTemplate](node) {
-				const assignmentTargetNode = assignedDynamicImportTemplate.context.getMatch(assignmentTargetVariable);
-				const moduleNameNode = assignedDynamicImportTemplate.context.getMatch(moduleNameVariable);
+			[assignedDynamicImportSelector](node) {
+				const assignmentTargetNode = node.id;
+				const moduleNameNode = node.init.argument.source;
 				const moduleName = getStringIfConstant(moduleNameNode, context.getScope());
 
 				if (!moduleName) {
@@ -288,9 +281,9 @@ const create = context => {
 				report(node, moduleName, actualImportStyles, allowedImportStyles, true);
 			},
 
-			[assignedRequireTemplate](node) {
-				const assignmentTargetNode = assignedRequireTemplate.context.getMatch(assignmentTargetVariable);
-				const moduleNameNode = assignedRequireTemplate.context.getMatch(moduleNameVariable);
+			[assignedRequireSelector](node) {
+				const assignmentTargetNode = node.id;
+				const moduleNameNode = node.init.arguments[0];
 				const moduleName = getStringIfConstant(moduleNameNode, context.getScope());
 
 				if (!moduleName) {
@@ -305,7 +298,7 @@ const create = context => {
 		};
 	}
 
-	return templates.visitor(visitor);
+	return visitor;
 };
 
 const schema = {

rules/prefer-string-slice.js

@@ -1,6 +1,6 @@
 'use strict';
-const eslintTemplateVisitor = require('eslint-template-visitor');
 const {getParenthesizedText} = require('./utils/parentheses.js');
+const {methodCallSelector} = require('./selectors/index.js');
 const isNumber = require('./utils/is-number.js');
 
 const MESSAGE_ID_SUBSTR = 'substr';
@@ -10,13 +10,8 @@ const messages = {
 	[MESSAGE_ID_SUBSTRING]: 'Prefer `String#slice()` over `String#substring()`.',
 };
 
-const templates = eslintTemplateVisitor();
-
-const objectVariable = templates.variable();
-const argumentsVariable = templates.spreadVariable();
-
-const substrCallTemplate = templates.template`${objectVariable}.substr(${argumentsVariable})`;
-const substringCallTemplate = templates.template`${objectVariable}.substring(${argumentsVariable})`;
+const substrCallSelector = methodCallSelector({method: 'substr', includeOptionalMember: true, includeOptionalCall: true});
+const substringCallSelector = methodCallSelector({method: 'substring', includeOptionalMember: true, includeOptionalCall: true});
 
 const isLiteralNumber = node => node && node.type === 'Literal' && typeof node.value === 'number';
 
@@ -43,10 +38,10 @@ const isLengthProperty = node => (
 const create = context => {
 	const sourceCode = context.getSourceCode();
 
-	return templates.visitor({
-		[substrCallTemplate](node) {
-			const objectNode = substrCallTemplate.context.getMatch(objectVariable);
-			const argumentNodes = substrCallTemplate.context.getMatch(argumentsVariable);
+	return {
+		[substrCallSelector](node) {
+			const objectNode = node.callee.object;
+			const argumentNodes = node.arguments;
 
 			const problem = {
 				node,
@@ -110,9 +105,9 @@ const create = context => {
 			context.report(problem);
 		},
 
-		[substringCallTemplate](node) {
-			const objectNode = substringCallTemplate.context.getMatch(objectVariable);
-			const argumentNodes = substringCallTemplate.context.getMatch(argumentsVariable);
+		[substringCallSelector](node) {
+			const objectNode = node.callee.object;
+			const argumentNodes = node.arguments;
 
 			const problem = {
 				node,
@@ -177,7 +172,7 @@ const create = context => {
 
 			context.report(problem);
 		},
-	});
+	};
 };
 
 /** @type {import('eslint').Rule.RuleModule} */

test/snapshots/import-style.mjs.md

@@ -31,7 +31,7 @@ Generated by [AVA](https://avajs.dev).
 
     `␊
     > 1 | const util = require('util')␊
-        | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use named import for module \`util\`.␊
+        |       ^^^^^^^^^^^^^^^^^^^^^^ Use named import for module \`util\`.␊
     `
 
 ## Invalid #4
@@ -74,6 +74,6 @@ Generated by [AVA](https://avajs.dev).
     `␊
       1 | async () => {␊
     > 2 | 	const {red} = await import('chalk');␊
-        | 	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use default import for module \`chalk\`.␊
+        | 	      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use default import for module \`chalk\`.␊
       3 | }␊
     `