From adb5fbfe4a6fcc5c85459f20dfe01e5c793e4ed0 Mon Sep 17 00:00:00 2001 From: James Pond Date: Mon, 19 May 2025 18:55:34 -0300 Subject: [PATCH 1/2] Simplify package name regex Signed-off-by: James Pond --- internal/config/package.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/package.go b/internal/config/package.go index 636a3d0..3ca115d 100644 --- a/internal/config/package.go +++ b/internal/config/package.go @@ -12,7 +12,7 @@ import ( ) const ( - validPackageNameRegex = `^[a-zA-Z0-9][a-zA-Z0-9-_/.]*[a-zA-Z0-9]$` + validPackageNameRegex = `^[\pL0-9_.-]+$` validPackageVersionRegex = `^\d+\.\d+\.\d+$` ) From b35e1e7510381f5472464e63d433a7e494216a79 Mon Sep 17 00:00:00 2001 From: James Pond Date: Mon, 19 May 2025 19:13:37 -0300 Subject: [PATCH 2/2] Add more context to the invalid package name error Signed-off-by: James Pond --- internal/config/package.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/config/package.go b/internal/config/package.go index 3ca115d..c08e01b 100644 --- a/internal/config/package.go +++ b/internal/config/package.go @@ -5,6 +5,7 @@ package config import ( + "fmt" "net/url" "regexp" @@ -88,7 +89,7 @@ func (p *Package) validate() error { nameRegex := regexp.MustCompile(validPackageNameRegex) if !nameRegex.MatchString(p.Name) { - return ErrPackageInvalidName + return fmt.Errorf("%w: %s", ErrPackageInvalidName, p.Name) } if p.Description == "" {