@vitest/eslint-plugin 1.1.17 → 1.1.19

package/dist/index.cjs

@@ -23,7 +23,7 @@ function _interopNamespaceCompat(e) {
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 const ts__default = /*#__PURE__*/_interopDefaultCompat(ts);
 
-const version = "1.1.16";
+const version = "1.1.18";
 
 function createEslintRule(rule) {
   const createRule = utils.ESLintUtils.RuleCreator(
@@ -228,7 +228,7 @@ const parseVitestFnCallWithReasonInner = (node, context) => {
     return null;
   const name = resolved.original ?? resolved.local;
   const links = [name, ...rest.map(getAccessorValue)];
-  if (name !== "vi" && name !== "expect" && name !== "expectTypeOf" && !ValidVitestFnCallChains.has(links.join(".")))
+  if (resolved.type !== "testContext" && name !== "vi" && name !== "expect" && name !== "expectTypeOf" && !ValidVitestFnCallChains.has(links.join(".")))
     return null;
   const parsedVitestFnCall = {
     name,
@@ -300,6 +300,10 @@ const resolvePossibleAliasedGlobal = (global, context) => {
     return alias[0];
   return null;
 };
+const isAncestorTestCaseCall = ({ parent }) => {
+  if (parent?.type === utils.AST_NODE_TYPES.CallExpression && parent.callee.type === utils.AST_NODE_TYPES.Identifier)
+    return TestCaseName.hasOwnProperty(parent.callee.name);
+};
 const resolveScope = (scope, identifier) => {
   let currentScope = scope;
   while (currentScope !== null) {
@@ -313,6 +317,9 @@ const resolveScope = (scope, identifier) => {
         if (key?.name === identifier)
           return "testContext";
       }
+      const namedParam = isFunction(def.node) ? def.node.params.find((params) => params.type === utils.AST_NODE_TYPES.Identifier) : void 0;
+      if (namedParam && isAncestorTestCaseCall(namedParam.parent))
+        return "testContext";
       const importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
         return importDetails;
@@ -1057,7 +1064,7 @@ const noHooks = createEslintRule({
       properties: {
         allow: {
           type: "array",
-          //@ts-ignore
+          // @ts-ignore
           contains: ["beforeAll", "beforeEach", "afterAll", "afterEach"]
         }
       },
@@ -1147,12 +1154,12 @@ const consistentTestFilename = createEslintRule({
         additionalProperties: false,
         properties: {
           pattern: {
-            //@ts-ignore
+            // @ts-ignore
             format: "regex",
             default: defaultPattern.source
           },
           allTestPattern: {
-            //@ts-ignore
+            // @ts-ignore
             format: "regex",
             default: defaultTestsPattern.source
           }
@@ -1939,9 +1946,9 @@ const noStandaloneExpect = createEslintRule({
       {
         properties: {
           additionaltestblockfunctions: {
-            //@ts-ignore
+            // @ts-ignore
             type: "array",
-            //@ts-ignore
+            // @ts-ignore
             items: { type: `string` }
           }
         },
@@ -2218,7 +2225,7 @@ const validTitle = createEslintRule({
               MatcherAndMessageSchema,
               {
                 type: "object",
-                //@ts-ignore
+                // @ts-ignore
                 propertyNames: { type: "string", enum: ["describe", "test", "it"] },
                 additionalProperties: {
                   oneOf: [{ type: "string" }, MatcherAndMessageSchema]
@@ -3244,7 +3251,7 @@ const preferViMocked = createEslintRule({
   meta: {
     type: "suggestion",
     docs: {
-      description: "Prefer `vi.mocked()` over `fn as Mock`",
+      description: "require `vi.mocked()` over `fn as Mock`",
       requiresTypeChecking: true,
       recommended: false
     },
@@ -3707,7 +3714,7 @@ const requireLocalTestContextForConcurrentSnapshots = createEslintRule({
           "toMatchFileSnapshot",
           "toThrowErrorMatchingSnapshot",
           "toThrowErrorMatchingInlineSnapshot"
-          //@ts-ignore
+          // @ts-ignore
         ].includes(node.callee?.property.name);
         if (isNotASnapshotAssertion)
           return;
@@ -4088,6 +4095,7 @@ const preferExpectAssertions = createEslintRule({
     let hasExpectInCallBack = false;
     let hasExpectInLoop = false;
     let hasExpectAssertAsFirstStatement = false;
+    let testContextName = null;
     let inTestCaseCall = false;
     let inForLoop = false;
     const shouldCheckFunction = (testFunction) => {
@@ -4161,6 +4169,9 @@ const preferExpectAssertions = createEslintRule({
           inTestCaseCall = true;
           return;
         }
+        if (vitestFnCall?.head.type === "testContext" && vitestFnCall.members[0].type === utils.AST_NODE_TYPES.Identifier && vitestFnCall.members[0].name === "expect") {
+          testContextName = `${vitestFnCall.head.local}`;
+        }
         if (vitestFnCall?.type === "expect" && inTestCaseCall) {
           if (expressionDepth === 1 && isFirstStatement(node) && vitestFnCall.head.node.parent?.type === utils.AST_NODE_TYPES.MemberExpression && vitestFnCall.members.length === 1 && ["assertions", "hasAssertions"].includes(getAccessorValue(vitestFnCall.members[0]))) {
             checkExpectHasAssertions(vitestFnCall, node);
@@ -4189,9 +4200,10 @@ const preferExpectAssertions = createEslintRule({
         }
         const suggestions = [];
         if (secondArg.body.type === utils.AST_NODE_TYPES.BlockStatement) {
+          const prefix = testContextName ? `${testContextName}.` : "";
           suggestions.push(
-            ["suggestAddingHasAssertions", "expect.hasAssertions();"],
-            ["suggestAddingAssertions", "expect.assertions();"]
+            ["suggestAddingHasAssertions", `${prefix}expect.hasAssertions();`],
+            ["suggestAddingAssertions", `${prefix}expect.assertions();`]
           );
         }
         context.report({
@@ -4382,11 +4394,11 @@ const createPaddingRule = (name, description, configs, deprecated = false) => {
       };
       const { scopeInfo } = paddingContext;
       return {
-        Program: scopeInfo.enter,
+        "Program": scopeInfo.enter,
         "Program:exit": scopeInfo.exit,
-        BlockStatement: scopeInfo.enter,
+        "BlockStatement": scopeInfo.enter,
         "BlockStatement:exit": scopeInfo.exit,
-        SwitchStatement: scopeInfo.enter,
+        "SwitchStatement": scopeInfo.enter,
         "SwitchStatement:exit": scopeInfo.exit,
         ":statement": (node) => verifyNode(node, paddingContext),
         SwitchCase(node) {
@@ -4743,7 +4755,7 @@ const validExpectInPromise = createEslintRule({
   name: RULE_NAME,
   meta: {
     docs: {
-      description: "Require promises that have expectations in their chain to be valid"
+      description: "require promises that have expectations in their chain to be valid"
     },
     messages: {
       expectInFloatingPromise: "This promise should either be returned or awaited to ensure the expects in its chain are called"
@@ -5009,6 +5021,8 @@ const plugin = {
           test: "writable",
           describe: "writable",
           it: "writable",
+          expectTypeOf: "writable",
+          assertType: "writable",
           expect: "writable",
           assert: "writable",
           vitest: "writable",
@@ -5016,7 +5030,9 @@ const plugin = {
           beforeAll: "writable",
           afterAll: "writable",
           beforeEach: "writable",
-          afterEach: "writable"
+          afterEach: "writable",
+          onTestFailed: "writable",
+          onTestFinished: "writable"
         }
       }
     }
@@ -5028,6 +5044,8 @@ const plugin = {
         test: true,
         describe: true,
         it: true,
+        expectTypeOf: true,
+        assertType: true,
         expect: true,
         assert: true,
         vitest: true,
@@ -5035,7 +5053,9 @@ const plugin = {
         beforeAll: true,
         afterAll: true,
         beforeEach: true,
-        afterEach: true
+        afterEach: true,
+        onTestFailed: true,
+        onTestFinished: true
       }
     }
   }

package/dist/index.d.cts

@@ -170,6 +170,8 @@ declare const plugin: {
                     test: "writable";
                     describe: "writable";
                     it: "writable";
+                    expectTypeOf: "writable";
+                    assertType: "writable";
                     expect: "writable";
                     assert: "writable";
                     vitest: "writable";
@@ -178,6 +180,8 @@ declare const plugin: {
                     afterAll: "writable";
                     beforeEach: "writable";
                     afterEach: "writable";
+                    onTestFailed: "writable";
+                    onTestFinished: "writable";
                 };
             };
         };
@@ -189,6 +193,8 @@ declare const plugin: {
                 test: true;
                 describe: true;
                 it: true;
+                expectTypeOf: true;
+                assertType: true;
                 expect: true;
                 assert: true;
                 vitest: true;
@@ -197,6 +203,8 @@ declare const plugin: {
                 afterAll: true;
                 beforeEach: true;
                 afterEach: true;
+                onTestFailed: true;
+                onTestFinished: true;
             };
         };
     };

package/dist/index.d.mts

@@ -170,6 +170,8 @@ declare const plugin: {
                     test: "writable";
                     describe: "writable";
                     it: "writable";
+                    expectTypeOf: "writable";
+                    assertType: "writable";
                     expect: "writable";
                     assert: "writable";
                     vitest: "writable";
@@ -178,6 +180,8 @@ declare const plugin: {
                     afterAll: "writable";
                     beforeEach: "writable";
                     afterEach: "writable";
+                    onTestFailed: "writable";
+                    onTestFinished: "writable";
                 };
             };
         };
@@ -189,6 +193,8 @@ declare const plugin: {
                 test: true;
                 describe: true;
                 it: true;
+                expectTypeOf: true;
+                assertType: true;
                 expect: true;
                 assert: true;
                 vitest: true;
@@ -197,6 +203,8 @@ declare const plugin: {
                 afterAll: true;
                 beforeEach: true;
                 afterEach: true;
+                onTestFailed: true;
+                onTestFinished: true;
             };
         };
     };

package/dist/index.d.ts

@@ -170,6 +170,8 @@ declare const plugin: {
                     test: "writable";
                     describe: "writable";
                     it: "writable";
+                    expectTypeOf: "writable";
+                    assertType: "writable";
                     expect: "writable";
                     assert: "writable";
                     vitest: "writable";
@@ -178,6 +180,8 @@ declare const plugin: {
                     afterAll: "writable";
                     beforeEach: "writable";
                     afterEach: "writable";
+                    onTestFailed: "writable";
+                    onTestFinished: "writable";
                 };
             };
         };
@@ -189,6 +193,8 @@ declare const plugin: {
                 test: true;
                 describe: true;
                 it: true;
+                expectTypeOf: true;
+                assertType: true;
                 expect: true;
                 assert: true;
                 vitest: true;
@@ -197,6 +203,8 @@ declare const plugin: {
                 afterAll: true;
                 beforeEach: true;
                 afterEach: true;
+                onTestFailed: true;
+                onTestFinished: true;
             };
         };
     };

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { isAbsolute, posix } from 'node:path';
 import ts from 'typescript';
 import { createRequire } from 'node:module';
 
-const version = "1.1.16";
+const version = "1.1.18";
 
 function createEslintRule(rule) {
   const createRule = ESLintUtils.RuleCreator(
@@ -209,7 +209,7 @@ const parseVitestFnCallWithReasonInner = (node, context) => {
     return null;
   const name = resolved.original ?? resolved.local;
   const links = [name, ...rest.map(getAccessorValue)];
-  if (name !== "vi" && name !== "expect" && name !== "expectTypeOf" && !ValidVitestFnCallChains.has(links.join(".")))
+  if (resolved.type !== "testContext" && name !== "vi" && name !== "expect" && name !== "expectTypeOf" && !ValidVitestFnCallChains.has(links.join(".")))
     return null;
   const parsedVitestFnCall = {
     name,
@@ -281,6 +281,10 @@ const resolvePossibleAliasedGlobal = (global, context) => {
     return alias[0];
   return null;
 };
+const isAncestorTestCaseCall = ({ parent }) => {
+  if (parent?.type === AST_NODE_TYPES.CallExpression && parent.callee.type === AST_NODE_TYPES.Identifier)
+    return TestCaseName.hasOwnProperty(parent.callee.name);
+};
 const resolveScope = (scope, identifier) => {
   let currentScope = scope;
   while (currentScope !== null) {
@@ -294,6 +298,9 @@ const resolveScope = (scope, identifier) => {
         if (key?.name === identifier)
           return "testContext";
       }
+      const namedParam = isFunction(def.node) ? def.node.params.find((params) => params.type === AST_NODE_TYPES.Identifier) : void 0;
+      if (namedParam && isAncestorTestCaseCall(namedParam.parent))
+        return "testContext";
       const importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
         return importDetails;
@@ -1038,7 +1045,7 @@ const noHooks = createEslintRule({
       properties: {
         allow: {
           type: "array",
-          //@ts-ignore
+          // @ts-ignore
           contains: ["beforeAll", "beforeEach", "afterAll", "afterEach"]
         }
       },
@@ -1128,12 +1135,12 @@ const consistentTestFilename = createEslintRule({
         additionalProperties: false,
         properties: {
           pattern: {
-            //@ts-ignore
+            // @ts-ignore
             format: "regex",
             default: defaultPattern.source
           },
           allTestPattern: {
-            //@ts-ignore
+            // @ts-ignore
             format: "regex",
             default: defaultTestsPattern.source
           }
@@ -1920,9 +1927,9 @@ const noStandaloneExpect = createEslintRule({
       {
         properties: {
           additionaltestblockfunctions: {
-            //@ts-ignore
+            // @ts-ignore
             type: "array",
-            //@ts-ignore
+            // @ts-ignore
             items: { type: `string` }
           }
         },
@@ -2199,7 +2206,7 @@ const validTitle = createEslintRule({
               MatcherAndMessageSchema,
               {
                 type: "object",
-                //@ts-ignore
+                // @ts-ignore
                 propertyNames: { type: "string", enum: ["describe", "test", "it"] },
                 additionalProperties: {
                   oneOf: [{ type: "string" }, MatcherAndMessageSchema]
@@ -3225,7 +3232,7 @@ const preferViMocked = createEslintRule({
   meta: {
     type: "suggestion",
     docs: {
-      description: "Prefer `vi.mocked()` over `fn as Mock`",
+      description: "require `vi.mocked()` over `fn as Mock`",
       requiresTypeChecking: true,
       recommended: false
     },
@@ -3688,7 +3695,7 @@ const requireLocalTestContextForConcurrentSnapshots = createEslintRule({
           "toMatchFileSnapshot",
           "toThrowErrorMatchingSnapshot",
           "toThrowErrorMatchingInlineSnapshot"
-          //@ts-ignore
+          // @ts-ignore
         ].includes(node.callee?.property.name);
         if (isNotASnapshotAssertion)
           return;
@@ -4069,6 +4076,7 @@ const preferExpectAssertions = createEslintRule({
     let hasExpectInCallBack = false;
     let hasExpectInLoop = false;
     let hasExpectAssertAsFirstStatement = false;
+    let testContextName = null;
     let inTestCaseCall = false;
     let inForLoop = false;
     const shouldCheckFunction = (testFunction) => {
@@ -4142,6 +4150,9 @@ const preferExpectAssertions = createEslintRule({
           inTestCaseCall = true;
           return;
         }
+        if (vitestFnCall?.head.type === "testContext" && vitestFnCall.members[0].type === AST_NODE_TYPES.Identifier && vitestFnCall.members[0].name === "expect") {
+          testContextName = `${vitestFnCall.head.local}`;
+        }
         if (vitestFnCall?.type === "expect" && inTestCaseCall) {
           if (expressionDepth === 1 && isFirstStatement(node) && vitestFnCall.head.node.parent?.type === AST_NODE_TYPES.MemberExpression && vitestFnCall.members.length === 1 && ["assertions", "hasAssertions"].includes(getAccessorValue(vitestFnCall.members[0]))) {
             checkExpectHasAssertions(vitestFnCall, node);
@@ -4170,9 +4181,10 @@ const preferExpectAssertions = createEslintRule({
         }
         const suggestions = [];
         if (secondArg.body.type === AST_NODE_TYPES.BlockStatement) {
+          const prefix = testContextName ? `${testContextName}.` : "";
           suggestions.push(
-            ["suggestAddingHasAssertions", "expect.hasAssertions();"],
-            ["suggestAddingAssertions", "expect.assertions();"]
+            ["suggestAddingHasAssertions", `${prefix}expect.hasAssertions();`],
+            ["suggestAddingAssertions", `${prefix}expect.assertions();`]
           );
         }
         context.report({
@@ -4363,11 +4375,11 @@ const createPaddingRule = (name, description, configs, deprecated = false) => {
       };
       const { scopeInfo } = paddingContext;
       return {
-        Program: scopeInfo.enter,
+        "Program": scopeInfo.enter,
         "Program:exit": scopeInfo.exit,
-        BlockStatement: scopeInfo.enter,
+        "BlockStatement": scopeInfo.enter,
         "BlockStatement:exit": scopeInfo.exit,
-        SwitchStatement: scopeInfo.enter,
+        "SwitchStatement": scopeInfo.enter,
         "SwitchStatement:exit": scopeInfo.exit,
         ":statement": (node) => verifyNode(node, paddingContext),
         SwitchCase(node) {
@@ -4724,7 +4736,7 @@ const validExpectInPromise = createEslintRule({
   name: RULE_NAME,
   meta: {
     docs: {
-      description: "Require promises that have expectations in their chain to be valid"
+      description: "require promises that have expectations in their chain to be valid"
     },
     messages: {
       expectInFloatingPromise: "This promise should either be returned or awaited to ensure the expects in its chain are called"
@@ -4990,6 +5002,8 @@ const plugin = {
           test: "writable",
           describe: "writable",
           it: "writable",
+          expectTypeOf: "writable",
+          assertType: "writable",
           expect: "writable",
           assert: "writable",
           vitest: "writable",
@@ -4997,7 +5011,9 @@ const plugin = {
           beforeAll: "writable",
           afterAll: "writable",
           beforeEach: "writable",
-          afterEach: "writable"
+          afterEach: "writable",
+          onTestFailed: "writable",
+          onTestFinished: "writable"
         }
       }
     }
@@ -5009,6 +5025,8 @@ const plugin = {
         test: true,
         describe: true,
         it: true,
+        expectTypeOf: true,
+        assertType: true,
         expect: true,
         assert: true,
         vitest: true,
@@ -5016,7 +5034,9 @@ const plugin = {
         beforeAll: true,
         afterAll: true,
         beforeEach: true,
-        afterEach: true
+        afterEach: true,
+        onTestFailed: true,
+        onTestFinished: true
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitest/eslint-plugin",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "license": "MIT",
   "description": "Eslint plugin for vitest",
   "repository": "vitest-dev/eslint-plugin-vitest",