@vitest/eslint-plugin 1.1.15 → 1.1.17

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.14";
+const version = "1.1.16";
 
 function createEslintRule(rule) {
   const createRule = utils.ESLintUtils.RuleCreator(
@@ -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,13 @@ 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 importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
         return importDetails;
@@ -1822,7 +1835,7 @@ const noMocksImport = createEslintRule({
       recommended: false
     },
     messages: {
-      noMocksImport: `Mocks should not be manually imported from a ${mocksDirName} directory. Instead use \`jest.mock\` and import from the original module path.`
+      noMocksImport: `Mocks should not be manually imported from a ${mocksDirName} directory. Instead use \`vi.mock\` and import from the original module path.`
     },
     schema: []
   },
@@ -3681,8 +3694,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",
@@ -4162,12 +4179,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;

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.14";
+const version = "1.1.16";
 
 function createEslintRule(rule) {
   const createRule = ESLintUtils.RuleCreator(
@@ -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,13 @@ 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 importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
         return importDetails;
@@ -1803,7 +1816,7 @@ const noMocksImport = createEslintRule({
       recommended: false
     },
     messages: {
-      noMocksImport: `Mocks should not be manually imported from a ${mocksDirName} directory. Instead use \`jest.mock\` and import from the original module path.`
+      noMocksImport: `Mocks should not be manually imported from a ${mocksDirName} directory. Instead use \`vi.mock\` and import from the original module path.`
     },
     schema: []
   },
@@ -3662,8 +3675,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",
@@ -4143,12 +4160,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;

package/package.json

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