chore(release): move getCommitsRelevantToProjects calculation and cache to release-graph

batusai513 · batusai513 · commit 520ba429c827 · 2025-12-21T10:35:12.000+01:00
diff --git a/packages/nx/src/command-line/release/utils/git.ts b/packages/nx/src/command-line/release/utils/git.ts
@@ -153,9 +153,8 @@ export class RepoGitTags {
   async resolveTags(
     checkAllBranchesWhen?: GetLatestGitTagForPatternOptions['checkAllBranchesWhen']
   ) {
-    const alwaysCheckAllBranches = await this.#alwaysCheckAllBranches(
-      checkAllBranchesWhen
-    );
+    const alwaysCheckAllBranches =
+      await this.#alwaysCheckAllBranches(checkAllBranchesWhen);
 
     let tags = this.#tagsMap.get(alwaysCheckAllBranches);
     if (!tags) {
diff --git a/packages/nx/src/command-line/release/utils/release-graph.ts b/packages/nx/src/command-line/release/utils/release-graph.ts
@@ -6,13 +6,16 @@ import type {
   ProjectGraph,
   ProjectGraphProjectNode,
 } from '../../../config/project-graph';
+import { NxArgs } from '../../../utils/command-line-utils';
 import type { Tree } from '../../../generators/tree';
 import {
   IMPLICIT_DEFAULT_RELEASE_GROUP,
   type NxReleaseConfig,
 } from '../config/config';
 import type { ReleaseGroupWithName } from '../config/filter-release-groups';
 import { ProjectLogger } from '../version/project-logger';
+import { calculateFileChanges } from '../../../project-graph/file-utils';
+import { filterAffected } from '../../../project-graph/affected/affected-project-graph';
 import { resolveCurrentVersion } from '../version/resolve-current-version';
 import { topologicalSort } from '../version/topological-sort';
 import {
@@ -21,7 +24,11 @@ import {
   type AfterAllProjectsVersioned,
   type VersionActions,
 } from '../version/version-actions';
-import { getLatestGitTagForPattern, sanitizeProjectNameForGitTag } from './git';
+import {
+  getLatestGitTagForPattern,
+  GitCommit,
+  sanitizeProjectNameForGitTag,
+} from './git';
 import { shouldSkipVersionActions, type VersionDataEntry } from './shared';
 
 /**
@@ -124,6 +131,13 @@ export class ReleaseGraph {
   >();
   private originalFilteredProjects = new Set<string>();
 
+  /**
+   * Store the affected graph per commit per project
+   * to avoid recomputation of the graph on workspace
+   * with multiple projects
+   */
+  private affectedGraphPerCommit = new Map<string, ProjectGraph>();
+
   /**
    * User-friendly log describing what the filter matched.
    * Null if no filters were applied.
@@ -982,6 +996,32 @@ Valid values are: ${validReleaseVersionPrefixes
     return this.allProjectsToProcess.has(projectName);
   }
 
+  async resolveAffectedFilesPerCommitInProjectGraph(
+    commit: GitCommit,
+    projectGraph: ProjectGraph
+  ) {
+    // Try to get the graph associated with the commit shortHash
+    // if not available, calculate it and store it in the cache
+    const { shortHash } = commit;
+    let affectedGraph = this.affectedGraphPerCommit.get(shortHash);
+
+    if (affectedGraph) {
+      return affectedGraph;
+    }
+
+    // Convert affectedFiles to FileChange[] format with proper diff computation
+    const touchedFiles = calculateFileChanges(commit.affectedFiles, {
+      base: `${commit.shortHash}^`,
+      head: commit.shortHash,
+    } as NxArgs);
+
+    // Use the same affected detection logic as `nx affected`
+    affectedGraph = await filterAffected(projectGraph, touchedFiles);
+    this.affectedGraphPerCommit.set(shortHash, affectedGraph);
+
+    return affectedGraph;
+  }
+
   /**
    * Runs validation on resolved VersionActions instances. E.g. check that manifest files exist for all projects that will be processed.
    * This should be called after preVersionCommand has run, as those commands may create manifest files that are needed for versioning.
diff --git a/packages/nx/src/command-line/release/utils/resolve-semver-specifier.ts b/packages/nx/src/command-line/release/utils/resolve-semver-specifier.ts
@@ -4,14 +4,16 @@ import { ProjectGraph } from '../../../config/project-graph';
 import { NxReleaseConfig } from '../config/config';
 import { SemverBumpType } from '../version/version-actions';
 import { getGitDiff, parseCommits } from './git';
+import { ReleaseGraph } from './release-graph';
 import { determineSemverChange, SemverSpecifier } from './semver';
 import { getCommitsRelevantToProjects } from './shared';
 
 export async function resolveSemverSpecifierFromConventionalCommits(
   from: string,
   projectGraph: ProjectGraph,
   projectNames: string[],
-  releaseConfig: NxReleaseConfig
+  releaseConfig: NxReleaseConfig,
+  releaseGraph: ReleaseGraph
 ): // Map of projectName to semver bump type
 Promise<Map<string, SemverSpecifier | null>> {
   const commits = await getGitDiff(from);
@@ -20,7 +22,8 @@ Promise<Map<string, SemverSpecifier | null>> {
     projectGraph,
     parsedCommits,
     projectNames,
-    releaseConfig
+    releaseConfig,
+    releaseGraph
   );
   return determineSemverChange(
     relevantCommits,
diff --git a/packages/nx/src/command-line/release/utils/shared.spec.ts b/packages/nx/src/command-line/release/utils/shared.spec.ts
@@ -7,6 +7,10 @@ import {
 import { ProjectGraph } from '../../../config/project-graph';
 import { GitCommit } from './git';
 import { readNxJson } from '../../../config/nx-json';
+import { ReleaseGraph } from './release-graph';
+import { filterAffected } from '../../../project-graph/affected/affected-project-graph';
+import { calculateFileChanges } from '../../../project-graph/file-utils';
+import { NxArgs } from '../../../utils/command-line-utils';
 
 jest.mock('../../../config/nx-json', () => ({
   ...jest.requireActual('../../../config/nx-json'),
@@ -661,6 +665,7 @@ describe('shared', () => {
   describe(`getCommitsRelevantToProjects()`, () => {
     let mockProjectGraph: ProjectGraph;
     let mockReleaseConfig: NxReleaseConfig | null;
+    let mockReleaseGraph: ReleaseGraph;
 
     beforeEach(async () => {
       (readNxJson as jest.Mock).mockReturnValue({});
@@ -729,6 +734,19 @@ describe('shared', () => {
           },
         }
       ));
+
+      // Create a mock ReleaseGraph with the required method
+      mockReleaseGraph = {
+        resolveAffectedFilesPerCommitInProjectGraph: jest.fn(
+          async (commit: GitCommit, projectGraph: ProjectGraph) => {
+            const touchedFiles = calculateFileChanges(commit.affectedFiles, {
+              base: `${commit.shortHash}^`,
+              head: commit.shortHash,
+            } as NxArgs);
+            return filterAffected(projectGraph, touchedFiles);
+          }
+        ),
+      } as unknown as ReleaseGraph;
     });
 
     it('should include commits that directly touch target projects', async () => {
@@ -742,7 +760,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a', 'lib-b'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.size).toBe(2);
@@ -763,7 +782,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       // Both commits should be included - nx.json affects all, and lib-a is directly touched
@@ -784,7 +804,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.size).toBe(1);
@@ -811,7 +832,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       // lib-a depends on lib-c, so commit touching lib-c should affect lib-a
@@ -833,7 +855,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.size).toBe(1);
@@ -853,7 +876,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a', 'lib-b'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       // Same commit should appear for both projects
@@ -871,7 +895,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a', 'lib-b'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       // Global file should appear for all requested projects
@@ -891,7 +916,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a', 'lib-b'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.has('lib-a')).toBe(false);
@@ -904,7 +930,8 @@ describe('shared', () => {
         mockProjectGraph,
         [],
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.size).toBe(0);
@@ -919,7 +946,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         [],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.size).toBe(0);
@@ -935,7 +963,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       // Lock file changes typically affect all or many projects
@@ -952,7 +981,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       // package.json changes typically affect projects
@@ -977,7 +1007,8 @@ describe('shared', () => {
         mockProjectGraph,
         commits,
         ['lib-a'],
-        mockReleaseConfig!
+        mockReleaseConfig!,
+        mockReleaseGraph
       );
 
       expect(result.size).toBe(0);
diff --git a/packages/nx/src/command-line/release/utils/shared.ts b/packages/nx/src/command-line/release/utils/shared.ts
@@ -2,23 +2,19 @@ import * as chalk from 'chalk';
 import { prerelease } from 'semver';
 import { ProjectGraph } from '../../../config/project-graph';
 import { filterAffected } from '../../../project-graph/affected/affected-project-graph';
-import {
-  calculateFileChanges,
-  Change,
-  DeletedFileChange,
-  WholeFileChange,
-} from '../../../project-graph/file-utils';
+import { calculateFileChanges } from '../../../project-graph/file-utils';
 import { interpolate } from '../../../tasks-runner/utils';
 import type { NxArgs } from '../../../utils/command-line-utils';
 import { output } from '../../../utils/output';
+import { NxReleaseConfig } from '../config/config';
 import type { ReleaseGroupWithName } from '../config/filter-release-groups';
 import {
-  GitCommit,
   gitAdd,
+  GitCommit,
   gitCommit,
   sanitizeProjectNameForGitTag,
 } from './git';
-import { NxReleaseConfig } from '../config/config';
+import { ReleaseGraph } from './release-graph';
 
 export const noDiffInChangelogMessage = chalk.yellow(
   `NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`
@@ -432,28 +428,12 @@ function isAutomatedReleaseCommit(
   return false;
 }
 
-/**
- * Store the affected graph per commit per project
- * to avoid recomputation of the graph on workspace
- * with multiple projects
- */
-const affectedGraphPerCommit = new Map<string, ProjectGraph>();
-
-/**
- * Clear the affected graph cache. Should be called after each release operation
- * to prevent memory leaks in long-running processes.
- *
- * @internal
- */
-export function clearAffectedGraphCache(): void {
-  affectedGraphPerCommit.clear();
-}
-
 export async function getCommitsRelevantToProjects(
   projectGraph: ProjectGraph,
   commits: GitCommit[],
   projects: string[],
-  nxReleaseConfig: NxReleaseConfig
+  nxReleaseConfig: NxReleaseConfig,
+  releaseGraph: ReleaseGraph
 ): // Map of projectName to GitCommit[]
 Promise<Map<string, { commit: GitCommit; isProjectScopedCommit: boolean }[]>> {
   const projectSet = new Set(projects);
@@ -470,20 +450,11 @@ Promise<Map<string, { commit: GitCommit; isProjectScopedCommit: boolean }[]>> {
 
     // Try to get the graph associated with the commit shortHash
     // if not available, calculate it and store it in the cache
-    const { shortHash } = commit;
-    let affectedGraph = affectedGraphPerCommit.get(shortHash);
-
-    if (!affectedGraph) {
-      // Convert affectedFiles to FileChange[] format with proper diff computation
-      const touchedFiles = calculateFileChanges(commit.affectedFiles, {
-        base: `${commit.shortHash}^`,
-        head: commit.shortHash,
-      } as NxArgs);
-
-      // Use the same affected detection logic as `nx affected`
-      affectedGraph = await filterAffected(projectGraph, touchedFiles);
-      affectedGraphPerCommit.set(shortHash, affectedGraph);
-    }
+    let affectedGraph =
+      await releaseGraph.resolveAffectedFilesPerCommitInProjectGraph(
+        commit,
+        projectGraph
+      );
 
     for (const projectName of Object.keys(affectedGraph.nodes)) {
       if (projectSet.has(projectName)) {
diff --git a/packages/nx/src/command-line/release/version.ts b/packages/nx/src/command-line/release/version.ts
@@ -33,7 +33,6 @@ import { ReleaseGraph, createReleaseGraph } from './utils/release-graph';
 import { resolveNxJsonConfigErrorMessage } from './utils/resolve-nx-json-error-message';
 import {
   VersionData,
-  clearAffectedGraphCache,
   commitChanges,
   createCommitMessageValues,
   createGitTagValues,
@@ -262,8 +261,6 @@ export function createAPI(
       processor.flushAllProjectLoggers();
       // Bubble up the error so that the CLI can print the error and exit, or the programmatic API can handle it
       throw err;
-    } finally {
-      clearAffectedGraphCache();
     }
 
     /**
diff --git a/packages/nx/src/command-line/release/version/derive-specifier-from-conventional-commits.ts b/packages/nx/src/command-line/release/version/derive-specifier-from-conventional-commits.ts
diff --git a/packages/nx/src/command-line/release/version/release-group-processor.ts b/packages/nx/src/command-line/release/version/release-group-processor.ts
