@storm-software/git-tools 2.131.22 → 2.131.24

package/bin/git.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-import { postCheckoutHook } from './chunk-WVG2JDAL.js';
-import { postCommitHook } from './chunk-NFY3U5Y5.js';
-import { postMergeHook } from './chunk-S2KYF4B5.js';
-import { preCommitHook } from './chunk-K3M4EFXG.js';
-import './chunk-2K6K4B6C.js';
-import { prePushHook } from './chunk-JZL474YC.js';
+import { postCheckoutHook } from './chunk-DOELUOOS.js';
+import { postCommitHook } from './chunk-3PI2VV32.js';
+import { postMergeHook } from './chunk-AX3PXQKJ.js';
+import { preCommitHook } from './chunk-4GZZR7XL.js';
+import './chunk-C6K3ZRT6.js';
+import { prePushHook } from './chunk-GPHBDU6A.js';
 import './chunk-HBLWPOJV.js';
-import { prepareHook } from './chunk-NPCKWTZG.js';
+import { prepareHook } from './chunk-Y7OK7243.js';
 import { run, runAsync } from './chunk-RPK5AKGK.js';
-import { defu, getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, isVerbose, writeWarning, writeTrace, formatLogMessage, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-RNHFC7RJ.js';
+import { defu, getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, writeWarning, writeTrace, isVerbose, formatLogMessage, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-3XAQUPZK.js';
 import TOML from '@ltd/j-toml';
 import { Command } from 'commander';
 import '@inquirer/checkbox';
@@ -50,10 +50,11 @@ import { parse } from 'yaml';
 import chalk from 'chalk';
 import { printAndFlushChanges as printAndFlushChanges$1 } from 'nx/src/command-line/release/utils/print-changes';
 import { createGitTagValues, handleDuplicateGitTags, createCommitMessageValues, isPrerelease, shouldPreferDockerVersionForReleaseGroup, ReleaseVersion, noDiffInChangelogMessage, shouldSkipVersionActions } from 'nx/src/command-line/release/utils/shared';
-import { interpolate } from 'nx/src/tasks-runner/utils';
+import { interpolate as interpolate$1 } from 'nx/src/tasks-runner/utils';
 import { execCommand } from 'nx/src/command-line/release/utils/exec-command.js';
-import { getCommitHash, getLatestGitTagForPattern, getFirstGitCommit, gitPush, gitAdd, getGitDiff, parseCommits, sanitizeProjectNameForGitTag } from 'nx/src/command-line/release/utils/git';
-import semver, { prerelease, major } from 'semver';
+import { getCommitHash, getFirstGitCommit, gitPush, gitAdd, extractTagAndVersion, getGitDiff, parseCommits, sanitizeProjectNameForGitTag } from 'nx/src/command-line/release/utils/git';
+import { interpolate } from 'nx/src/tasks-runner/utils.js';
+import semver, { prerelease, coerce, gte, major } from 'semver';
 import { ReleaseClient } from 'nx/release';
 import { readRawVersionPlans, setResolvedVersionPlansOnGroups } from 'nx/src/command-line/release/config/version-plans';
 import { printAndFlushChanges } from 'nx/src/command-line/release/utils/print-changes.js';
@@ -73,7 +74,7 @@ import { topologicalSort } from 'nx/src/command-line/release/version/topological
 import { resolveVersionActionsForProject, NOOP_VERSION_ACTIONS as NOOP_VERSION_ACTIONS$1 } from 'nx/src/command-line/release/version/version-actions';
 import { filterAffected } from 'nx/src/project-graph/affected/affected-project-graph';
 import { calculateFileChanges } from 'nx/src/project-graph/file-utils';
-import gte from 'semver/functions/gte';
+import gte2 from 'semver/functions/gte';
 import { IMPLICIT_DEFAULT_RELEASE_GROUP as IMPLICIT_DEFAULT_RELEASE_GROUP$1 } from 'nx/src/command-line/release/config/config.js';
 import { deriveSpecifierFromConventionalCommits } from 'nx/src/command-line/release/version/derive-specifier-from-conventional-commits';
 import { deriveSpecifierFromVersionPlan } from 'nx/src/command-line/release/version/deriver-specifier-from-version-plans';
@@ -2550,7 +2551,7 @@ async function generateChangelogForProjects({
   for (const project of projects) {
     let interpolatedTreePath = config5.file || "";
     if (interpolatedTreePath) {
-      interpolatedTreePath = interpolate(interpolatedTreePath, {
+      interpolatedTreePath = interpolate$1(interpolatedTreePath, {
         projectName: project.name,
         projectRoot: project.data.root,
         workspaceRoot: ""
@@ -2578,7 +2579,7 @@ async function generateChangelogForProjects({
       changes,
       changelogEntryVersion: releaseVersion.rawVersion,
       project: project.name,
-      entryWhenNoChanges: typeof config5.entryWhenNoChanges === "string" ? interpolate(config5.entryWhenNoChanges, {
+      entryWhenNoChanges: typeof config5.entryWhenNoChanges === "string" ? interpolate$1(config5.entryWhenNoChanges, {
         projectName: project.name,
         projectRoot: project.data.root,
         workspaceRoot: ""
@@ -2800,6 +2801,109 @@ async function commitChanges({
     verbose: isVerbose2
   });
 }
+var SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/g;
+async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, additionalInterpolationData = {}, resolveTags, options) {
+  const { requireSemver, strictPreid, preid, checkAllBranchesWhen } = options;
+  try {
+    const tags = await resolveTags(checkAllBranchesWhen);
+    if (!tags.length) {
+      return null;
+    }
+    const interpolatedTagPattern = interpolate(releaseTagPattern, {
+      version: "%v%",
+      projectName: "%p%",
+      releaseGroupName: "%rg%",
+      ...additionalInterpolationData
+    });
+    const tagRegexp = `^${interpolatedTagPattern.replace(/[/\-\\^$*+?.()|[\]{}]/g, "\\$&").replace("%v%", "(.+)").replace("%p%", "(.+)").replace("%rg%", "(.+)")}`;
+    const matchingTags = tags.filter((tag) => {
+      if (requireSemver) {
+        return !!tag.match(tagRegexp) && tag.match(tagRegexp).some((r) => r.match(SEMVER_REGEX));
+      } else {
+        return !!tag.match(tagRegexp);
+      }
+    });
+    if (!matchingTags.length) {
+      return null;
+    }
+    writeDebug(
+      `Found ${matchingTags.length} matching tags out of ${tags.length} total tags for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+      workspaceConfig
+    );
+    if (!strictPreid) {
+      writeDebug(
+        `Not using strict preid, will use the first matching tag ${matchingTags[0]} for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+        workspaceConfig
+      );
+      return extractTagAndVersion(matchingTags[0], tagRegexp, options);
+    }
+    const stableReleaseTags = matchingTags.filter((tag) => {
+      const matches = tag.match(tagRegexp);
+      if (!matches) return false;
+      const [, version] = matches;
+      return version && !isPrerelease(version);
+    });
+    writeDebug(
+      `Found ${stableReleaseTags.length} stable tags for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+      workspaceConfig
+    );
+    if (preid && preid.length > 0) {
+      const preidReleaseTags = matchingTags.filter((tag) => {
+        const match = tag.match(tagRegexp);
+        if (!match) return false;
+        const version = match.find((part) => part.match(SEMVER_REGEX));
+        return version && version.includes(`-${preid}.`);
+      });
+      writeDebug(
+        `Found ${preidReleaseTags.length} preid tags for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+        workspaceConfig
+      );
+      if (preidReleaseTags.length > 0 && stableReleaseTags.length > 0) {
+        const preidResult = extractTagAndVersion(
+          preidReleaseTags[0],
+          tagRegexp,
+          options
+        );
+        const stableResult = extractTagAndVersion(
+          stableReleaseTags[0],
+          tagRegexp,
+          options
+        );
+        writeDebug(
+          `Extracted preid version: ${preidResult.extractedVersion} and stable version: ${stableResult.extractedVersion} for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+          workspaceConfig
+        );
+        const preidBaseVersion = coerce(preidResult.extractedVersion)?.version;
+        const stableVersion = stableResult.extractedVersion;
+        if (preidBaseVersion && stableVersion && gte(stableVersion, preidBaseVersion)) {
+          writeDebug(
+            `Using latest stable tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern}) because its version (${stableVersion}) is greater than or equal to the base version of the latest preid tag (${preidBaseVersion})`,
+            workspaceConfig
+          );
+          return stableResult;
+        }
+        return preidResult;
+      }
+      if (preidReleaseTags.length > 0) {
+        writeDebug(
+          `Using latest preid tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+          workspaceConfig
+        );
+        return extractTagAndVersion(preidReleaseTags[0], tagRegexp, options);
+      }
+    }
+    if (stableReleaseTags.length > 0) {
+      writeDebug(
+        `Using latest stable tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+        workspaceConfig
+      );
+      return extractTagAndVersion(stableReleaseTags[0], tagRegexp, options);
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 
 // src/utilities/omit.ts
 function omit(obj, keys) {
@@ -3357,7 +3461,9 @@ var DEFAULT_RELEASE_GROUP_CONFIG = {
     ...DEFAULT_VERSION_RELEASE_CONFIG
   },
   releaseTag: {
-    preferDockerVersion: false
+    checkAllBranchesWhen: true,
+    preferDockerVersion: false,
+    strictPreid: true
   },
   versionPlans: false
 };
@@ -3580,21 +3686,10 @@ function getReleaseConfig(projectGraph, releaseConfig, workspaceConfig, ignoreNx
   };
 }
 function formatConfigLog(config5) {
-  return formatLogMessage(
-    {
-      ...omit(config5, ["groups"]),
-      groups: Object.fromEntries(
-        Object.entries(config5.groups ?? {}).map(([name, group]) => [
-          name,
-          {
-            ...omit(group, ["projects"]),
-            projects: group.projects.length ? group.projects : "No projects"
-          }
-        ])
-      )
-    },
-    { sort: true, skip: ["workspaceConfig"] }
-  );
+  return formatLogMessage(config5, {
+    sort: true,
+    skip: ["workspaceConfig", "conventionalCommits"]
+  });
 }
 var validReleaseVersionPrefixes = ["auto", "", "~", "^", "="];
 var ReleaseGraph = class _ReleaseGraph {
@@ -3988,6 +4083,7 @@ var ReleaseGraph = class _ReleaseGraph {
           };
           if (releaseGroupNode.group.projectsRelationship === "fixed" && !releaseTagPattern.includes("{projectName}")) {
             const groupReleaseTag = await getLatestGitTagForPattern(
+              this.workspaceConfig,
               releaseTagPattern,
               additionalInterpolationData,
               this.resolveRepositoryTags.bind(this),
@@ -3997,6 +4093,7 @@ var ReleaseGraph = class _ReleaseGraph {
               "{releaseGroupName}"
             ) ? releaseTagPattern.replace("{releaseGroupName}", "{projectName}") : `{projectName}@${releaseTagPattern}`;
             const projectReleaseTag = await getLatestGitTagForPattern(
+              this.workspaceConfig,
               projectReleaseTagPattern,
               additionalInterpolationData,
               this.resolveRepositoryTags.bind(this),
@@ -4009,7 +4106,7 @@ Group release tag: ${groupReleaseTag?.tag}
 Project release tag: ${projectReleaseTag?.tag}`,
               this.workspaceConfig
             );
-            if (projectReleaseTag?.extractedVersion && groupReleaseTag?.extractedVersion && gte(
+            if (projectReleaseTag?.extractedVersion && groupReleaseTag?.extractedVersion && gte2(
               projectReleaseTag.extractedVersion,
               groupReleaseTag.extractedVersion
             )) {
@@ -4019,6 +4116,7 @@ Project release tag: ${projectReleaseTag?.tag}`,
             }
           } else {
             latestMatchingGitTag = await getLatestGitTagForPattern(
+              this.workspaceConfig,
               releaseTagPattern,
               additionalInterpolationData,
               this.resolveRepositoryTags.bind(this),
@@ -5150,6 +5248,7 @@ ${formatConfigLog(config5)}`,
         for (const project of projectNodes) {
           let changes = null;
           let fromRef = options.from || (await getLatestGitTagForPattern(
+            this.workspaceConfig,
             releaseGroup.releaseTag.pattern,
             {
               projectName: project.name,
@@ -5245,6 +5344,7 @@ ${formatConfigLog(config5)}`,
       } else {
         let changes = [];
         let fromRef = options.from || (await getLatestGitTagForPattern(
+          this.workspaceConfig,
           releaseGroup.releaseTag.pattern,
           {
             releaseGroupName: releaseGroup.name
@@ -5762,7 +5862,7 @@ var runRelease = async (config5, {
   writeDebug("Determining the current release versions...", config5);
   const { workspaceVersion, projectsVersionData, releaseGraph } = await releaseClient.releaseVersion({
     dryRun,
-    verbose: isVerbose(config5.logLevel),
+    verbose: true,
     preid: config5.preid,
     stageChanges: true,
     gitCommit: false
@@ -5771,7 +5871,7 @@ var runRelease = async (config5, {
     version: releaseConfig?.projectsRelationship === "fixed" ? workspaceVersion : void 0,
     versionData: projectsVersionData,
     dryRun,
-    verbose: isVerbose(config5.logLevel),
+    verbose: true,
     to,
     from,
     releaseGraph
@@ -5796,7 +5896,7 @@ ${changedProjects.map((changedProject) => `  - ${changedProject}`).join("\n")}
       await updatePackageManifests(projectsVersionData, config5);
       const result = await releaseClient.releasePublish({
         dryRun,
-        verbose: isVerbose(config5.logLevel)
+        verbose: true
       });
       const failedProjects = Object.keys(result).filter(
         (key) => result[key]?.code && result[key]?.code > 0