refactor(tagcmd): improve tag generation logic and exit handling

Author: kooksee

cmds/tagcmd/cmd.go

@@ -22,14 +22,19 @@ func New() *cli.Command {
 			defer recovery.Exit()
 			var p = tea.NewProgram(initialModel())
 			m := assert.Must1(p.Run()).(model)
-			ver := utils.GetNextTag(m.selected)
+			var tags = utils.GetGitTags()
+			ver := utils.GetNextTag(m.selected, tags)
 			if m.selected == "release" {
-				ver = ver.Core()
+				ver = utils.GetNextReleaseTag(tags)
 			}
 
 			tagName := "v" + strings.TrimPrefix(ver.Original(), "v")
 			var p1 = tea.NewProgram(InitialTextInputModel(tagName))
 			m1 := assert.Must1(p1.Run()).(model2)
+			if m1.exit {
+				return nil
+			}
+
 			tagName = m1.Value()
 			_, err := semver.NewVersion(tagName)
 			if err != nil {

cmds/tagcmd/ui.go

@@ -3,7 +3,7 @@ package tagcmd
 import (
 	"fmt"
 	"log/slog"
-	
+
 	"github.com/charmbracelet/bubbles/spinner"
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
@@ -112,6 +112,7 @@ func (m model1) View() string {
 
 type model2 struct {
 	textInput textinput.Model
+	exit      bool
 }
 
 // sanitizeInput verifies that an input text string gets validated
@@ -151,6 +152,7 @@ func (m model2) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case tea.KeyEnter:
 			return m, tea.Quit
 		case tea.KeyCtrlC, tea.KeyEsc:
+			m.exit = true
 			return m, tea.Quit
 		}
 	}

utils/util.go

@@ -34,9 +34,15 @@ func GetGitTags() []*semver.Version {
 	return versions
 }
 
-func GetNextTag(pre string) *semver.Version {
-	var tags = GetGitTags()
-	var maxVer = GetGitMaxTag(tags)
+func GetNextReleaseTag(tags []*semver.Version) *semver.Version {
+	var curMaxVer = typex.DoBlock1(func() *semver.Version {
+		return lo.MaxBy(tags, func(a *semver.Version, b *semver.Version) bool { return a.Compare(b) > 0 })
+	})
+
+	return curMaxVer.Core()
+}
+
+func GetNextTag(pre string, tags []*semver.Version) *semver.Version {
 	var preData = fmt.Sprintf("-%s.", pre)
 	var curMaxVer = typex.DoBlock1(func() *semver.Version {
 		preTags := lo.Filter(tags, func(item *semver.Version, index int) bool { return strings.Contains(item.String(), preData) })
@@ -45,11 +51,11 @@ func GetNextTag(pre string) *semver.Version {
 	})
 
 	var ver string
-	if curMaxVer != nil && curMaxVer.GreaterThan(maxVer) {
+	if curMaxVer != nil {
 		ver = strings.ReplaceAll(curMaxVer.Prerelease(), fmt.Sprintf("%s.", pre), "")
 		ver = fmt.Sprintf("v%s-%s.%d", curMaxVer.Core().String(), pre, assert.Must1(strconv.Atoi(ver))+1)
 	} else {
-		ver = fmt.Sprintf("v%s-%s.1", maxVer.Core().String(), pre)
+		ver = fmt.Sprintf("v%s-%s.1", GetNextReleaseTag(tags).String(), pre)
 	}
 	return assert.Exit1(semver.NewSemver(ver))
 }