@storm-software/git-tools 2.131.27 → 2.131.28

package/bin/git.js

@@ -54,7 +54,7 @@ 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 { interpolate } from 'nx/src/tasks-runner/utils.js';
-import semver, { prerelease, coerce, gte, valid, gt, major } from 'semver';
+import semver, { prerelease, coerce, valid, gt, 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';
@@ -2835,7 +2835,18 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
         `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);
+      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)
+      );
     }
     const stableReleaseTags = matchingTags.filter((tag) => {
       const matches = tag.match(tagRegexp);
@@ -2859,22 +2870,40 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
         workspaceConfig
       );
       if (preidReleaseTags.length > 0 && stableReleaseTags.length > 0) {
-        const preidResult = extractTagAndVersion(
-          preidReleaseTags[0],
-          tagRegexp,
-          options
+        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 = extractTagAndVersion(
-          stableReleaseTags[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 preidBaseVersion = coerce(preidResult.extractedVersion)?.version;
+        const stableVersion = coerce(stableResult.extractedVersion)?.version;
         writeDebug(
-          `Extracted preid version: ${preidResult.extractedVersion} and stable version: ${stableResult.extractedVersion} for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
+          `Extracted preid version: ${preidBaseVersion} and stable version: ${stableVersion} 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})`,
@@ -2892,7 +2921,11 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
         return preidReleaseTags.reduce(
           (ret, releaseTag) => {
             const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-            if (valid(result.extractedVersion) && gt(result.extractedVersion, ret.extractedVersion)) {
+            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;
@@ -2909,7 +2942,9 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
       return stableReleaseTags.reduce(
         (ret, releaseTag) => {
           const result = extractTagAndVersion(releaseTag, tagRegexp, options);
-          if (valid(result.extractedVersion) && gt(result.extractedVersion, ret.extractedVersion)) {
+          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;
@@ -3432,7 +3467,7 @@ var DEFAULT_CONVENTIONAL_COMMITS_CONFIG2 = {
 };
 var DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN = "{projectName}@{version}";
 var DEFAULT_FIXED_RELEASE_TAG_PATTERN = "{releaseGroupName}@{version}";
-var DEFAULT_COMMIT_MESSAGE = "release(monorepo): Publish v{version} release updates";
+var DEFAULT_COMMIT_MESSAGE = "release(monorepo): Publish release updates";
 var DEFAULT_RELEASE_GROUP_GIT_CONFIG = {
   commit: false,
   commitMessage: DEFAULT_COMMIT_MESSAGE,
@@ -3478,11 +3513,6 @@ var DEFAULT_RELEASE_GROUP_CONFIG = {
   version: {
     ...DEFAULT_VERSION_RELEASE_CONFIG
   },
-  releaseTag: {
-    checkAllBranchesWhen: true,
-    preferDockerVersion: false,
-    strictPreid: true
-  },
   versionPlans: false
 };
 var DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG = {
@@ -3550,8 +3580,7 @@ var DEFAULT_RELEASE_CONFIG = {
     projectChangelogs: true
   },
   releaseTag: {
-    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN,
-    preferDockerVersion: false
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN
   },
   version: {
     ...DEFAULT_VERSION_RELEASE_CONFIG
@@ -4141,8 +4170,8 @@ Project release tag: ${projectReleaseTag?.tag}`,
               options
             );
           }
-          writeDebug(
-            `Resolved latest matching git tag ${latestMatchingGitTag?.tag} (version: ${latestMatchingGitTag?.extractedVersion}) for project "${projectName}"`,
+          writeInfo(
+            `Resolved latest matching git tag for "${projectName}": ${latestMatchingGitTag?.tag} (version: ${latestMatchingGitTag?.extractedVersion})`,
             this.workspaceConfig
           );
           this.cachedLatestMatchingGitTag.set(