eslint-plugin-jest 28.0.0-next.1 → 28.0.0-next.3

package/lib/rules/utils/parseJestFnCall.js

@@ -50,9 +50,12 @@ const determineJestFnType = name => {
   return 'unknown';
 };
 const ValidJestFnCallChains = ['afterAll', 'afterEach', 'beforeAll', 'beforeEach', 'describe', 'describe.each', 'describe.only', 'describe.only.each', 'describe.skip', 'describe.skip.each', 'fdescribe', 'fdescribe.each', 'xdescribe', 'xdescribe.each', 'it', 'it.concurrent', 'it.concurrent.failing', 'it.concurrent.each', 'it.concurrent.failing.each', 'it.concurrent.failing.only.each', 'it.concurrent.failing.skip.each', 'it.concurrent.only.each', 'it.concurrent.skip.each', 'it.each', 'it.failing', 'it.failing.each', 'it.only', 'it.only.each', 'it.only.failing', 'it.only.failing.each', 'it.skip', 'it.skip.each', 'it.skip.failing', 'it.skip.failing.each', 'it.todo', 'fit', 'fit.each', 'fit.failing', 'fit.failing.each', 'xit', 'xit.each', 'xit.failing', 'xit.failing.each', 'test', 'test.concurrent', 'test.concurrent.failing', 'test.concurrent.each', 'test.concurrent.failing.each', 'test.concurrent.failing.only.each', 'test.concurrent.failing.skip.each', 'test.concurrent.only.each', 'test.concurrent.skip.each', 'test.each', 'test.failing', 'test.failing.each', 'test.only', 'test.only.each', 'test.only.failing', 'test.only.failing.each', 'test.skip', 'test.skip.each', 'test.skip.failing', 'test.skip.failing.each', 'test.todo', 'xtest', 'xtest.each', 'xtest.failing', 'xtest.failing.each'];
+
+// todo: switch back to using declaration merging once https://github.com/typescript-eslint/typescript-eslint/pull/8485
+//  is landed
+
 const resolvePossibleAliasedGlobal = (global, context) => {
-  var _context$settings$jes;
-  const globalAliases = ((_context$settings$jes = context.settings.jest) === null || _context$settings$jes === void 0 ? void 0 : _context$settings$jes.globalAliases) ?? {};
+  const globalAliases = context.settings.jest?.globalAliases ?? {};
   const alias = Object.entries(globalAliases).find(([, aliases]) => aliases.includes(global));
   if (alias) {
     return alias[0];
@@ -79,9 +82,8 @@ const parseJestFnCallWithReason = (node, context) => {
 };
 exports.parseJestFnCallWithReason = parseJestFnCallWithReason;
 const parseJestFnCallWithReasonInner = (node, context) => {
-  var _node$parent2, _node$parent3;
   const chain = getNodeChain(node);
-  if (!(chain !== null && chain !== void 0 && chain.length)) {
+  if (!chain?.length) {
     return null;
   }
   const [first, ...rest] = chain;
@@ -127,8 +129,7 @@ const parseJestFnCallWithReasonInner = (node, context) => {
       return null;
     }
     if (result === 'matcher-not-found') {
-      var _node$parent;
-      if (((_node$parent = node.parent) === null || _node$parent === void 0 ? void 0 : _node$parent.type) === _utils.AST_NODE_TYPES.MemberExpression) {
+      if (node.parent?.type === _utils.AST_NODE_TYPES.MemberExpression) {
         return 'matcher-not-called';
       }
     }
@@ -136,17 +137,14 @@ const parseJestFnCallWithReasonInner = (node, context) => {
   }
 
   // check that every link in the chain except the last is a member expression
-  if (chain.slice(0, chain.length - 1).some(nod => {
-    var _nod$parent;
-    return ((_nod$parent = nod.parent) === null || _nod$parent === void 0 ? void 0 : _nod$parent.type) !== _utils.AST_NODE_TYPES.MemberExpression;
-  })) {
+  if (chain.slice(0, chain.length - 1).some(nod => nod.parent?.type !== _utils.AST_NODE_TYPES.MemberExpression)) {
     return null;
   }
 
   // ensure that we're at the "top" of the function call chain otherwise when
   // parsing e.g. x().y.z(), we'll incorrectly find & parse "x()" even though
   // the full chain is not a valid jest function call chain
-  if (((_node$parent2 = node.parent) === null || _node$parent2 === void 0 ? void 0 : _node$parent2.type) === _utils.AST_NODE_TYPES.CallExpression || ((_node$parent3 = node.parent) === null || _node$parent3 === void 0 ? void 0 : _node$parent3.type) === _utils.AST_NODE_TYPES.MemberExpression) {
+  if (node.parent?.type === _utils.AST_NODE_TYPES.CallExpression || node.parent?.type === _utils.AST_NODE_TYPES.MemberExpression) {
     return null;
   }
   return {
@@ -157,10 +155,9 @@ const parseJestFnCallWithReasonInner = (node, context) => {
 const findModifiersAndMatcher = members => {
   const modifiers = [];
   for (const member of members) {
-    var _member$parent, _member$parent$parent;
     // check if the member is being called, which means it is the matcher
     // (and also the end of the entire "expect" call chain)
-    if (((_member$parent = member.parent) === null || _member$parent === void 0 ? void 0 : _member$parent.type) === _utils.AST_NODE_TYPES.MemberExpression && ((_member$parent$parent = member.parent.parent) === null || _member$parent$parent === void 0 ? void 0 : _member$parent$parent.type) === _utils.AST_NODE_TYPES.CallExpression) {
+    if (member.parent?.type === _utils.AST_NODE_TYPES.MemberExpression && member.parent.parent?.type === _utils.AST_NODE_TYPES.CallExpression) {
       return {
         matcher: member,
         args: member.parent.parent.arguments,
@@ -245,7 +242,6 @@ const findImportSourceNode = node => {
   return null;
 };
 const describeVariableDefAsImport = def => {
-  var _def$name$parent;
   // make sure that we've actually being assigned a value
   if (!def.node.init) {
     return null;
@@ -254,7 +250,7 @@ const describeVariableDefAsImport = def => {
   if (!sourceNode || !(0, _utils2.isStringNode)(sourceNode)) {
     return null;
   }
-  if (((_def$name$parent = def.name.parent) === null || _def$name$parent === void 0 ? void 0 : _def$name$parent.type) !== _utils.AST_NODE_TYPES.Property) {
+  if (def.name.parent?.type !== _utils.AST_NODE_TYPES.Property) {
     return null;
   }
   if (!(0, _utils2.isSupportedAccessor)(def.name.parent.key)) {
@@ -293,7 +289,7 @@ const resolveScope = (scope, identifier) => {
     if (ref && ref.defs.length > 0) {
       const def = ref.defs[ref.defs.length - 1];
       const importDetails = describePossibleImportDef(def);
-      if ((importDetails === null || importDetails === void 0 ? void 0 : importDetails.local) === identifier) {
+      if (importDetails?.local === identifier) {
         return importDetails;
       }
       return 'local';

package/lib/rules/valid-describe-callback.js

@@ -19,9 +19,7 @@ var _default = exports.default = (0, _utils2.createRule)({
   meta: {
     type: 'problem',
     docs: {
-      category: 'Possible Errors',
-      description: 'Enforce valid `describe()` callback',
-      recommended: 'error'
+      description: 'Enforce valid `describe()` callback'
     },
     messages: {
       nameAndCallback: 'Describe requires name and callback arguments',
@@ -37,7 +35,7 @@ var _default = exports.default = (0, _utils2.createRule)({
     return {
       CallExpression(node) {
         const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
-        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'describe') {
+        if (jestFnCall?.type !== 'describe') {
           return;
         }
         if (node.arguments.length < 1) {

package/lib/rules/valid-expect-in-promise.js

@@ -24,7 +24,7 @@ const isPromiseChainCall = node => {
 };
 const isTestCaseCallWithCallbackArg = (node, context) => {
   const jestCallFn = (0, _utils2.parseJestFnCall)(node, context);
-  if ((jestCallFn === null || jestCallFn === void 0 ? void 0 : jestCallFn.type) !== 'test') {
+  if (jestCallFn?.type !== 'test') {
     return false;
   }
   const isJestEach = jestCallFn.members.some(s => (0, _utils2.getAccessorValue)(s) === 'each');
@@ -67,10 +67,10 @@ const isPromiseMethodThatUsesValue = (node, identifier) => {
  */
 const isValueAwaitedInElements = (name, elements) => {
   for (const element of elements) {
-    if ((element === null || element === void 0 ? void 0 : element.type) === _utils.AST_NODE_TYPES.AwaitExpression && (0, _utils2.isIdentifier)(element.argument, name)) {
+    if (element?.type === _utils.AST_NODE_TYPES.AwaitExpression && (0, _utils2.isIdentifier)(element.argument, name)) {
       return true;
     }
-    if ((element === null || element === void 0 ? void 0 : element.type) === _utils.AST_NODE_TYPES.ArrayExpression && isValueAwaitedInElements(name, element.elements)) {
+    if (element?.type === _utils.AST_NODE_TYPES.ArrayExpression && isValueAwaitedInElements(name, element.elements)) {
       return true;
     }
   }
@@ -138,7 +138,7 @@ const isValueAwaitedOrReturned = (identifier, body, context) => {
         }
         const leftMostCall = getLeftMostCallExpression(node.expression);
         const jestFnCall = (0, _utils2.parseJestFnCall)(node.expression, context);
-        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) === 'expect' && leftMostCall.arguments.length > 0 && (0, _utils2.isIdentifier)(leftMostCall.arguments[0], name)) {
+        if (jestFnCall?.type === 'expect' && leftMostCall.arguments.length > 0 && (0, _utils2.isIdentifier)(leftMostCall.arguments[0], name)) {
           if (jestFnCall.members.some(m => {
             const v = (0, _utils2.getAccessorValue)(m);
             return v === _utils2.ModifierName.resolves || v === _utils2.ModifierName.rejects;
@@ -154,10 +154,9 @@ const isValueAwaitedOrReturned = (identifier, body, context) => {
       // (re)assignment changes the runtime value, so if we've not found an
       // await or return already we act as if we've reached the end of the body
       if (node.expression.type === _utils.AST_NODE_TYPES.AssignmentExpression) {
-        var _getNodeName;
         // unless we're assigning to the same identifier, in which case
         // we might be chaining off the existing promise value
-        if ((0, _utils2.isIdentifier)(node.expression.left, name) && (_getNodeName = (0, _utils2.getNodeName)(node.expression.right)) !== null && _getNodeName !== void 0 && _getNodeName.startsWith(`${name}.`) && isPromiseChainCall(node.expression.right)) {
+        if ((0, _utils2.isIdentifier)(node.expression.left, name) && (0, _utils2.getNodeName)(node.expression.right)?.startsWith(`${name}.`) && isPromiseChainCall(node.expression.right)) {
           continue;
         }
         break;
@@ -185,9 +184,8 @@ const isDirectlyWithinTestCaseCall = (node, context) => {
   let parent = node;
   while (parent) {
     if ((0, _utils2.isFunction)(parent)) {
-      var _parent;
       parent = parent.parent;
-      return ((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.type) === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isTypeOfJestFnCall)(parent, context, ['test']);
+      return parent?.type === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isTypeOfJestFnCall)(parent, context, ['test']);
     }
     parent = parent.parent;
   }
@@ -207,9 +205,7 @@ var _default = exports.default = (0, _utils2.createRule)({
   name: __filename,
   meta: {
     docs: {
-      category: 'Best Practices',
-      description: 'Require promises that have expectations in their chain to be valid',
-      recommended: 'error'
+      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/lib/rules/valid-expect.js

@@ -27,13 +27,9 @@ const getPromiseCallExpressionNode = node => {
   }
   return null;
 };
-const findPromiseCallExpressionNode = node => {
-  var _node$parent;
-  return (_node$parent = node.parent) !== null && _node$parent !== void 0 && _node$parent.parent && [_utils.AST_NODE_TYPES.CallExpression, _utils.AST_NODE_TYPES.ArrayExpression].includes(node.parent.type) ? getPromiseCallExpressionNode(node.parent) : null;
-};
+const findPromiseCallExpressionNode = node => node.parent?.parent && [_utils.AST_NODE_TYPES.CallExpression, _utils.AST_NODE_TYPES.ArrayExpression].includes(node.parent.type) ? getPromiseCallExpressionNode(node.parent) : null;
 const getParentIfThenified = node => {
-  var _node$parent2;
-  const grandParentNode = (_node$parent2 = node.parent) === null || _node$parent2 === void 0 ? void 0 : _node$parent2.parent;
+  const grandParentNode = node.parent?.parent;
   if (grandParentNode && grandParentNode.type === _utils.AST_NODE_TYPES.CallExpression && grandParentNode.callee.type === _utils.AST_NODE_TYPES.MemberExpression && (0, _utils2.isSupportedAccessor)(grandParentNode.callee.property) && ['then', 'catch'].includes((0, _utils2.getAccessorValue)(grandParentNode.callee.property)) && grandParentNode.parent) {
     // Just in case `then`s are chained look one above.
     return getParentIfThenified(grandParentNode);
@@ -58,9 +54,7 @@ var _default = exports.default = (0, _utils2.createRule)({
   name: __filename,
   meta: {
     docs: {
-      category: 'Best Practices',
-      description: 'Enforce valid `expect()` usage',
-      recommended: 'error'
+      description: 'Enforce valid `expect()` usage'
     },
     messages: {
       tooManyArgs: 'Expect takes at most {{ amount }} argument{{ s }}',
@@ -139,8 +133,7 @@ var _default = exports.default = (0, _utils2.createRule)({
       CallExpression(node) {
         const jestFnCall = (0, _utils2.parseJestFnCallWithReason)(node, context);
         if (typeof jestFnCall === 'string') {
-          var _node$parent3;
-          const reportingNode = ((_node$parent3 = node.parent) === null || _node$parent3 === void 0 ? void 0 : _node$parent3.type) === _utils.AST_NODE_TYPES.MemberExpression ? findTopMostMemberExpression(node.parent).property : node;
+          const reportingNode = node.parent?.type === _utils.AST_NODE_TYPES.MemberExpression ? findTopMostMemberExpression(node.parent).property : node;
           if (jestFnCall === 'matcher-not-found') {
             context.report({
               messageId: 'matcherNotFound',
@@ -162,13 +155,13 @@ var _default = exports.default = (0, _utils2.createRule)({
             return;
           }
           return;
-        } else if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'expect') {
+        } else if (jestFnCall?.type !== 'expect') {
           return;
         }
         const {
           parent: expect
         } = jestFnCall.head.node;
-        if ((expect === null || expect === void 0 ? void 0 : expect.type) !== _utils.AST_NODE_TYPES.CallExpression) {
+        if (expect?.type !== _utils.AST_NODE_TYPES.CallExpression) {
           return;
         }
         if (expect.arguments.length < minArgs) {
@@ -222,7 +215,7 @@ var _default = exports.default = (0, _utils2.createRule)({
         } = jestFnCall;
         const parentNode = matcher.parent.parent;
         const shouldBeAwaited = jestFnCall.modifiers.some(nod => (0, _utils2.getAccessorValue)(nod) !== 'not') || asyncMatchers.includes((0, _utils2.getAccessorValue)(matcher));
-        if (!(parentNode !== null && parentNode !== void 0 && parentNode.parent) || !shouldBeAwaited) {
+        if (!parentNode?.parent || !shouldBeAwaited) {
           return;
         }
         /**

package/lib/rules/valid-title.js

@@ -49,9 +49,7 @@ var _default = exports.default = (0, _utils2.createRule)({
   name: __filename,
   meta: {
     docs: {
-      category: 'Best Practices',
-      description: 'Enforce valid titles',
-      recommended: 'error'
+      description: 'Enforce valid titles'
     },
     messages: {
       titleMustBeString: 'Title must be a string',
@@ -93,6 +91,7 @@ var _default = exports.default = (0, _utils2.createRule)({
             type: 'string'
           }, MatcherAndMessageSchema, {
             type: 'object',
+            // @ts-expect-error https://github.com/eslint/eslint/discussions/17573
             propertyNames: {
               enum: ['describe', 'test', 'it']
             },
@@ -128,7 +127,7 @@ var _default = exports.default = (0, _utils2.createRule)({
     return {
       CallExpression(node) {
         const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
-        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'describe' && (jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'test') {
+        if (jestFnCall?.type !== 'describe' && jestFnCall?.type !== 'test') {
           return;
         }
         const [argument] = node.arguments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "28.0.0-next.1",
+  "version": "28.0.0-next.3",
   "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",
@@ -95,7 +95,7 @@
     ]
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^5.10.0"
+    "@typescript-eslint/utils": "^6.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
@@ -107,7 +107,7 @@
     "@schemastore/package": "^0.0.10",
     "@semantic-release/changelog": "^6.0.0",
     "@semantic-release/git": "^10.0.0",
-    "@tsconfig/node14": "^14.1.0",
+    "@tsconfig/node16": "^16.0.0",
     "@types/eslint": "^8.4.6",
     "@types/jest": "^29.0.0",
     "@types/node": "^14.18.26",
@@ -156,7 +156,7 @@
   },
   "packageManager": "yarn@3.8.1",
   "engines": {
-    "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+    "node": "^16.10.0 || >=18.0.0"
   },
   "publishConfig": {
     "provenance": true