prefer-query-selector: Fix crash on unexpected selector (#1034)

sindresorhus · Jan 19, 2021 · 88018ca · 88018ca
1 parent 700f8bf
commit 88018ca
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 34 deletions.
diff --git a/rules/prefer-query-selector.js b/rules/prefer-query-selector.js
@@ -67,7 +67,7 @@ function * getTemplateLiteralFix(fixer, node, identifierName) {
 
 const canBeFixed = node => {
 	if (node.type === 'Literal') {
-		return node.value === null || Boolean(node.value.trim());
+		return node.raw === 'null' || (typeof node.value === 'string' && Boolean(node.value.trim()));
 	}
 
 	if (node.type === 'TemplateLiteral') {

diff --git a/test/integration/projects.js b/test/integration/projects.js
@@ -158,7 +158,9 @@ module.exports = [
 		]
 	},
 	// #903
-	'https://github.com/mattermost/mattermost-webapp'
+	'https://github.com/mattermost/mattermost-webapp',
+	// #1030
+	'https://github.com/astrofox-io/astrofox'
 ].map(project => {
 	if (typeof project === 'string') {
 		project = {repository: project};

diff --git a/test/prefer-query-selector.js b/test/prefer-query-selector.js
@@ -2,7 +2,7 @@ import {outdent} from 'outdent';
 import {test} from './utils/test.js';
 import notDomNodeTypes from './utils/not-dom-node-types.js';
 
-test({
+test.snapshot({
 	valid: [
 		// Not `CallExpression`
 		'new document.getElementById(foo);',
@@ -29,35 +29,35 @@ test({
 		'document.querySelectorAll("li a");',
 		'document.querySelector("li").querySelectorAll("a");'
 	],
-	invalid: []
+	invalid: [
+		'document.getElementById("foo");',
+		'document.getElementsByClassName("foo");',
+		'document.getElementsByClassName("foo bar");',
+		'document.getElementsByTagName("foo");',
+		'document.getElementById("");',
+		'document.getElementById(\'foo\');',
+		'document.getElementsByClassName(\'foo\');',
+		'document.getElementsByClassName(\'foo bar\');',
+		'document.getElementsByTagName(\'foo\');',
+		'document.getElementsByClassName(\'\');',
+		'document.getElementById(`foo`);',
+		'document.getElementsByClassName(`foo`);',
+		'document.getElementsByClassName(`foo bar`);',
+		'document.getElementsByTagName(`foo`);',
+		'document.getElementsByTagName(``);',
+		'document.getElementsByClassName(`${fn()}`);', // eslint-disable-line no-template-curly-in-string
+		'document.getElementsByClassName(`foo ${undefined}`);', // eslint-disable-line no-template-curly-in-string
+		'document.getElementsByClassName(null);',
+		'document.getElementsByTagName(null);',
+		'document.getElementsByClassName(fn());',
+		'document.getElementsByClassName("foo" + fn());',
+		'document.getElementsByClassName(foo + "bar");',
+		outdent`
+			for (const div of document.body.getElementById("id").getElementsByClassName("class")) {
+				console.log(div.getElementsByTagName("div"));
+			}
+		`,
+		// #1030
+		'e.getElementById(3)'
+	]
 });
-
-test.snapshot([
-	'document.getElementById("foo");',
-	'document.getElementsByClassName("foo");',
-	'document.getElementsByClassName("foo bar");',
-	'document.getElementsByTagName("foo");',
-	'document.getElementById("");',
-	'document.getElementById(\'foo\');',
-	'document.getElementsByClassName(\'foo\');',
-	'document.getElementsByClassName(\'foo bar\');',
-	'document.getElementsByTagName(\'foo\');',
-	'document.getElementsByClassName(\'\');',
-	'document.getElementById(`foo`);',
-	'document.getElementsByClassName(`foo`);',
-	'document.getElementsByClassName(`foo bar`);',
-	'document.getElementsByTagName(`foo`);',
-	'document.getElementsByTagName(``);',
-	'document.getElementsByClassName(`${fn()}`);', // eslint-disable-line no-template-curly-in-string
-	'document.getElementsByClassName(`foo ${undefined}`);', // eslint-disable-line no-template-curly-in-string
-	'document.getElementsByClassName(null);',
-	'document.getElementsByTagName(null);',
-	'document.getElementsByClassName(fn());',
-	'document.getElementsByClassName("foo" + fn());',
-	'document.getElementsByClassName(foo + "bar");',
-	outdent`
-		for (const div of document.body.getElementById("id").getElementsByClassName("class")) {
-			console.log(div.getElementsByTagName("div"));
-		}
-	`
-]);
diff --git a/test/snapshots/prefer-query-selector.js.md b/test/snapshots/prefer-query-selector.js.md
@@ -347,3 +347,13 @@ Generated by [AVA](https://avajs.dev).
         | 	                ^^^^^^^^^^^^^^^^^^^^ Prefer `.querySelectorAll()` over `.getElementsByTagName()`.␊
       3 | }␊
     `
+
+## Invalid #24
+      1 | e.getElementById(3)
+
+> Error 1/1
+
+    `␊
+    > 1 | e.getElementById(3)␊
+        |   ^^^^^^^^^^^^^^ Prefer `.querySelector()` over `.getElementById()`.␊
+    `
diff --git a/test/snapshots/prefer-query-selector.js.snap b/test/snapshots/prefer-query-selector.js.snap