fix: Regression for valid-title and prefer-hooks-on-top when using test.scoped (#836)

* fix: Exclude scoped test calls from valid-title checks

* fix: Exclude scoped and extend test calls from prefer-hooks-on-top checks

* test: add tests

Author: y-hsgw

src/rules/prefer-hooks-on-top.ts

@@ -1,5 +1,8 @@
-import { createEslintRule } from '../utils'
-import { isTypeOfVitestFnCall } from '../utils/parse-vitest-fn-call'
+import { createEslintRule, getAccessorValue } from '../utils'
+import {
+  isTypeOfVitestFnCall,
+  parseVitestFnCall,
+} from '../utils/parse-vitest-fn-call'
 
 export const RULE_NAME = 'prefer-hooks-on-top'
 type MessageIds = 'noHookOnTop'
@@ -23,7 +26,17 @@ export default createEslintRule<Options, MessageIds>({
     const hooksContext = [false]
     return {
       CallExpression(node) {
-        if (isTypeOfVitestFnCall(node, context, ['test']))
+        const vitestFnCall = parseVitestFnCall(node, context)
+
+        const hasExemptModifier = vitestFnCall?.members?.some((member) =>
+          ['extend', 'scoped'].includes(getAccessorValue(member)),
+        )
+
+        if (
+          vitestFnCall?.type &&
+          ['test', 'it'].includes(vitestFnCall.type) &&
+          !hasExemptModifier
+        )
           hooksContext[hooksContext.length - 1] = true
 
         if (

src/rules/valid-title.ts

@@ -6,6 +6,7 @@ import {
 } from '@typescript-eslint/utils'
 import {
   createEslintRule,
+  getAccessorValue,
   getStringValue,
   isStringNode,
   StringNode,
@@ -222,12 +223,10 @@ export default createEslintRule<Options, MESSAGE_IDS>({
           return
 
         // check if extend keyword have been used
-        if (
-          vitestFnCall.members &&
-          vitestFnCall.members[0] &&
-          vitestFnCall.members[0].type === AST_NODE_TYPES.Identifier &&
-          vitestFnCall.members[0].name === 'extend'
-        ) {
+        const hasExemptModifier = vitestFnCall.members.some((member) =>
+          ['extend', 'scoped'].includes(getAccessorValue(member)),
+        )
+        if (hasExemptModifier) {
           return
         }
 

tests/prefer-hooks-on-top.test.ts

@@ -25,6 +25,44 @@ ruleTester.run(RULE_NAME, rule, {
       });
     });
      `,
+    `
+    describe('foo', () => {
+      test.scoped({});
+      beforeEach(() => {});
+      afterEach(() => {});
+    
+      test('bar', () => {
+     someFn();
+      });
+    });
+     `,
+    `
+    describe('foo', () => {
+      it.scoped({});
+      beforeEach(() => {});
+      afterEach(() => {});
+    
+      test('bar', () => {
+     someFn();
+      });
+    });
+     `,
+    `
+    import { test as baseTest } from 'vitest'
+
+    const test = baseTest.extend({})
+    
+    beforeEach(() => {});
+    afterEach(() => {});
+     `,
+    `
+    import { it as baseIt } from 'vitest'
+
+    const it = baseIt.extend({})
+    
+    beforeEach(() => {});
+    afterEach(() => {});
+     `,
   ],
   invalid: [
     {

tests/valid-title.test.ts

@@ -563,6 +563,8 @@ ruleTester.run(RULE_NAME, rule, {
     'test.concurrent(`foo`, function () {})',
     'test(`${foo}`, function () {})',
     'test.concurrent(`${foo}`, function () {})',
+    'test.scoped({})',
+    'it.scoped({})',
     "it('foo', function () {})",
     'it.each([])()',
     "it.concurrent('foo', function () {})",