@vitest/eslint-plugin 1.6.10 → 1.6.11

package/dist/index.cjs

@@ -4,7 +4,7 @@ let node_path = require("node:path");
 let _typescript_eslint_scope_manager = require("@typescript-eslint/scope-manager");
 
 //#region package.json
-var version = "1.6.10";
+var version = "1.6.11";
 
 //#endregion
 //#region src/utils/index.ts
@@ -2785,16 +2785,6 @@ var no_duplicate_hooks_default = createEslintRule({
 //#endregion
 //#region src/rules/no-focused-tests.ts
 const RULE_NAME$64 = "no-focused-tests";
-const isTestOrDescribe = (node) => {
-	return node.type === "Identifier" && [
-		"it",
-		"test",
-		"describe"
-	].includes(node.name);
-};
-const isOnly = (node) => {
-	return node.type === "Identifier" && node.name === "only";
-};
 var no_focused_tests_default = createEslintRule({
 	name: RULE_NAME$64,
 	meta: {
@@ -2817,40 +2807,21 @@ var no_focused_tests_default = createEslintRule({
 	},
 	create: (context, options) => {
 		const fixable = options[0].fixable;
-		return {
-			ExpressionStatement(node) {
-				if (node.expression.type === "CallExpression") {
-					const { callee } = node.expression;
-					if (callee.type === "MemberExpression" && isTestOrDescribe(callee.object) && isOnly(callee.property)) context.report({
-						node: callee.property,
-						messageId: "noFocusedTests",
-						fix: (fixer) => fixable ? fixer.removeRange([callee.property.range[0] - 1, callee.property.range[1]]) : null
-					});
-					if (callee.type === "TaggedTemplateExpression") {
-						const tagCall = callee.tag.type === "MemberExpression" ? callee.tag.object : null;
-						if (!tagCall) return;
-						if (tagCall.type === "MemberExpression" && isTestOrDescribe(tagCall.object) && isOnly(tagCall.property)) context.report({
-							node: tagCall.property,
-							messageId: "noFocusedTests",
-							fix: (fixer) => fixable ? fixer.removeRange([tagCall.property.range[0] - 1, tagCall.property.range[1]]) : null
-						});
-					}
-				}
-			},
-			CallExpression(node) {
-				if (node.callee.type === "CallExpression") {
-					const { callee } = node.callee;
-					if (callee.type === "MemberExpression" && callee.object.type === "MemberExpression" && isTestOrDescribe(callee.object.object) && isOnly(callee.object.property) && callee.property.type === "Identifier" && callee.property.name === "each") {
-						const onlyCallee = callee.object.property;
-						context.report({
-							node: callee.object.property,
-							messageId: "noFocusedTests",
-							fix: (fixer) => fixable ? fixer.removeRange([onlyCallee.range[0] - 1, onlyCallee.range[1]]) : null
-						});
-					}
-				}
-			}
-		};
+		return { CallExpression(node) {
+			const vitestFnCall = parseVitestFnCall(node, context);
+			if (!vitestFnCall) return;
+			const isTestOrDescribe = [
+				"it",
+				"test",
+				"describe"
+			].includes(vitestFnCall.name);
+			const onlyNode = vitestFnCall.members.find((m) => getAccessorValue(m) === "only");
+			if (isTestOrDescribe && onlyNode) context.report({
+				node: onlyNode,
+				messageId: "noFocusedTests",
+				fix: (fixer) => fixable ? fixer.removeRange([onlyNode.range[0] - 1, onlyNode.range[1]]) : null
+			});
+		} };
 	}
 });
 

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { isAbsolute, posix } from "node:path";
 import { DefinitionType } from "@typescript-eslint/scope-manager";
 
 //#region package.json
-var version = "1.6.10";
+var version = "1.6.11";
 
 //#endregion
 //#region src/utils/index.ts
@@ -2785,16 +2785,6 @@ var no_duplicate_hooks_default = createEslintRule({
 //#endregion
 //#region src/rules/no-focused-tests.ts
 const RULE_NAME$64 = "no-focused-tests";
-const isTestOrDescribe = (node) => {
-	return node.type === "Identifier" && [
-		"it",
-		"test",
-		"describe"
-	].includes(node.name);
-};
-const isOnly = (node) => {
-	return node.type === "Identifier" && node.name === "only";
-};
 var no_focused_tests_default = createEslintRule({
 	name: RULE_NAME$64,
 	meta: {
@@ -2817,40 +2807,21 @@ var no_focused_tests_default = createEslintRule({
 	},
 	create: (context, options) => {
 		const fixable = options[0].fixable;
-		return {
-			ExpressionStatement(node) {
-				if (node.expression.type === "CallExpression") {
-					const { callee } = node.expression;
-					if (callee.type === "MemberExpression" && isTestOrDescribe(callee.object) && isOnly(callee.property)) context.report({
-						node: callee.property,
-						messageId: "noFocusedTests",
-						fix: (fixer) => fixable ? fixer.removeRange([callee.property.range[0] - 1, callee.property.range[1]]) : null
-					});
-					if (callee.type === "TaggedTemplateExpression") {
-						const tagCall = callee.tag.type === "MemberExpression" ? callee.tag.object : null;
-						if (!tagCall) return;
-						if (tagCall.type === "MemberExpression" && isTestOrDescribe(tagCall.object) && isOnly(tagCall.property)) context.report({
-							node: tagCall.property,
-							messageId: "noFocusedTests",
-							fix: (fixer) => fixable ? fixer.removeRange([tagCall.property.range[0] - 1, tagCall.property.range[1]]) : null
-						});
-					}
-				}
-			},
-			CallExpression(node) {
-				if (node.callee.type === "CallExpression") {
-					const { callee } = node.callee;
-					if (callee.type === "MemberExpression" && callee.object.type === "MemberExpression" && isTestOrDescribe(callee.object.object) && isOnly(callee.object.property) && callee.property.type === "Identifier" && callee.property.name === "each") {
-						const onlyCallee = callee.object.property;
-						context.report({
-							node: callee.object.property,
-							messageId: "noFocusedTests",
-							fix: (fixer) => fixable ? fixer.removeRange([onlyCallee.range[0] - 1, onlyCallee.range[1]]) : null
-						});
-					}
-				}
-			}
-		};
+		return { CallExpression(node) {
+			const vitestFnCall = parseVitestFnCall(node, context);
+			if (!vitestFnCall) return;
+			const isTestOrDescribe = [
+				"it",
+				"test",
+				"describe"
+			].includes(vitestFnCall.name);
+			const onlyNode = vitestFnCall.members.find((m) => getAccessorValue(m) === "only");
+			if (isTestOrDescribe && onlyNode) context.report({
+				node: onlyNode,
+				messageId: "noFocusedTests",
+				fix: (fixer) => fixable ? fixer.removeRange([onlyNode.range[0] - 1, onlyNode.range[1]]) : null
+			});
+		} };
 	}
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitest/eslint-plugin",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "license": "MIT",
   "description": "ESLint plugin for Vitest",
   "repository": "vitest-dev/eslint-plugin-vitest",