@storm-software/git-tools 2.131.26 → 2.131.27

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, 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';
@@ -958,10 +958,10 @@ async function lint(message, config5) {
       throw new Error(`Could not find rule implementation for ${name}`);
     }
     const executableRule = rule;
-    const [valid2, message2] = await executableRule(parsed, when, value);
+    const [valid3, message2] = await executableRule(parsed, when, value);
     return {
       level,
-      valid: valid2,
+      valid: valid3,
       name,
       message: message2
     };
@@ -975,9 +975,9 @@ async function lint(message, config5) {
   const warnings = results.filter(
     (result) => result.level === 1 /* Warning */ && !result.valid
   );
-  const valid = errors.length === 0;
+  const valid2 = errors.length === 0;
   return {
-    valid,
+    valid: valid2,
     errors,
     warnings,
     input: buildCommitMessage(parsed)
@@ -2889,7 +2889,16 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
           `Using latest preid tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
           workspaceConfig
         );
-        return extractTagAndVersion(preidReleaseTags[0], tagRegexp, options);
+        return preidReleaseTags.reduce(
+          (ret, releaseTag) => {
+            const result = extractTagAndVersion(releaseTag, tagRegexp, options);
+            if (valid(result.extractedVersion) && gt(result.extractedVersion, ret.extractedVersion)) {
+              return result;
+            }
+            return ret;
+          },
+          extractTagAndVersion(preidReleaseTags[0], tagRegexp, options)
+        );
       }
     }
     if (stableReleaseTags.length > 0) {
@@ -2897,7 +2906,16 @@ async function getLatestGitTagForPattern(workspaceConfig, releaseTagPattern, add
         `Using latest stable tag for release tag pattern "${releaseTagPattern}" (Interpolated tag pattern: ${interpolatedTagPattern})`,
         workspaceConfig
       );
-      return extractTagAndVersion(stableReleaseTags[0], tagRegexp, options);
+      return stableReleaseTags.reduce(
+        (ret, releaseTag) => {
+          const result = extractTagAndVersion(releaseTag, tagRegexp, options);
+          if (valid(result.extractedVersion) && gt(result.extractedVersion, ret.extractedVersion)) {
+            return result;
+          }
+          return ret;
+        },
+        extractTagAndVersion(stableReleaseTags[0], tagRegexp, options)
+      );
     }
     return null;
   } catch {