@storm-software/git-tools 2.131.29 → 2.131.32

package/bin/git.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-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 { postCheckoutHook } from './chunk-O5U4PY3Z.js';
+import { postCommitHook } from './chunk-SJQTSJGU.js';
+import { postMergeHook } from './chunk-3I7DR63M.js';
+import { preCommitHook } from './chunk-FC4WBB3T.js';
+import './chunk-3NC3GIM6.js';
+import { prePushHook } from './chunk-DDC7F5UZ.js';
 import './chunk-HBLWPOJV.js';
-import { prepareHook } from './chunk-Y7OK7243.js';
+import { prepareHook } from './chunk-EQ7Z3P24.js';
 import { run, runAsync } from './chunk-RPK5AKGK.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 { defu, getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, writeWarning, writeTrace, isVerbose, formatLogMessage, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-BPY6SBLC.js';
 import TOML from '@ltd/j-toml';
 import { Command } from 'commander';
 import '@inquirer/checkbox';
@@ -52,9 +52,9 @@ import { printAndFlushChanges as printAndFlushChanges$1 } from 'nx/src/command-l
 import { createGitTagValues, handleDuplicateGitTags, createCommitMessageValues, isPrerelease, shouldPreferDockerVersionForReleaseGroup, ReleaseVersion, noDiffInChangelogMessage, shouldSkipVersionActions } from 'nx/src/command-line/release/utils/shared';
 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, getFirstGitCommit, gitPush, gitAdd, extractTagAndVersion, getGitDiff, parseCommits, sanitizeProjectNameForGitTag } from 'nx/src/command-line/release/utils/git';
+import { getCommitHash, getFirstGitCommit, gitPush, gitAdd, parseCommits, getGitDiff, sanitizeProjectNameForGitTag, extractTagAndVersion } from 'nx/src/command-line/release/utils/git';
 import { interpolate } from 'nx/src/tasks-runner/utils.js';
-import semver, { prerelease, coerce, valid, gt, gte, major } from 'semver';
+import semver, { prerelease, coerce, gte, valid, gt, 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';
@@ -2648,8 +2648,7 @@ async function generateChangelogForProjects({
   return projectChangelogs;
 }
 async function getCommits(fromSHA, toSHA) {
-  const rawCommits = await getGitDiff(fromSHA, toSHA);
-  return parseCommits(rawCommits);
+  return parseCommits(await getGitDiff(fromSHA, toSHA));
 }
 async function filterProjectCommits({
   fromSHA,
@@ -2802,6 +2801,20 @@ async function commitChanges({
   });
 }
 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;
+function compareTags(tags, tagRegexp, options) {
+  return tags.reduce(
+    (ret, releaseTag) => {
+      const result = extractTagAndVersion(releaseTag, tagRegexp, options);
+      const version = coerce(result.extractedVersion)?.version;
+      const current = coerce(ret.extractedVersion)?.version;
+      if (version && valid(version) && (!current || !valid(current) || gt(version, current, { loose: true }))) {
+        return result;
+      }
+      return ret;
+    },
+    extractTagAndVersion(tags[0], tagRegexp, options)
+  );
+}
 async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, additionalInterpolationData = {}, resolveTags, options) {
   const { requireSemver, strictPreid, preid, checkAllBranchesWhen } = options;
   try {
@@ -2831,22 +2844,12 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
       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})`,
+      writeTrace(
+        `Not using strict preid, will use the greatest matching tag of project "${additionalInterpolationData.projectName}": 
+${matchingTags.join(", ")}`,
         workspaceConfig
       );
-      return matchingTags.reduce(
-        (ret, releaseTag) => {
-          const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-          const version = coerce(result.extractedVersion)?.version;
-          const current = coerce(ret.extractedVersion)?.version;
-          if (version && valid(version) && (!current || !valid(current) || gt(version, current, { loose: true }))) {
-            return result;
-          }
-          return ret;
-        },
-        extractTagAndVersion(matchingTags[0], tagRegexp, options)
-      );
+      return compareTags(matchingTags, tagRegexp, options);
     }
     const stableReleaseTags = matchingTags.filter((tag) => {
       const matches = tag.match(tagRegexp);
@@ -2870,34 +2873,8 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
         workspaceConfig
       );
       if (preidReleaseTags.length > 0 && stableReleaseTags.length > 0) {
-        const preidResult = preidReleaseTags.reduce(
-          (ret, releaseTag) => {
-            const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-            const version = coerce(result.extractedVersion)?.version;
-            const current = coerce(ret.extractedVersion)?.version;
-            if (version && valid(version) && (!current || !valid(current) || gt(version, current, {
-              loose: true
-            }))) {
-              return result;
-            }
-            return ret;
-          },
-          extractTagAndVersion(preidReleaseTags[0], tagRegexp, options)
-        );
-        const stableResult = stableReleaseTags.reduce(
-          (ret, releaseTag) => {
-            const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-            const version = coerce(result.extractedVersion)?.version;
-            const current = coerce(ret.extractedVersion)?.version;
-            if (version && valid(version) && (!current || !valid(current) || gt(version, current, {
-              loose: true
-            }))) {
-              return result;
-            }
-            return ret;
-          },
-          extractTagAndVersion(stableReleaseTags[0], tagRegexp, options)
-        );
+        const preidResult = compareTags(preidReleaseTags, tagRegexp, options);
+        const stableResult = compareTags(stableReleaseTags, tagRegexp, options);
         const preidBaseVersion = coerce(preidResult.extractedVersion)?.version;
         const stableVersion = coerce(stableResult.extractedVersion)?.version;
         writeDebug(
@@ -2918,20 +2895,7 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
           `Using latest preid tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
           workspaceConfig
         );
-        return preidReleaseTags.reduce(
-          (ret, releaseTag) => {
-            const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-            const version = coerce(result.extractedVersion)?.version;
-            const current = coerce(ret.extractedVersion)?.version;
-            if (version && valid(version) && (!current || !valid(current) || gt(version, current, {
-              loose: true
-            }))) {
-              return result;
-            }
-            return ret;
-          },
-          extractTagAndVersion(preidReleaseTags[0], tagRegexp, options)
-        );
+        return compareTags(preidReleaseTags, tagRegexp, options);
       }
     }
     if (stableReleaseTags.length > 0) {
@@ -2939,18 +2903,7 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
         `Using latest stable tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
         workspaceConfig
       );
-      return stableReleaseTags.reduce(
-        (ret, releaseTag) => {
-          const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-          const version = coerce(result.extractedVersion)?.version;
-          const current = coerce(ret.extractedVersion)?.version;
-          if (version && valid(version) && (!current || !valid(current) || gt(version, current, { loose: true }))) {
-            return result;
-          }
-          return ret;
-        },
-        extractTagAndVersion(stableReleaseTags[0], tagRegexp, options)
-      );
+      return compareTags(stableReleaseTags, tagRegexp, options);
     }
     return null;
   } catch {