@nx/jest 20.5.0-beta.3 → 20.5.0-canary.20250128-e0c49d3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "20.5.0-beta.3",
+  "version": "20.5.0-canary.20250128-e0c49d3",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -37,8 +37,8 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "20.5.0-beta.3",
-    "@nx/js": "20.5.0-beta.3",
+    "@nx/devkit": "20.5.0-canary.20250128-e0c49d3",
+    "@nx/js": "20.5.0-canary.20250128-e0c49d3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^29.4.1",

package/src/executors/jest/jest.impl.d.ts

@@ -5,6 +5,6 @@ import type { BatchResults } from 'nx/src/tasks-runner/batch/batch-messages';
 export declare function jestExecutor(options: JestExecutorOptions, context: ExecutorContext): Promise<{
     success: boolean;
 }>;
-export declare function parseJestConfig(options: JestExecutorOptions, context: ExecutorContext, multiProjects?: boolean): Promise<Config.Argv>;
+export declare function jestConfigParser(options: JestExecutorOptions, context: ExecutorContext, multiProjects?: boolean): Promise<Config.Argv>;
 export default jestExecutor;
 export declare function batchJest(taskGraph: TaskGraph, inputs: Record<string, JestExecutorOptions>, overrides: JestExecutorOptions, context: ExecutorContext): Promise<BatchResults>;

package/src/executors/jest/jest.impl.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jestExecutor = jestExecutor;
-exports.parseJestConfig = parseJestConfig;
+exports.jestConfigParser = jestConfigParser;
 exports.batchJest = batchJest;
 const jest_1 = require("jest");
 const jest_config_1 = require("jest-config");
@@ -17,7 +17,7 @@ async function jestExecutor(options, context) {
     // Jest registers ts-node with module CJS https://github.com/SimenB/jest/blob/v29.6.4/packages/jest-config/src/readConfigFileAndSetRootDir.ts#L117-L119
     // We want to support of ESM via 'module':'nodenext', we need to override the resolution until Jest supports it.
     process.env.TS_NODE_COMPILER_OPTIONS ??= '{"moduleResolution":"node10"}';
-    const config = await parseJestConfig(options, context);
+    const config = await jestConfigParser(options, context);
     const { results } = await (0, jest_1.runCLI)(config, [options.jestConfig]);
     return { success: results.success };
 }
@@ -26,12 +26,11 @@ function getExtraArgs(options, schema) {
     for (const key of Object.keys(options)) {
         if (!schema.properties[key]) {
             extraArgs[key] = options[key];
-            process.argv.push(`--${key}=${options[key]}`);
         }
     }
     return extraArgs;
 }
-async function parseJestConfig(options, context, multiProjects = false) {
+async function jestConfigParser(options, context, multiProjects = false) {
     let jestConfig;
     // support passing extra args to jest cli supporting 3rd party plugins
     // like 'jest-runner-groups' --group arg
@@ -140,7 +139,7 @@ async function batchJest(taskGraph, inputs, overrides, context) {
       ${projectsWithNoName.map(([project, configPath]) => ` - ${project} - ${configPath}\r\n`)}
       You can learn more about this requirement from Jest here: https://jestjs.io/docs/cli#--selectprojects-project1--projectn`);
     }
-    const parsedConfigs = await parseJestConfig(overrides, context, true);
+    const parsedConfigs = await jestConfigParser(overrides, context, true);
     const { globalConfig, results } = await (0, jest_1.runCLI)({
         ...parsedConfigs,
         selectProjects: selectedProjects,

package/src/plugins/plugin.d.ts

@@ -7,7 +7,7 @@ export interface JestPluginOptions {
      */
     ciGroupName?: string;
     /**
-     *  Whether to use jest-config and jest-runtime are used to load Jest configuration and context.
+     *  Whether to use jest-config and jest-runtime to load Jest configuration and context.
      *  Disabling this is much faster but could be less correct since we are using our own config loader
      *  and test matcher instead of Jest's.
      */

package/src/plugins/plugin.js

@@ -31,36 +31,8 @@ exports.createNodesV2 = [
         const targetsCache = readTargetsCache(cachePath);
         // Cache jest preset(s) to avoid penalties of module load times. Most of jest configs will use the same preset.
         const presetCache = {};
-        const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
-        options = normalizeOptions(options);
-        const { roots: projectRoots, configFiles: validConfigFiles } = configFiles.reduce((acc, configFile) => {
-            const potentialRoot = (0, path_1.dirname)(configFile);
-            if (checkIfConfigFileShouldBeProject(configFile, potentialRoot, packageManagerWorkspacesGlob, context)) {
-                acc.roots.push(potentialRoot);
-                acc.configFiles.push(configFile);
-            }
-            return acc;
-        }, {
-            roots: [],
-            configFiles: [],
-        });
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, options, context);
         try {
-            return await (0, devkit_1.createNodesFromFiles)(async (configFilePath, options, context, idx) => {
-                const projectRoot = projectRoots[idx];
-                const hash = hashes[idx];
-                targetsCache[hash] ??= await buildJestTargets(configFilePath, projectRoot, options, context, presetCache);
-                const { targets, metadata } = targetsCache[hash];
-                return {
-                    projects: {
-                        [projectRoot]: {
-                            root: projectRoot,
-                            targets,
-                            metadata,
-                        },
-                    },
-                };
-            }, validConfigFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, presetCache), configFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -73,39 +45,26 @@ exports.createNodesV2 = [
  */
 exports.createNodes = [
     jestConfigGlob,
-    async (configFilePath, options, context) => {
+    (...args) => {
         devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
-        if (!checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageManagerWorkspacesGlob, context)) {
-            return {};
-        }
-        options = normalizeOptions(options);
-        const { targets, metadata } = await buildJestTargets(configFilePath, projectRoot, options, context, {});
-        return {
-            projects: {
-                [projectRoot]: {
-                    root: projectRoot,
-                    targets,
-                    metadata,
-                },
-            },
-        };
+        return createNodesInternal(...args, {}, {});
     },
 ];
-function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageManagerWorkspacesGlob, context) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, presetCache) {
+    const projectRoot = (0, path_1.dirname)(configFilePath);
+    const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
     if (!siblingFiles.includes('package.json') &&
         !siblingFiles.includes('project.json')) {
-        return false;
+        return {};
     }
     else if (!siblingFiles.includes('project.json') &&
         siblingFiles.includes('package.json')) {
         const path = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
         const isPackageJsonProject = (0, minimatch_1.minimatch)(path, packageManagerWorkspacesGlob);
         if (!isPackageJsonProject) {
-            return false;
+            return {};
         }
     }
     const jestConfigContent = (0, fs_1.readFileSync)((0, path_1.resolve)(context.workspaceRoot, configFilePath), 'utf-8');
@@ -113,9 +72,21 @@ function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageMa
         // The `getJestProjectsAsync` function uses the project graph, which leads to a
         // circular dependency. We can skip this since it's no intended to be used for
         // an Nx project.
-        return false;
+        return {};
     }
-    return true;
+    options = normalizeOptions(options);
+    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context);
+    targetsCache[hash] ??= await buildJestTargets(configFilePath, projectRoot, options, context, presetCache);
+    const { targets, metadata } = targetsCache[hash];
+    return {
+        projects: {
+            [projectRoot]: {
+                root: projectRoot,
+                targets,
+                metadata,
+            },
+        },
+    };
 }
 async function buildJestTargets(configFilePath, projectRoot, options, context, presetCache) {
     const absConfigFilePath = (0, path_1.resolve)(context.workspaceRoot, configFilePath);
@@ -145,13 +116,11 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
             },
         },
     });
-    // Not normalizing it here since also affects options for convert-to-inferred.
-    const disableJestRuntime = options.disableJestRuntime !== false;
     const cache = (target.cache = true);
-    const inputs = (target.inputs = getInputs(namedInputs, rawConfig.preset, projectRoot, context.workspaceRoot, disableJestRuntime));
+    const inputs = (target.inputs = getInputs(namedInputs, rawConfig.preset, projectRoot, context.workspaceRoot, options.disableJestRuntime));
     let metadata;
     const groupName = options?.ciGroupName ?? deductGroupNameFromTarget(options?.ciTargetName);
-    if (disableJestRuntime) {
+    if (options.disableJestRuntime) {
         const outputs = (target.outputs = getOutputs(projectRoot, rawConfig.coverageDirectory
             ? (0, path_1.join)(context.workspaceRoot, projectRoot, rawConfig.coverageDirectory)
             : undefined, undefined, context));
@@ -223,17 +192,10 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
     }
     else {
         const { readConfig } = requireJestUtil('jest-config', projectRoot, context.workspaceRoot);
-        let config;
-        try {
-            config = await readConfig({
-                _: [],
-                $0: undefined,
-            }, rawConfig, undefined, (0, path_1.dirname)(absConfigFilePath));
-        }
-        catch (e) {
-            console.error(e);
-            throw e;
-        }
+        const config = await readConfig({
+            _: [],
+            $0: undefined,
+        }, rawConfig, undefined, (0, path_1.dirname)(absConfigFilePath));
         const outputs = (target.outputs = getOutputs(projectRoot, config.globalConfig?.coverageDirectory, config.globalConfig?.outputFile, context));
         if (options?.ciTargetName) {
             // nx-ignore-next-line
@@ -246,7 +208,8 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
             const source = new jest.SearchSource(jestContext);
             const jestVersion = (0, version_utils_1.getInstalledJestMajorVersion)();
             const specs = jestVersion >= 30
-                ? await source.getTestPaths(config.globalConfig, config.projectConfig)
+                ? // @ts-expect-error Jest 30+ expects the project config as the second argument
+                    await source.getTestPaths(config.globalConfig, config.projectConfig)
                 : await source.getTestPaths(config.globalConfig);
             const testPaths = new Set(specs.tests.map(({ path }) => path));
             if (testPaths.size > 0) {
@@ -438,19 +401,32 @@ function requireJestUtil(packageName, projectRoot, workspaceRoot) {
 }
 async function getTestPaths(projectRoot, rawConfig, absConfigFilePath, context, presetCache) {
     const testMatch = await getJestOption(rawConfig, absConfigFilePath, 'testMatch', presetCache);
-    let paths = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, (testMatch || [
-        // Default copied from https://github.com/jestjs/jest/blob/d1a2ed7/packages/jest-config/src/Defaults.ts#L84
-        '**/__tests__/**/*.?([mc])[jt]s?(x)',
-        '**/?(*.)+(spec|test).?([mc])[jt]s?(x)',
-    ]).map((pattern) => (0, path_1.join)(projectRoot, pattern)), []);
-    const testRegex = await getJestOption(rawConfig, absConfigFilePath, 'testRegex', presetCache);
-    if (testRegex) {
-        const testRegexes = Array.isArray(rawConfig.testRegex)
-            ? rawConfig.testRegex.map((r) => new RegExp(r))
-            : [new RegExp(rawConfig.testRegex)];
-        paths = paths.filter((path) => testRegexes.some((r) => r.test(path)));
+    if (testMatch) {
+        return await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, testMatch.map((pattern) => (0, path_1.join)(projectRoot, pattern)), []);
+    }
+    else {
+        const testRegex = await getJestOption(rawConfig, absConfigFilePath, 'testRegex', presetCache);
+        if (testRegex) {
+            const files = [];
+            const testRegexes = Array.isArray(rawConfig.testRegex)
+                ? rawConfig.testRegex.map((r) => new RegExp(r))
+                : [new RegExp(rawConfig.testRegex)];
+            const projectFiles = await (0, workspace_context_1.getFilesInDirectoryUsingContext)(context.workspaceRoot, projectRoot);
+            for (const file of projectFiles) {
+                if (testRegexes.some((r) => r.test(file)))
+                    files.push(file);
+            }
+            return files;
+        }
+        else {
+            // Default copied from https://github.com/jestjs/jest/blob/d1a2ed7/packages/jest-config/src/Defaults.ts#L84
+            const defaultTestMatch = [
+                '**/__tests__/**/*.?([mc])[jt]s?(x)',
+                '**/?(*.)+(spec|test).?([mc])[jt]s?(x)',
+            ];
+            return await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, defaultTestMatch.map((pattern) => (0, path_1.join)(projectRoot, pattern)), []);
+        }
     }
-    return paths;
 }
 async function getJestOption(rawConfig, absConfigFilePath, optionName, presetCache) {
     if (rawConfig[optionName])