@vitest/eslint-plugin 1.1.13 → 1.1.14

package/README.md

@@ -206,6 +206,7 @@ export default [
 | [valid-describe-callback](docs/rules/valid-describe-callback.md)                                                         | enforce valid describe callback                                       | ✅  | 🌐 |    |    |    |
 | [valid-expect](docs/rules/valid-expect.md)                                                                               | enforce valid `expect()` usage                                        | ✅  | 🌐 | 🔧 |    |    |
 | [valid-title](docs/rules/valid-title.md)                                                                                 | enforce valid titles                                                  | ✅  | 🌐 | 🔧 |    |    |
+| [valid-expect-in-promise](docs/rules/valid-expect-in-promise.md)                                                                                 | require promises that have expectations in their chain to be valid                                                  |    | 🌐 |   |    |    |
 
 <!-- end auto-generated rules list -->
 

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.12";
+const version = "1.1.13";
 
 function createEslintRule(rule) {
   const createRule = utils.ESLintUtils.RuleCreator(
@@ -3377,6 +3377,19 @@ const paramsLocation = (params) => {
     end: last.loc.end
   };
 };
+const hasNonEachMembersAndParams = (vitestFnCall, functionExpression) => {
+  return vitestFnCall.members.every((s) => getAccessorValue(s) !== "each") && functionExpression.params.length;
+};
+const reportUnexpectedReturnInDescribe = (blockStatement, context) => {
+  blockStatement.body.forEach((node) => {
+    if (node.type !== utils.AST_NODE_TYPES.ReturnStatement)
+      return;
+    context.report({
+      messageId: "unexpectedReturnInDescribe",
+      node
+    });
+  });
+};
 const validDescribeCallback = createEslintRule({
   name: RULE_NAME$i,
   meta: {
@@ -3408,42 +3421,53 @@ const validDescribeCallback = createEslintRule({
             loc: node.loc
           });
         }
-        const [, callback] = node.arguments;
-        if (!callback) {
+        const [, arg2, arg3] = node.arguments;
+        if (!arg2) {
           context.report({
             messageId: "nameAndCallback",
             loc: paramsLocation(node.arguments)
           });
           return;
         }
-        if (!isFunction(callback)) {
+        if (!isFunction(arg2)) {
+          if (arg3 && isFunction(arg3)) {
+            if (hasNonEachMembersAndParams(vitestFnCall, arg3)) {
+              context.report({
+                messageId: "unexpectedDescribeArgument",
+                node: arg3
+              });
+            }
+            if (arg3.body.type === utils.AST_NODE_TYPES.CallExpression) {
+              context.report({
+                messageId: "unexpectedReturnInDescribe",
+                node: arg3
+              });
+            }
+            if (arg3.body.type === utils.AST_NODE_TYPES.BlockStatement) {
+              reportUnexpectedReturnInDescribe(arg3.body, context);
+            }
+            return;
+          }
           context.report({
             messageId: "secondArgumentMustBeFunction",
             loc: paramsLocation(node.arguments)
           });
           return;
         }
-        if (vitestFnCall.members.every((s) => getAccessorValue(s) !== "each") && callback.params.length) {
+        if (hasNonEachMembersAndParams(vitestFnCall, arg2)) {
           context.report({
             messageId: "unexpectedDescribeArgument",
-            node: callback
+            node: arg2
           });
         }
-        if (callback.body.type === utils.AST_NODE_TYPES.CallExpression) {
+        if (arg2.body.type === utils.AST_NODE_TYPES.CallExpression) {
           context.report({
             messageId: "unexpectedReturnInDescribe",
-            node: callback
+            node: arg2
           });
         }
-        if (callback.body.type === utils.AST_NODE_TYPES.BlockStatement) {
-          callback.body.body.forEach((node2) => {
-            if (node2.type === utils.AST_NODE_TYPES.ReturnStatement) {
-              context.report({
-                messageId: "unexpectedReturnInDescribe",
-                node: node2
-              });
-            }
-          });
+        if (arg2.body.type === utils.AST_NODE_TYPES.BlockStatement) {
+          reportUnexpectedReturnInDescribe(arg2.body, context);
         }
       }
     };

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.12";
+const version = "1.1.13";
 
 function createEslintRule(rule) {
   const createRule = ESLintUtils.RuleCreator(
@@ -3358,6 +3358,19 @@ const paramsLocation = (params) => {
     end: last.loc.end
   };
 };
+const hasNonEachMembersAndParams = (vitestFnCall, functionExpression) => {
+  return vitestFnCall.members.every((s) => getAccessorValue(s) !== "each") && functionExpression.params.length;
+};
+const reportUnexpectedReturnInDescribe = (blockStatement, context) => {
+  blockStatement.body.forEach((node) => {
+    if (node.type !== AST_NODE_TYPES.ReturnStatement)
+      return;
+    context.report({
+      messageId: "unexpectedReturnInDescribe",
+      node
+    });
+  });
+};
 const validDescribeCallback = createEslintRule({
   name: RULE_NAME$i,
   meta: {
@@ -3389,42 +3402,53 @@ const validDescribeCallback = createEslintRule({
             loc: node.loc
           });
         }
-        const [, callback] = node.arguments;
-        if (!callback) {
+        const [, arg2, arg3] = node.arguments;
+        if (!arg2) {
           context.report({
             messageId: "nameAndCallback",
             loc: paramsLocation(node.arguments)
           });
           return;
         }
-        if (!isFunction(callback)) {
+        if (!isFunction(arg2)) {
+          if (arg3 && isFunction(arg3)) {
+            if (hasNonEachMembersAndParams(vitestFnCall, arg3)) {
+              context.report({
+                messageId: "unexpectedDescribeArgument",
+                node: arg3
+              });
+            }
+            if (arg3.body.type === AST_NODE_TYPES.CallExpression) {
+              context.report({
+                messageId: "unexpectedReturnInDescribe",
+                node: arg3
+              });
+            }
+            if (arg3.body.type === AST_NODE_TYPES.BlockStatement) {
+              reportUnexpectedReturnInDescribe(arg3.body, context);
+            }
+            return;
+          }
           context.report({
             messageId: "secondArgumentMustBeFunction",
             loc: paramsLocation(node.arguments)
           });
           return;
         }
-        if (vitestFnCall.members.every((s) => getAccessorValue(s) !== "each") && callback.params.length) {
+        if (hasNonEachMembersAndParams(vitestFnCall, arg2)) {
           context.report({
             messageId: "unexpectedDescribeArgument",
-            node: callback
+            node: arg2
           });
         }
-        if (callback.body.type === AST_NODE_TYPES.CallExpression) {
+        if (arg2.body.type === AST_NODE_TYPES.CallExpression) {
           context.report({
             messageId: "unexpectedReturnInDescribe",
-            node: callback
+            node: arg2
           });
         }
-        if (callback.body.type === AST_NODE_TYPES.BlockStatement) {
-          callback.body.body.forEach((node2) => {
-            if (node2.type === AST_NODE_TYPES.ReturnStatement) {
-              context.report({
-                messageId: "unexpectedReturnInDescribe",
-                node: node2
-              });
-            }
-          });
+        if (arg2.body.type === AST_NODE_TYPES.BlockStatement) {
+          reportUnexpectedReturnInDescribe(arg2.body, context);
         }
       }
     };

package/package.json

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