Merge branch 'main' into typescript-eslint-utils-7

.yarnrc.yml

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: '@yarnpkg/plugin-interactive-tools'
 
-yarnPath: .yarn/releases/yarn-3.8.1.cjs
+yarnPath: .yarn/releases/yarn-3.8.2.cjs

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [28.3.0](https://github.com/jest-community/eslint-plugin-jest/compare/v28.2.0...v28.3.0) (2024-04-27)
+
+
+### Features
+
+* prefer importing jest globals for specific types ([#1568](https://github.com/jest-community/eslint-plugin-jest/issues/1568)) ([c464ae3](https://github.com/jest-community/eslint-plugin-jest/commit/c464ae311b81f005af29df610d4032519125bafa))
+
 # [28.2.0](https://github.com/jest-community/eslint-plugin-jest/compare/v28.1.1...v28.2.0) (2024-04-06)
 
 

docs/rules/prefer-importing-jest-globals.md

@@ -42,6 +42,42 @@ describe('foo', () => {
 });
 ```
 
+## Options
+
+This rule can be configured as follows
+
+```json
+{
+  "type": "object",
+  "properties": {
+    "types": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": ["hook", "describe", "test", "expect", "jest", "unknown"]
+      }
+    }
+  },
+  "additionalProperties": false
+}
+```
+
+#### types
+
+A list of Jest global types to enforce explicit imports for. By default, all
+Jest globals are enforced.
+
+This option is useful when you only want to enforce explicit imports for a
+subset of Jest globals. For instance, when migrating to ESM, you might want to
+enforce explicit imports only for the `jest` global, as of
+[Jest's ESM documentation](https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs).
+
+```json5
+{
+  'jest/prefer-importing-jest-globals': ['error', { types: ['jest'] }],
+}
+```
+
 ## Further Reading
 
 - [Documentation](https://jestjs.io/docs/api)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "28.2.0",
+  "version": "28.3.0",
   "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",
@@ -87,7 +87,7 @@
     "babel-jest": "^29.0.0",
     "babel-plugin-replace-ts-export-assignment": "^0.0.2",
     "dedent": "^1.5.0",
-    "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0",
+    "eslint": "^7.0.0 || ^8.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-doc-generator": "^1.0.0",
     "eslint-plugin-eslint-comments": "^3.1.2",
@@ -125,7 +125,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@3.8.1",
+  "packageManager": "yarn@3.8.2",
   "engines": {
     "node": "^16.10.0 || ^18.12.0 || >=20.0.0"
   },

src/rules/__tests__/prefer-importing-jest-globals.test.ts

@@ -22,6 +22,25 @@ ruleTester.run('prefer-importing-jest-globals', rule, {
       `,
       parserOptions: { sourceType: 'module' },
     },
+    {
+      code: dedent`
+        test('should pass', () => {
+            expect(true).toBeDefined();
+        });
+      `,
+      options: [{ types: ['jest'] }],
+      parserOptions: { sourceType: 'module' },
+    },
+    {
+      code: dedent`
+        const { it } = require('@jest/globals');
+        it('should pass', () => {
+            expect(true).toBeDefined();
+        });
+      `,
+      options: [{ types: ['test'] }],
+      parserOptions: { sourceType: 'module' },
+    },
     {
       code: dedent`
         // with require
@@ -85,6 +104,33 @@ ruleTester.run('prefer-importing-jest-globals', rule, {
         },
       ],
     },
+    {
+      code: dedent`
+        jest.useFakeTimers();
+        describe("suite", () => {
+          test("foo");
+          expect(true).toBeDefined();
+        })
+      `,
+      output: dedent`
+        import { jest } from '@jest/globals';
+        jest.useFakeTimers();
+        describe("suite", () => {
+          test("foo");
+          expect(true).toBeDefined();
+        })
+      `,
+      options: [{ types: ['jest'] }],
+      parserOptions: { sourceType: 'module' },
+      errors: [
+        {
+          endColumn: 5,
+          column: 1,
+          line: 1,
+          messageId: 'preferImportingJestGlobal',
+        },
+      ],
+    },
     {
       code: dedent`
         import React from 'react';

src/rules/expect-expect.ts

@@ -65,7 +65,7 @@ export default createRule<
         properties: {
           assertFunctionNames: {
             type: 'array',
-            items: [{ type: 'string' }],
+            items: { type: 'string' },
           },
           additionalTestBlockFunctions: {
             type: 'array',

src/rules/prefer-importing-jest-globals.ts

@@ -1,5 +1,6 @@
 import { AST_NODE_TYPES, type TSESTree } from '@typescript-eslint/utils';
 import {
+  type JestFnType,
   createRule,
   getAccessorValue,
   getSourceCode,
@@ -20,6 +21,15 @@ const createFixerImports = (
     : `const { ${allImportsFormatted} } = require('@jest/globals');`;
 };
 
+const allJestFnTypes: JestFnType[] = [
+  'hook',
+  'describe',
+  'test',
+  'expect',
+  'jest',
+  'unknown',
+];
+
 export default createRule({
   name: __filename,
   meta: {
@@ -31,10 +41,25 @@ export default createRule({
     },
     fixable: 'code',
     type: 'problem',
-    schema: [],
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          types: {
+            type: 'array',
+            items: {
+              type: 'string',
+              enum: allJestFnTypes,
+            },
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
   },
-  defaultOptions: [],
+  defaultOptions: [{ types: allJestFnTypes }],
   create(context) {
+    const { types = allJestFnTypes } = context.options[0] || {};
     const importedFunctionsWithSource: Record<string, string> = {};
     const functionsToImport = new Set<string>();
     let reportingNode: TSESTree.Node;
@@ -55,7 +80,10 @@ export default createRule({
           return;
         }
 
-        if (jestFnCall.head.type !== 'import') {
+        if (
+          jestFnCall.head.type !== 'import' &&
+          types.includes(jestFnCall.type)
+        ) {
           functionsToImport.add(jestFnCall.name);
           reportingNode ||= jestFnCall.head.node;
         }