Add support for v prefix

ffurrer2 · Oct 20, 2024 · 77e7017 · 77e7017
1 parent e271f6b
commit 77e7017
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/pkg/semver/builder.go b/pkg/semver/builder.go
@@ -3,6 +3,7 @@
 package semver
 
 type Builder struct {
+	prefix        string
 	major         uint
 	minor         uint
 	patch         uint
@@ -12,6 +13,7 @@ type Builder struct {
 
 func NewBuilder() *Builder {
 	return &Builder{
+		prefix:        "",
 		major:         0,
 		minor:         0,
 		patch:         0,
@@ -20,8 +22,20 @@ func NewBuilder() *Builder {
 	}
 }
 
+func (b *Builder) Prefix(prefix string) *Builder {
+	return &Builder{
+		prefix:        prefix,
+		major:         b.major,
+		minor:         b.minor,
+		patch:         b.patch,
+		preRelease:    b.preRelease,
+		buildMetadata: b.buildMetadata,
+	}
+}
+
 func (b *Builder) Major(major uint) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         major,
 		minor:         b.minor,
 		patch:         b.patch,
@@ -32,6 +46,7 @@ func (b *Builder) Major(major uint) *Builder {
 
 func (b *Builder) Minor(minor uint) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         b.major,
 		minor:         minor,
 		patch:         b.patch,
@@ -42,6 +57,7 @@ func (b *Builder) Minor(minor uint) *Builder {
 
 func (b *Builder) Patch(patch uint) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         b.major,
 		minor:         b.minor,
 		patch:         patch,
@@ -52,6 +68,7 @@ func (b *Builder) Patch(patch uint) *Builder {
 
 func (b *Builder) PreRelease(preRelease []string) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         b.major,
 		minor:         b.minor,
 		patch:         b.patch,
@@ -62,6 +79,7 @@ func (b *Builder) PreRelease(preRelease []string) *Builder {
 
 func (b *Builder) PreReleaseField(preRelease string) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         b.major,
 		minor:         b.minor,
 		patch:         b.patch,
@@ -72,6 +90,7 @@ func (b *Builder) PreReleaseField(preRelease string) *Builder {
 
 func (b *Builder) BuildMetadata(buildMetadata []string) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         b.major,
 		minor:         b.minor,
 		patch:         b.patch,
@@ -82,6 +101,7 @@ func (b *Builder) BuildMetadata(buildMetadata []string) *Builder {
 
 func (b *Builder) BuildMetadataField(buildMetadata string) *Builder {
 	return &Builder{
+		prefix:        b.prefix,
 		major:         b.major,
 		minor:         b.minor,
 		patch:         b.patch,
@@ -92,6 +112,7 @@ func (b *Builder) BuildMetadataField(buildMetadata string) *Builder {
 
 func (b *Builder) Build() (*SemVer, bool) {
 	semver := &SemVer{
+		Prefix:        b.prefix,
 		Major:         b.major,
 		Minor:         b.minor,
 		Patch:         b.patch,

diff --git a/pkg/semver/semver.go b/pkg/semver/semver.go
@@ -16,7 +16,7 @@ const (
 	MaxMajor           = ^uint(0)
 	MaxMinor           = ^uint(0)
 	MaxPatch           = ^uint(0)
-	NamedGroupsPattern = `^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)` +
+	NamedGroupsPattern = `^(?P<prefix>v?)(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)` +
 		`(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?` +
 		`(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`
 )
@@ -39,6 +39,7 @@ func (s InvalidSemVerError) Error() string {
 }
 
 type SemVer struct {
+	Prefix        string   `json:"prefix"`
 	Major         uint     `json:"major"`
 	Minor         uint     `json:"minor"`
 	Patch         uint     `json:"patch"`
@@ -70,6 +71,8 @@ func Parse(s string) (*SemVer, error) {
 	for groupIdx, group := range matches[0] {
 		name := groupNames[groupIdx]
 		switch name {
+		case "prefix":
+			semver.Prefix = group
 		case "major":
 			semver.Major = number.MustParseUint(group)
 		case "minor":