@vitest/eslint-plugin 1.1.13 → 1.1.15

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.14";
 
 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);
         }
       }
     };
@@ -4188,13 +4212,14 @@ var StatementType = /* @__PURE__ */ ((StatementType2) => {
   StatementType2[StatementType2["BeforeEachToken"] = 4] = "BeforeEachToken";
   StatementType2[StatementType2["DescribeToken"] = 5] = "DescribeToken";
   StatementType2[StatementType2["ExpectToken"] = 6] = "ExpectToken";
-  StatementType2[StatementType2["FdescribeToken"] = 7] = "FdescribeToken";
-  StatementType2[StatementType2["FitToken"] = 8] = "FitToken";
-  StatementType2[StatementType2["ItToken"] = 9] = "ItToken";
-  StatementType2[StatementType2["TestToken"] = 10] = "TestToken";
-  StatementType2[StatementType2["XdescribeToken"] = 11] = "XdescribeToken";
-  StatementType2[StatementType2["XitToken"] = 12] = "XitToken";
-  StatementType2[StatementType2["XtestToken"] = 13] = "XtestToken";
+  StatementType2[StatementType2["ExpectTypeOfToken"] = 7] = "ExpectTypeOfToken";
+  StatementType2[StatementType2["FdescribeToken"] = 8] = "FdescribeToken";
+  StatementType2[StatementType2["FitToken"] = 9] = "FitToken";
+  StatementType2[StatementType2["ItToken"] = 10] = "ItToken";
+  StatementType2[StatementType2["TestToken"] = 11] = "TestToken";
+  StatementType2[StatementType2["XdescribeToken"] = 12] = "XdescribeToken";
+  StatementType2[StatementType2["XitToken"] = 13] = "XitToken";
+  StatementType2[StatementType2["XtestToken"] = 14] = "XtestToken";
   return StatementType2;
 })(StatementType || {});
 const paddingAlwaysTester = (prevNode, nextNode, paddingContext) => {
@@ -4281,13 +4306,14 @@ const statementTesters = {
   [4 /* BeforeEachToken */]: createTokenTester("beforeEach"),
   [5 /* DescribeToken */]: createTokenTester("describe"),
   [6 /* ExpectToken */]: createTokenTester("expect"),
-  [7 /* FdescribeToken */]: createTokenTester("fdescribe"),
-  [8 /* FitToken */]: createTokenTester("fit"),
-  [9 /* ItToken */]: createTokenTester("it"),
-  [10 /* TestToken */]: createTokenTester("test"),
-  [11 /* XdescribeToken */]: createTokenTester("xdescribe"),
-  [12 /* XitToken */]: createTokenTester("xit"),
-  [13 /* XtestToken */]: createTokenTester("xtest")
+  [7 /* ExpectTypeOfToken */]: createTokenTester("expectTypeOf"),
+  [8 /* FdescribeToken */]: createTokenTester("fdescribe"),
+  [9 /* FitToken */]: createTokenTester("fit"),
+  [10 /* ItToken */]: createTokenTester("it"),
+  [11 /* TestToken */]: createTokenTester("test"),
+  [12 /* XdescribeToken */]: createTokenTester("xdescribe"),
+  [13 /* XitToken */]: createTokenTester("xit"),
+  [14 /* XtestToken */]: createTokenTester("xtest")
 };
 const nodeMatchesType = (node, statementType, paddingContext) => {
   let innerStatementNode = node;
@@ -4469,6 +4495,21 @@ const config$1 = [
     paddingType: PaddingType.Any,
     prevStatementType: StatementType.ExpectToken,
     nextStatementType: StatementType.ExpectToken
+  },
+  {
+    paddingType: PaddingType.Always,
+    prevStatementType: StatementType.Any,
+    nextStatementType: StatementType.ExpectTypeOfToken
+  },
+  {
+    paddingType: PaddingType.Always,
+    prevStatementType: StatementType.ExpectTypeOfToken,
+    nextStatementType: StatementType.Any
+  },
+  {
+    paddingType: PaddingType.Any,
+    prevStatementType: StatementType.ExpectTypeOfToken,
+    nextStatementType: StatementType.ExpectTypeOfToken
   }
 ];
 const paddingAroundExpectGroups = createPaddingRule(

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.14";
 
 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);
         }
       }
     };
@@ -4169,13 +4193,14 @@ var StatementType = /* @__PURE__ */ ((StatementType2) => {
   StatementType2[StatementType2["BeforeEachToken"] = 4] = "BeforeEachToken";
   StatementType2[StatementType2["DescribeToken"] = 5] = "DescribeToken";
   StatementType2[StatementType2["ExpectToken"] = 6] = "ExpectToken";
-  StatementType2[StatementType2["FdescribeToken"] = 7] = "FdescribeToken";
-  StatementType2[StatementType2["FitToken"] = 8] = "FitToken";
-  StatementType2[StatementType2["ItToken"] = 9] = "ItToken";
-  StatementType2[StatementType2["TestToken"] = 10] = "TestToken";
-  StatementType2[StatementType2["XdescribeToken"] = 11] = "XdescribeToken";
-  StatementType2[StatementType2["XitToken"] = 12] = "XitToken";
-  StatementType2[StatementType2["XtestToken"] = 13] = "XtestToken";
+  StatementType2[StatementType2["ExpectTypeOfToken"] = 7] = "ExpectTypeOfToken";
+  StatementType2[StatementType2["FdescribeToken"] = 8] = "FdescribeToken";
+  StatementType2[StatementType2["FitToken"] = 9] = "FitToken";
+  StatementType2[StatementType2["ItToken"] = 10] = "ItToken";
+  StatementType2[StatementType2["TestToken"] = 11] = "TestToken";
+  StatementType2[StatementType2["XdescribeToken"] = 12] = "XdescribeToken";
+  StatementType2[StatementType2["XitToken"] = 13] = "XitToken";
+  StatementType2[StatementType2["XtestToken"] = 14] = "XtestToken";
   return StatementType2;
 })(StatementType || {});
 const paddingAlwaysTester = (prevNode, nextNode, paddingContext) => {
@@ -4262,13 +4287,14 @@ const statementTesters = {
   [4 /* BeforeEachToken */]: createTokenTester("beforeEach"),
   [5 /* DescribeToken */]: createTokenTester("describe"),
   [6 /* ExpectToken */]: createTokenTester("expect"),
-  [7 /* FdescribeToken */]: createTokenTester("fdescribe"),
-  [8 /* FitToken */]: createTokenTester("fit"),
-  [9 /* ItToken */]: createTokenTester("it"),
-  [10 /* TestToken */]: createTokenTester("test"),
-  [11 /* XdescribeToken */]: createTokenTester("xdescribe"),
-  [12 /* XitToken */]: createTokenTester("xit"),
-  [13 /* XtestToken */]: createTokenTester("xtest")
+  [7 /* ExpectTypeOfToken */]: createTokenTester("expectTypeOf"),
+  [8 /* FdescribeToken */]: createTokenTester("fdescribe"),
+  [9 /* FitToken */]: createTokenTester("fit"),
+  [10 /* ItToken */]: createTokenTester("it"),
+  [11 /* TestToken */]: createTokenTester("test"),
+  [12 /* XdescribeToken */]: createTokenTester("xdescribe"),
+  [13 /* XitToken */]: createTokenTester("xit"),
+  [14 /* XtestToken */]: createTokenTester("xtest")
 };
 const nodeMatchesType = (node, statementType, paddingContext) => {
   let innerStatementNode = node;
@@ -4450,6 +4476,21 @@ const config$1 = [
     paddingType: PaddingType.Any,
     prevStatementType: StatementType.ExpectToken,
     nextStatementType: StatementType.ExpectToken
+  },
+  {
+    paddingType: PaddingType.Always,
+    prevStatementType: StatementType.Any,
+    nextStatementType: StatementType.ExpectTypeOfToken
+  },
+  {
+    paddingType: PaddingType.Always,
+    prevStatementType: StatementType.ExpectTypeOfToken,
+    nextStatementType: StatementType.Any
+  },
+  {
+    paddingType: PaddingType.Any,
+    prevStatementType: StatementType.ExpectTypeOfToken,
+    nextStatementType: StatementType.ExpectTypeOfToken
   }
 ];
 const paddingAroundExpectGroups = createPaddingRule(

package/package.json

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