@vitest/eslint-plugin 1.1.18 → 1.1.20

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.17";
+const version = "1.1.19";
 
 function createEslintRule(rule) {
   const createRule = utils.ESLintUtils.RuleCreator(
@@ -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) {
@@ -314,7 +318,7 @@ const resolveScope = (scope, identifier) => {
           return "testContext";
       }
       const namedParam = isFunction(def.node) ? def.node.params.find((params) => params.type === utils.AST_NODE_TYPES.Identifier) : void 0;
-      if (namedParam)
+      if (namedParam && isAncestorTestCaseCall(namedParam.parent))
         return "testContext";
       const importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
@@ -758,7 +762,7 @@ function matchesAssertFunctionName(nodeName, patterns) {
     (p) => new RegExp(
       `^${p.split(".").map((x) => {
         if (x === "**")
-          return "[a-z\\d\\.]*";
+          return "[_a-z\\d\\.]*";
         return x.replace(/\*/gu, "[a-z\\d]*");
       }).join("\\.")}(\\.|$)`,
       "ui"
@@ -1060,7 +1064,7 @@ const noHooks = createEslintRule({
       properties: {
         allow: {
           type: "array",
-          //@ts-ignore
+          // @ts-ignore
           contains: ["beforeAll", "beforeEach", "afterAll", "afterEach"]
         }
       },
@@ -1150,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
           }
@@ -1942,9 +1946,9 @@ const noStandaloneExpect = createEslintRule({
       {
         properties: {
           additionaltestblockfunctions: {
-            //@ts-ignore
+            // @ts-ignore
             type: "array",
-            //@ts-ignore
+            // @ts-ignore
             items: { type: `string` }
           }
         },
@@ -2221,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]
@@ -3247,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
     },
@@ -3710,7 +3714,7 @@ const requireLocalTestContextForConcurrentSnapshots = createEslintRule({
           "toMatchFileSnapshot",
           "toThrowErrorMatchingSnapshot",
           "toThrowErrorMatchingInlineSnapshot"
-          //@ts-ignore
+          // @ts-ignore
         ].includes(node.callee?.property.name);
         if (isNotASnapshotAssertion)
           return;
@@ -4390,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) {
@@ -4751,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"

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.17";
+const version = "1.1.19";
 
 function createEslintRule(rule) {
   const createRule = ESLintUtils.RuleCreator(
@@ -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) {
@@ -295,7 +299,7 @@ const resolveScope = (scope, identifier) => {
           return "testContext";
       }
       const namedParam = isFunction(def.node) ? def.node.params.find((params) => params.type === AST_NODE_TYPES.Identifier) : void 0;
-      if (namedParam)
+      if (namedParam && isAncestorTestCaseCall(namedParam.parent))
         return "testContext";
       const importDetails = describePossibleImportDef(def);
       if (importDetails?.local === identifier)
@@ -739,7 +743,7 @@ function matchesAssertFunctionName(nodeName, patterns) {
     (p) => new RegExp(
       `^${p.split(".").map((x) => {
         if (x === "**")
-          return "[a-z\\d\\.]*";
+          return "[_a-z\\d\\.]*";
         return x.replace(/\*/gu, "[a-z\\d]*");
       }).join("\\.")}(\\.|$)`,
       "ui"
@@ -1041,7 +1045,7 @@ const noHooks = createEslintRule({
       properties: {
         allow: {
           type: "array",
-          //@ts-ignore
+          // @ts-ignore
           contains: ["beforeAll", "beforeEach", "afterAll", "afterEach"]
         }
       },
@@ -1131,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
           }
@@ -1923,9 +1927,9 @@ const noStandaloneExpect = createEslintRule({
       {
         properties: {
           additionaltestblockfunctions: {
-            //@ts-ignore
+            // @ts-ignore
             type: "array",
-            //@ts-ignore
+            // @ts-ignore
             items: { type: `string` }
           }
         },
@@ -2202,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]
@@ -3228,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
     },
@@ -3691,7 +3695,7 @@ const requireLocalTestContextForConcurrentSnapshots = createEslintRule({
           "toMatchFileSnapshot",
           "toThrowErrorMatchingSnapshot",
           "toThrowErrorMatchingInlineSnapshot"
-          //@ts-ignore
+          // @ts-ignore
         ].includes(node.callee?.property.name);
         if (isNotASnapshotAssertion)
           return;
@@ -4371,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) {
@@ -4732,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"

package/package.json

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