@storm-software/git-tools 2.131.18 → 2.131.19

package/bin/git.js

@@ -4275,7 +4275,7 @@ async function createReleaseGraph(options) {
   await graph.init(options);
   return graph;
 }
-var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
+var StormReleaseGroupProcessor = class _StormReleaseGroupProcessor extends ReleaseGroupProcessor {
   constructor(tree, workspaceConfig, projectGraph, nxReleaseConfig, releaseGraph, versionOptions) {
     super(tree, projectGraph, nxReleaseConfig, releaseGraph, {
       dryRun: !!versionOptions.dryRun,
@@ -4296,6 +4296,16 @@ var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
     this.#nxReleaseConfig = nxReleaseConfig;
     this.#releaseGraph = releaseGraph;
   }
+  static #BUMP_TYPE_PRIORITY = {
+    major: 8,
+    premajor: 7,
+    minor: 6,
+    preminor: 5,
+    patch: 4,
+    prepatch: 3,
+    prerelease: 2,
+    none: 1
+  };
   #tree;
   #projectGraph;
   #nxReleaseConfig;
@@ -4502,11 +4512,17 @@ var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
           newVersionInputReason,
           newVersionInputReasonData
         } = await this.#determineVersionBumpForProject(releaseGroup, project);
-        if (!fixedGroup.currentVersion || currentVersion && semver.gt(currentVersion, fixedGroup.currentVersion) || !fixedGroup.newVersion || fixedGroup.newVersion.input === "none" || newVersionInput && semver.gt(newVersionInput, fixedGroup.newVersion.input)) {
+        if (!fixedGroup.currentVersion || currentVersion && semver.gt(currentVersion, fixedGroup.currentVersion) || !fixedGroup.newVersion || fixedGroup.newVersion.input === "none" || this.#isHigherPriorityBumpType(
+          newVersionInput,
+          fixedGroup.newVersion?.input
+        )) {
           if (!fixedGroup.currentVersion || currentVersion && semver.gt(currentVersion, fixedGroup.currentVersion)) {
             fixedGroup.currentVersion = currentVersion;
           }
-          if (!fixedGroup.newVersion || fixedGroup.newVersion.input === "none" || newVersionInput && semver.gt(newVersionInput, fixedGroup.newVersion.input)) {
+          if (!fixedGroup.newVersion || fixedGroup.newVersion.input === "none" || this.#isHigherPriorityBumpType(
+            newVersionInput,
+            fixedGroup.newVersion?.input
+          )) {
             fixedGroup.newVersion = {
               input: newVersionInput,
               reason: newVersionInputReason,
@@ -4781,6 +4797,17 @@ var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
     }
     return bumped;
   }
+  #isHigherPriorityBumpType(candidate, current) {
+    const candidatePriority = _StormReleaseGroupProcessor.#BUMP_TYPE_PRIORITY[candidate];
+    const currentPriority = _StormReleaseGroupProcessor.#BUMP_TYPE_PRIORITY[current];
+    if (candidatePriority === void 0) {
+      return false;
+    }
+    if (currentPriority === void 0) {
+      return true;
+    }
+    return candidatePriority > currentPriority;
+  }
   #getCurrentCachedVersionForProject(projectName) {
     return this.#releaseGraph.cachedCurrentVersions.get(projectName) || null;
   }