chore(release): moved the git tags logic into it's own file

- move the instance into release-graph class
- pass resolveGitTags as params

Author: batusai513

packages/nx/src/command-line/release/changelog.ts

@@ -1,15 +1,11 @@
 import * as chalk from 'chalk';
 import { prompt } from 'enquirer';
 import { readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { ReleaseType, prerelease } from 'semver';
+import { prerelease } from 'semver';
 import { dirSync } from 'tmp';
 import type { DependencyBump } from '../../../release/changelog-renderer';
 import { NxReleaseConfiguration, readNxJson } from '../../config/nx-json';
-import {
-  FileData,
-  ProjectFileMap,
-  ProjectGraphProjectNode,
-} from '../../config/project-graph';
+import { ProjectGraphProjectNode } from '../../config/project-graph';
 import { FsTree, Tree } from '../../generators/tree';
 import {
   createFileMapUsingProjectGraph,
@@ -22,6 +18,22 @@ import { isCI } from '../../utils/is-ci';
 import { output } from '../../utils/output';
 import { joinPathFragments } from '../../utils/path';
 import { workspaceRoot } from '../../utils/workspace-root';
+import {
+  createChangesFromCommits,
+  createFileToProjectMap,
+  filterHiddenChanges,
+  mapCommitToChange,
+} from './changelog/commit-utils';
+import {
+  filterVersionPlansByCommitRange,
+  resolveChangelogFromSHA,
+  resolveWorkspaceChangelogFromSHA,
+} from './changelog/version-plan-filtering';
+import {
+  ChangelogChange,
+  createChangesFromGroupVersionPlans,
+  createChangesFromProjectsVersionPlans,
+} from './changelog/version-plan-utils';
 import { ChangelogOptions } from './command-object';
 import {
   NxReleaseConfig,
@@ -39,11 +51,8 @@ import {
 } from './config/version-plans';
 import {
   GitCommit,
-  Reference,
   getCommitHash,
-  getFirstGitCommit,
   getGitDiff,
-  getLatestGitTagForPattern,
   gitAdd,
   gitPush,
   gitTag,
@@ -55,6 +64,7 @@ import { printAndFlushChanges } from './utils/print-changes';
 import { printConfigAndExit } from './utils/print-config';
 import { ReleaseGraph, createReleaseGraph } from './utils/release-graph';
 import { createRemoteReleaseClient } from './utils/remote-release-clients/remote-release-client';
+import type { CheckAllBranchesWhen } from './utils/repository-git-tags';
 import { resolveChangelogRenderer } from './utils/resolve-changelog-renderer';
 import { resolveNxJsonConfigErrorMessage } from './utils/resolve-nx-json-error-message';
 import {
@@ -72,22 +82,6 @@ import {
   areAllVersionPlanProjectsFiltered,
   validateResolvedVersionPlansAgainstFilter,
 } from './utils/version-plan-utils';
-import {
-  ChangelogChange,
-  createChangesFromGroupVersionPlans,
-  createChangesFromProjectsVersionPlans,
-} from './changelog/version-plan-utils';
-import {
-  createChangesFromCommits,
-  createFileToProjectMap,
-  filterHiddenChanges,
-  mapCommitToChange,
-} from './changelog/commit-utils';
-import {
-  filterVersionPlansByCommitRange,
-  resolveWorkspaceChangelogFromSHA,
-  resolveChangelogFromSHA,
-} from './changelog/version-plan-filtering';
 
 export interface NxReleaseChangelogResult {
   workspaceChangelog?: {
@@ -244,6 +238,7 @@ export function createAPI(
       args,
       nxReleaseConfig,
       useAutomaticFromRef,
+      resolveRepositoryTags: releaseGraph.resolveRepositoryTags,
     });
 
     // Filter version plans based on resolveVersionPlans option
@@ -372,7 +367,7 @@ export function createAPI(
       pattern: string,
       templateValues: Record<string, string>,
       preid: string | undefined,
-      checkAllBranchesWhen: boolean | string[],
+      checkAllBranchesWhen: CheckAllBranchesWhen,
       requireSemver: boolean,
       strictPreid: boolean
     ): Promise<string | null> => {
@@ -383,6 +378,7 @@ export function createAPI(
         fromRef: args.from,
         tagPattern: pattern,
         tagPatternValues: templateValues,
+        resolveRepositoryTags: releaseGraph.resolveRepositoryTags,
         checkAllBranchesWhen,
         preid,
         requireSemver,

packages/nx/src/command-line/release/changelog/version-plan-filtering.spec.ts

@@ -22,6 +22,9 @@ describe('version-plan-filtering', () => {
   const mockGetLatestGitTagForPattern =
     gitUtils.getLatestGitTagForPattern as jest.Mock;
 
+  // Mock resolveRepositoryTags function for testing
+  const mockResolveRepositoryTags = jest.fn().mockResolvedValue([]);
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
@@ -145,6 +148,7 @@ describe('version-plan-filtering', () => {
           },
         } as any,
         useAutomaticFromRef: false,
+        resolveRepositoryTags: mockResolveRepositoryTags,
       });
 
       expect(mockGetCommitHash).toHaveBeenCalledWith('v1.0.0');
@@ -166,6 +170,7 @@ describe('version-plan-filtering', () => {
           },
         } as any,
         useAutomaticFromRef: false,
+        resolveRepositoryTags: mockResolveRepositoryTags,
       });
 
       expect(mockGetLatestGitTagForPattern).toHaveBeenCalled();
@@ -188,6 +193,7 @@ describe('version-plan-filtering', () => {
           },
         } as any,
         useAutomaticFromRef: true,
+        resolveRepositoryTags: mockResolveRepositoryTags,
       });
 
       expect(mockGetFirstGitCommit).toHaveBeenCalled();
@@ -208,6 +214,7 @@ describe('version-plan-filtering', () => {
           },
         } as any,
         useAutomaticFromRef: false,
+        resolveRepositoryTags: mockResolveRepositoryTags,
       });
 
       expect(result).toBeNull();
@@ -231,11 +238,13 @@ describe('version-plan-filtering', () => {
           },
         } as any,
         useAutomaticFromRef: false,
+        resolveRepositoryTags: mockResolveRepositoryTags,
       });
 
       expect(mockGetLatestGitTagForPattern).toHaveBeenCalledWith(
         '{version}',
         {},
+        mockResolveRepositoryTags,
         expect.objectContaining({
           preid: 'beta',
         })
@@ -274,11 +283,13 @@ describe('version-plan-filtering', () => {
           },
         } as any,
         useAutomaticFromRef: false,
+        resolveRepositoryTags: mockResolveRepositoryTags,
       });
 
       expect(mockGetLatestGitTagForPattern).toHaveBeenCalledWith(
         '{projectName}-v{version}',
         {},
+        mockResolveRepositoryTags,
         expect.objectContaining({
           preid: 'alpha',
         })

packages/nx/src/command-line/release/changelog/version-plan-filtering.ts

@@ -11,6 +11,10 @@ import {
   getLatestGitTagForPattern,
 } from '../utils/git';
 import type { VersionData } from '../utils/shared';
+import type {
+  CheckAllBranchesWhen,
+  RepoGitTags,
+} from '../utils/repository-git-tags';
 
 /**
  * Filters version plans to only include those that were committed between the specified SHAs
@@ -128,15 +132,17 @@ export async function resolveChangelogFromSHA({
   requireSemver,
   strictPreid,
   useAutomaticFromRef,
+  resolveRepositoryTags,
 }: {
   fromRef?: string;
   tagPattern: string;
   tagPatternValues: Record<string, string>;
-  checkAllBranchesWhen: boolean | string[];
+  checkAllBranchesWhen: CheckAllBranchesWhen;
   preid?: string;
   requireSemver: boolean;
   strictPreid: boolean;
   useAutomaticFromRef: boolean;
+  resolveRepositoryTags: RepoGitTags['resolveTags'];
 }): Promise<string | null> {
   // If user provided a from ref, resolve it to a SHA
   if (fromRef) {
@@ -146,6 +152,7 @@ export async function resolveChangelogFromSHA({
   const latestTag = await getLatestGitTagForPattern(
     tagPattern,
     tagPatternValues,
+    resolveRepositoryTags,
     {
       checkAllBranchesWhen,
       preid,
@@ -172,10 +179,12 @@ export async function resolveWorkspaceChangelogFromSHA({
   args,
   nxReleaseConfig,
   useAutomaticFromRef,
+  resolveRepositoryTags,
 }: {
   args: ChangelogOptions;
   nxReleaseConfig: NxReleaseConfig;
   useAutomaticFromRef: boolean;
+  resolveRepositoryTags: RepoGitTags['resolveTags'];
 }): Promise<string | null> {
   const workspacePreid = extractPreidFromVersion(args.version);
   const projectsPreid = extractProjectsPreidFromVersionData(args.versionData);
@@ -189,6 +198,7 @@ export async function resolveWorkspaceChangelogFromSHA({
     requireSemver: nxReleaseConfig.releaseTag.requireSemver,
     strictPreid: nxReleaseConfig.releaseTag.strictPreid,
     useAutomaticFromRef,
+    resolveRepositoryTags,
   });
 }
 

packages/nx/src/command-line/release/utils/git.spec.ts

@@ -1,9 +1,9 @@
 import {
   extractReferencesFromCommit,
   getLatestGitTagForPattern,
-  RepoGitTags,
   sanitizeProjectNameForGitTag,
 } from './git';
+import { RepoGitTags } from './repository-git-tags';
 
 jest.mock('./exec-command', () => ({
   execCommand: jest.fn(() =>
@@ -151,9 +151,12 @@ See merge request nx-release-test/nx-release-test!2`,
   });
 
   describe('getLatestGitTagForPattern', () => {
+    // Create a mock resolveTags function that uses the mocked execCommand
+    const mockRepoGitTags = RepoGitTags.create();
+    const mockResolveTags = mockRepoGitTags.resolveTags;
+
     afterEach(() => {
       jest.clearAllMocks();
-      RepoGitTags.instance.clean();
     });
 
     describe('when releaseTagPatternStrictPreid is false', () => {
@@ -352,6 +355,7 @@ See merge request nx-release-test/nx-release-test!2`,
               projectName,
               releaseGroupName,
             },
+            mockResolveTags,
             {
               requireSemver,
               preid: preid,
@@ -451,6 +455,7 @@ See merge request nx-release-test/nx-release-test!2`,
             {
               projectName,
             },
+            mockResolveTags,
             {
               preid: preid,
               requireSemver: true,
@@ -476,6 +481,7 @@ See merge request nx-release-test/nx-release-test!2`,
         {
           projectName: 'my-lib-1',
         },
+        mockResolveTags,
         {
           requireSemver: true,
           strictPreid: false,
@@ -490,6 +496,7 @@ See merge request nx-release-test/nx-release-test!2`,
         {
           projectName: 'my-lib-1',
         },
+        mockResolveTags,
         {
           requireSemver: true,
           strictPreid: false,