@vitest/eslint-plugin 1.1.16 → 1.1.18

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.15";
+const version = "1.1.17";
 
 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,
@@ -271,6 +271,12 @@ const resolveVitestFn = (context, node, identifier) => {
   const maybeImport = resolveScope(scope, identifier);
   if (maybeImport === "local")
     return null;
+  if (maybeImport === "testContext")
+    return {
+      local: identifier,
+      original: null,
+      type: "testContext"
+    };
   if (maybeImport) {
     if (maybeImport.source === "vitest") {
       return {
@@ -300,6 +306,16 @@ const resolveScope = (scope, identifier) => {
     const ref = currentScope.set.get(identifier);
     if (ref && ref.defs.length > 0) {
       const def = ref.defs[ref.defs.length - 1];
+      const objectParam = isFunction(def.node) ? def.node.params.find((params) => params.type === utils.AST_NODE_TYPES.ObjectPattern) : void 0;
+      if (objectParam) {
+        const property = objectParam.properties.find((property2) => property2.type === utils.AST_NODE_TYPES.Property);
+        const key = property?.key.type === utils.AST_NODE_TYPES.Identifier ? property.key : void 0;
+        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)
+        return "testContext";
       const importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
         return importDetails;
@@ -3681,8 +3697,12 @@ const requireLocalTestContextForConcurrentSnapshots = createEslintRule({
   create(context) {
     return {
       CallExpression(node) {
-        const isNotAnAssertion = !isTypeOfVitestFnCall(node, context, ["expect"]);
-        if (isNotAnAssertion)
+        const vitestFnCall = parseVitestFnCall(node, context);
+        if (vitestFnCall === null)
+          return;
+        if (vitestFnCall.type !== "expect")
+          return;
+        if (vitestFnCall.type === "expect" && vitestFnCall.head.type === "testContext")
           return;
         const isNotASnapshotAssertion = ![
           "toMatchSnapshot",
@@ -4071,6 +4091,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) => {
@@ -4144,6 +4165,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);
@@ -4162,12 +4186,6 @@ const preferExpectAssertions = createEslintRule({
         if (node.arguments.length < 2)
           return;
         const [, secondArg] = node.arguments;
-        if (secondArg?.type === utils.AST_NODE_TYPES.ArrowFunctionExpression && secondArg.params.length) {
-          if (secondArg?.params[0].type === utils.AST_NODE_TYPES.ObjectPattern) {
-            if (secondArg.params[0].properties[0].type === utils.AST_NODE_TYPES.Property && secondArg.params[0].properties[0].key.type === utils.AST_NODE_TYPES.Identifier && secondArg.params[0].properties[0].key.name === "expect")
-              return;
-          }
-        }
         if (!isFunction(secondArg) || !shouldCheckFunction(secondArg))
           return;
         hasExpectInLoop = false;
@@ -4178,9 +4196,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({
@@ -4998,6 +5017,8 @@ const plugin = {
           test: "writable",
           describe: "writable",
           it: "writable",
+          expectTypeOf: "writable",
+          assertType: "writable",
           expect: "writable",
           assert: "writable",
           vitest: "writable",
@@ -5005,7 +5026,9 @@ const plugin = {
           beforeAll: "writable",
           afterAll: "writable",
           beforeEach: "writable",
-          afterEach: "writable"
+          afterEach: "writable",
+          onTestFailed: "writable",
+          onTestFinished: "writable"
         }
       }
     }
@@ -5017,6 +5040,8 @@ const plugin = {
         test: true,
         describe: true,
         it: true,
+        expectTypeOf: true,
+        assertType: true,
         expect: true,
         assert: true,
         vitest: true,
@@ -5024,7 +5049,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.15";
+const version = "1.1.17";
 
 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,
@@ -252,6 +252,12 @@ const resolveVitestFn = (context, node, identifier) => {
   const maybeImport = resolveScope(scope, identifier);
   if (maybeImport === "local")
     return null;
+  if (maybeImport === "testContext")
+    return {
+      local: identifier,
+      original: null,
+      type: "testContext"
+    };
   if (maybeImport) {
     if (maybeImport.source === "vitest") {
       return {
@@ -281,6 +287,16 @@ const resolveScope = (scope, identifier) => {
     const ref = currentScope.set.get(identifier);
     if (ref && ref.defs.length > 0) {
       const def = ref.defs[ref.defs.length - 1];
+      const objectParam = isFunction(def.node) ? def.node.params.find((params) => params.type === AST_NODE_TYPES.ObjectPattern) : void 0;
+      if (objectParam) {
+        const property = objectParam.properties.find((property2) => property2.type === AST_NODE_TYPES.Property);
+        const key = property?.key.type === AST_NODE_TYPES.Identifier ? property.key : void 0;
+        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)
+        return "testContext";
       const importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
         return importDetails;
@@ -3662,8 +3678,12 @@ const requireLocalTestContextForConcurrentSnapshots = createEslintRule({
   create(context) {
     return {
       CallExpression(node) {
-        const isNotAnAssertion = !isTypeOfVitestFnCall(node, context, ["expect"]);
-        if (isNotAnAssertion)
+        const vitestFnCall = parseVitestFnCall(node, context);
+        if (vitestFnCall === null)
+          return;
+        if (vitestFnCall.type !== "expect")
+          return;
+        if (vitestFnCall.type === "expect" && vitestFnCall.head.type === "testContext")
           return;
         const isNotASnapshotAssertion = ![
           "toMatchSnapshot",
@@ -4052,6 +4072,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) => {
@@ -4125,6 +4146,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);
@@ -4143,12 +4167,6 @@ const preferExpectAssertions = createEslintRule({
         if (node.arguments.length < 2)
           return;
         const [, secondArg] = node.arguments;
-        if (secondArg?.type === AST_NODE_TYPES.ArrowFunctionExpression && secondArg.params.length) {
-          if (secondArg?.params[0].type === AST_NODE_TYPES.ObjectPattern) {
-            if (secondArg.params[0].properties[0].type === AST_NODE_TYPES.Property && secondArg.params[0].properties[0].key.type === AST_NODE_TYPES.Identifier && secondArg.params[0].properties[0].key.name === "expect")
-              return;
-          }
-        }
         if (!isFunction(secondArg) || !shouldCheckFunction(secondArg))
           return;
         hasExpectInLoop = false;
@@ -4159,9 +4177,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({
@@ -4979,6 +4998,8 @@ const plugin = {
           test: "writable",
           describe: "writable",
           it: "writable",
+          expectTypeOf: "writable",
+          assertType: "writable",
           expect: "writable",
           assert: "writable",
           vitest: "writable",
@@ -4986,7 +5007,9 @@ const plugin = {
           beforeAll: "writable",
           afterAll: "writable",
           beforeEach: "writable",
-          afterEach: "writable"
+          afterEach: "writable",
+          onTestFailed: "writable",
+          onTestFinished: "writable"
         }
       }
     }
@@ -4998,6 +5021,8 @@ const plugin = {
         test: true,
         describe: true,
         it: true,
+        expectTypeOf: true,
+        assertType: true,
         expect: true,
         assert: true,
         vitest: true,
@@ -5005,7 +5030,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.16",
+  "version": "1.1.18",
   "license": "MIT",
   "description": "Eslint plugin for vitest",
   "repository": "vitest-dev/eslint-plugin-vitest",