use golang.org/x/mod/semver

Author: linkdata

go.mod

@@ -1,3 +1,5 @@
 module github.com/linkdata/gitsemver
 
-go 1.23
+go 1.24.0
+
+require golang.org/x/mod v0.33.0

go.sum

@@ -0,0 +1,2 @@
+golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
+golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=

internal/gitsemver/gitsemver.go

@@ -146,7 +146,7 @@ func (vs *GitSemVer) examineTags(repo string) (err error) {
 // that is true if the tree hashes match and there are no uncommitted changes.
 func (vs *GitSemVer) GetTag(repo string) (tag string, match bool, err error) {
 	if ciTag := strings.TrimSpace(vs.Env.Getenv("CI_COMMIT_TAG")); ciTag != "" {
-		if reMatchSemver.MatchString(ciTag) {
+		if isSemverTag(ciTag) {
 			return ciTag, true, nil
 		}
 	}

internal/gitsemver/gitter.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"sort"
 	"strconv"
@@ -160,69 +159,20 @@ func (dg DefaultGitter) CheckGitRepo(dir string) (repo string, err error) {
 	return
 }
 
-// Intentionally accepts partial numeric tags (v1, v1.2, v1.2.3),
-// with or without a leading "v".
-var reMatchSemver = regexp.MustCompile(`^v?[0-9]+(?:\.[0-9]+)?(?:\.[0-9]+)?$`)
-
-func normalizeNumericString(s string) string {
-	s = strings.TrimLeft(s, "0")
-	if s == "" {
-		return "0"
-	}
-	return s
-}
-
-func compareNumericStrings(a, b string) int {
-	a = normalizeNumericString(a)
-	b = normalizeNumericString(b)
-	if len(a) != len(b) {
-		if len(a) > len(b) {
-			return 1
-		}
-		return -1
-	}
-	if a == b {
-		return 0
-	}
-	if a > b {
-		return 1
-	}
-	return -1
-}
-
-func semverPart(tag string, index int) string {
-	core := strings.TrimPrefix(tag, "v")
-	parts := strings.Split(core, ".")
-	if index >= 0 && index < len(parts) {
-		return parts[index]
-	}
-	return "0"
-}
-
-func semverGreater(leftTag, rightTag string) bool {
-	for idx := 0; idx < 3; idx++ {
-		cmp := compareNumericStrings(semverPart(leftTag, idx), semverPart(rightTag, idx))
-		if cmp != 0 {
-			return cmp > 0
-		}
-	}
-	return false
-}
-
 // GetTags returns all tags, sorted by version descending.
 // The latest tag is the first in the list.
 func (dg DefaultGitter) GetTags(repo string) (tags []string, err error) {
 	var b []byte
 	if b, err = dg.Exec("-C", repo, "tag", "--sort=-v:refname", "--list", "v[0-9]*", "[0-9]*"); len(b) > 0 /* #nosec G204 */ {
 		for _, tag := range strings.Split(string(b), "\n") {
-			if tag = strings.TrimSpace(tag); tag != "" && reMatchSemver.MatchString(tag) {
+			if tag = strings.TrimSpace(tag); tag != "" && isSemverTag(tag) {
 				tags = append(tags, tag)
 			}
 		}
 		// Git's multi-pattern listing can interleave v-prefixed and non-prefixed
 		// tags in a way that is not globally version-sorted. Normalize here.
 		sort.SliceStable(tags, func(i, j int) bool {
-			return semverGreater(tags[i], tags[j])
+			return semverTagGreater(tags[i], tags[j])
 		})
 	}
 	return
@@ -310,7 +260,7 @@ func (dg DefaultGitter) GetClosestTag(repo, commit string) (tag string, err erro
 				var b []byte
 				if b, err = dg.Exec(args...); err == nil {
 					candidate := strings.TrimSpace(string(b))
-					if candidate == "" || reMatchSemver.MatchString(candidate) {
+					if candidate == "" || isSemverTag(candidate) {
 						tag = candidate
 						return
 					}

internal/gitsemver/semver.go

@@ -0,0 +1,34 @@
+package gitsemver
+
+import (
+	"strings"
+
+	xmodsemver "golang.org/x/mod/semver"
+)
+
+// canonicalSemverTag converts relaxed git tag forms like "1", "1.2", "v1.2.3"
+// into strict canonical semver for validation/comparison.
+func canonicalSemverTag(tag string) (canonical string, ok bool) {
+	if tag = strings.TrimSpace(tag); tag != "" {
+		if !strings.HasPrefix(tag, "v") {
+			tag = "v" + tag
+		}
+		// Git tags are intentionally limited to numeric MAJOR[.MINOR][.PATCH] forms.
+		if xmodsemver.Prerelease(tag) == "" && xmodsemver.Build(tag) == "" {
+			canonical = xmodsemver.Canonical(tag)
+		}
+	}
+	ok = canonical != ""
+	return
+}
+
+func isSemverTag(tag string) bool {
+	_, ok := canonicalSemverTag(tag)
+	return ok
+}
+
+func semverTagGreater(leftTag, rightTag string) bool {
+	leftCanonical, _ := canonicalSemverTag(leftTag)
+	rightCanonical, _ := canonicalSemverTag(rightTag)
+	return xmodsemver.Compare(leftCanonical, rightCanonical) > 0
+}

internal/gitsemver/versioninfo.go

@@ -87,13 +87,13 @@ func (vi *VersionInfo) GoPackage(repo, pkgName string) (retv string, err error)
 
 func (vi *VersionInfo) HasTag(tag string) bool {
 	tagCore := strings.TrimPrefix(tag, "v")
-	tagIsSemver := reMatchSemver.MatchString(tag)
+	tagIsSemver := isSemverTag(tag)
 	for _, gt := range vi.Tags {
 		if gt.Tag == tag {
 			return true
 		}
 		// Treat v-prefixed and non-prefixed semver tags as equivalent.
-		if tagIsSemver && reMatchSemver.MatchString(gt.Tag) && strings.TrimPrefix(gt.Tag, "v") == tagCore {
+		if tagIsSemver && isSemverTag(gt.Tag) && strings.TrimPrefix(gt.Tag, "v") == tagCore {
 			return true
 		}
 	}
@@ -105,11 +105,11 @@ func (vi *VersionInfo) IncPatch() string {
 	baseTag := vi.Tag
 	// Ignore prerelease/build suffixes when incrementing the patch level.
 	if idx := strings.IndexAny(baseTag, "-+"); idx > -1 {
-		if core := baseTag[:idx]; reMatchSemver.MatchString(core) {
+		if core := baseTag[:idx]; isSemverTag(core) {
 			baseTag = core
 		}
 	}
-	if !reMatchSemver.MatchString(baseTag) {
+	if !isSemverTag(baseTag) {
 		vi.SameTree = true
 		return vi.Tag
 	}