Compare commits

...

4 Commits

Author SHA1 Message Date
95d7c90492 v0.0.583
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 2m31s
2025-06-25 10:59:23 +02:00
23a3235c7e v0.0.582
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 2m33s
2025-06-25 10:51:38 +02:00
506d276962 v0.0.581
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 3m39s
2025-06-25 10:28:54 +02:00
2a0cf84416 v0.0.580 Add IsZero() to generated ID types
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 2m33s
2025-06-16 08:40:07 +02:00
8 changed files with 308 additions and 35 deletions

View File

@@ -183,6 +183,10 @@ func (id {{.Name}}) CheckString() string {
return getCheckString(prefix{{.Name}}, string(id))
}
func (id {{.Name}}) IsZero() bool {
return id == ""
}
func (id {{.Name}}) Regex() rext.Regex {
return regex{{.Name}}
}

View File

@@ -45,6 +45,10 @@ func (i {{.Name}}) AsAnyPtr() *{{$.AnyDef.Name}} {
}
{{end}}
func (i {{.Name}}) IsZero() bool {
return i == ""
}
func New{{.Name}}() {{.Name}} {
return {{.Name}}(primitive.NewObjectID().Hex())
}

2
go.mod
View File

@@ -48,7 +48,7 @@ require (
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.14 // indirect
github.com/ugorji/go/codec v1.3.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect

2
go.sum
View File

@@ -187,6 +187,8 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
github.com/ugorji/go/codec v1.2.14 h1:yOQvXCBc3Ij46LRkRoh4Yd5qK6LVOgi0bYOXfb7ifjw=
github.com/ugorji/go/codec v1.2.14/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=

View File

@@ -1,5 +1,5 @@
package goext
const GoextVersion = "0.0.579"
const GoextVersion = "0.0.583"
const GoextVersionTimestamp = "2025-06-13T16:53:24+0200"
const GoextVersionTimestamp = "2025-06-25T10:59:23+0200"

23
langext/base64.go Normal file
View File

@@ -0,0 +1,23 @@
package langext
import (
"encoding/base64"
"strings"
)
// DecodeBase64Any decodes a base64 encoded string
// Works with all variants (std, url, imap), padded and unpadded and even ignores linrebreaks and indents
func DecodeBase64Any(data string) ([]byte, error) {
data = strings.ReplaceAll(data, "\n", "") // remove linebreaks and indents
data = strings.ReplaceAll(data, "\t", "") // remove linebreaks and indents
data = strings.ReplaceAll(data, " ", "") // remove linebreaks and indents
data = strings.ReplaceAll(data, ",", "/") // base64_imap --> base64_std
data = strings.ReplaceAll(data, "_", "/") // base64_url --> base64_std
data = strings.ReplaceAll(data, "-", "+") // base64_url --> base64_std
data = strings.ReplaceAll(data, "=", "") // no padding
return base64.RawStdEncoding.DecodeString(data)
}

246
langext/base64_test.go Normal file
View File

@@ -0,0 +1,246 @@
package langext
import (
"testing"
)
func TestDecodeBase64Any_StandardPadded(t *testing.T) {
input := "SGVsbG8gV29ybGQ=" // "Hello World" in standard Base64 (padded)
expected := "Hello World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_StandardUnpadded(t *testing.T) {
input := "SGVsbG8gV29ybGQ" // "Hello World" in standard Base64 (unpadded)
expected := "Hello World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_URLPadded(t *testing.T) {
input := "SGVsbG8tV29ybGQ=" // "Hello-World" in Base64 URL (padded)
expected := "Hello-World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_URLUnpadded(t *testing.T) {
input := "SGVsbG8tV29ybGQ" // "Hello-World" in Base64 URL (unpadded)
expected := "Hello-World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_IMAPPadded(t *testing.T) {
input := "SGVsbG8,V29ybGQ=" // "Hello/World" in Base64 IMAP (padded)
expected := "Hello?World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_IMAPUnpadded(t *testing.T) {
input := "SGVsbG8,V29ybGQ" // "Hello/World" in Base64 IMAP (unpadded)
expected := "Hello?World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_InvalidInput(t *testing.T) {
input := "Invalid@@Base64" // Invalid Base64 input
_, err := DecodeBase64Any(input)
if err == nil {
t.Fatal("expected an error, but got none")
}
}
func TestDecodeBase64Any_EmptyInput(t *testing.T) {
input := "" // Empty input
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(result) != 0 {
t.Errorf("expected empty result, got %q", string(result))
}
}
func TestDecodeBase64Any_WhitespaceInput(t *testing.T) {
input := " SGVsbG8gV29ybGQ= " // Input with leading and trailing spaces
expected := "Hello World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_LineBreaksInput(t *testing.T) {
input := "SGVs\nbG8g\nV29y\nbGQ=" // Input with line breaks
expected := "Hello World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_TabCharactersInput(t *testing.T) {
input := "SGVsbG8g\tV29ybGQ=" // Input with tab characters
expected := "Hello World"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_SpecialCharactersIgnored(t *testing.T) {
input := "SGVsbG8gV29ybGQ=!!" // Input with ignored special characters
_, err := DecodeBase64Any(input)
if err == nil {
t.Fatal("expected an error, but got none")
}
}
func TestDecodeBase64Any_SingleCharacterInput(t *testing.T) {
input := "QQ==" // "A" in Base64
expected := "A"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_LongInput(t *testing.T) {
input := "U29tZSB2ZXJ5IGxvbmcgc3RyaW5nIHdpdGggbXVsdGlwbGUgbGluZXMgYW5kIHNwYWNlcy4=" // Long Base64 string
expected := "Some very long string with multiple lines and spaces."
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_Standard63And64(t *testing.T) {
input := "Pz8/Pw==" // "???" in standard Base64 (63 = '+', 64 = '/')
expected := "????"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_Standard63And64_NoPad(t *testing.T) {
input := "Pz8/Pw" // "???" in standard Base64 (63 = '+', 64 = '/')
expected := "????"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_URL63And64(t *testing.T) {
input := "Pz8_Pw==" // "???" in Base64 URL-safe (63 = '_', 64 = '-')
expected := "????"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}
func TestDecodeBase64Any_URL63And64_NoPad(t *testing.T) {
input := "Pz8_Pw==" // "???" in Base64 URL-safe (63 = '_', 64 = '-')
expected := "????"
result, err := DecodeBase64Any(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if string(result) != expected {
t.Errorf("expected %q, got %q", expected, string(result))
}
}

View File

@@ -1,57 +1,51 @@
package mongoext
import (
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/bsoncodec"
"go.mongodb.org/mongo-driver/bson/bsontype"
"go.mongodb.org/mongo-driver/bson/primitive"
"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"git.blackforestbytes.com/BlackForestBytes/goext/rfctime"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/bsoncodec"
"go.mongodb.org/mongo-driver/bson/primitive"
"reflect"
)
func CreateGoExtBsonRegistry() *bsoncodec.Registry {
rb := bsoncodec.NewRegistryBuilder()
reg := bson.NewRegistry()
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339Time{}), rfctime.RFC3339Time{})
rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339Time{}), rfctime.RFC3339Time{})
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339Time{}), rfctime.RFC3339Time{})
reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339Time{}), rfctime.RFC3339Time{})
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixTime{}), rfctime.UnixTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixTime{}), rfctime.UnixTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixTime{}), rfctime.UnixTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixTime{}), rfctime.UnixTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixMilliTime{}), rfctime.UnixMilliTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixMilliTime{}), rfctime.UnixMilliTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixMilliTime{}), rfctime.UnixMilliTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixMilliTime{}), rfctime.UnixMilliTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixNanoTime{}), rfctime.UnixNanoTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixNanoTime{}), rfctime.UnixNanoTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixNanoTime{}), rfctime.UnixNanoTime{})
reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixNanoTime{}), rfctime.UnixNanoTime{})
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.Date{}), rfctime.Date{})
rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.Date{}), rfctime.Date{})
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.Date{}), rfctime.Date{})
reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.Date{}), rfctime.Date{})
rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.SecondsF64(0)), rfctime.SecondsF64(0))
rb.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(rfctime.SecondsF64(0))), rfctime.SecondsF64(0))
reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.SecondsF64(0)), rfctime.SecondsF64(0))
reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(rfctime.SecondsF64(0))), rfctime.SecondsF64(0))
rb.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorCategory{}), exerr.ErrorCategory{})
rb.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorCategory{})), exerr.ErrorCategory{})
reg.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorCategory{}), exerr.ErrorCategory{})
reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorCategory{})), exerr.ErrorCategory{})
rb.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorSeverity{}), exerr.ErrorSeverity{})
rb.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorSeverity{})), exerr.ErrorSeverity{})
reg.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorSeverity{}), exerr.ErrorSeverity{})
reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorSeverity{})), exerr.ErrorSeverity{})
rb.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorType{}), exerr.ErrorType{})
rb.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorType{})), exerr.ErrorType{})
bsoncodec.DefaultValueEncoders{}.RegisterDefaultEncoders(rb)
bsoncodec.DefaultValueDecoders{}.RegisterDefaultDecoders(rb)
bson.PrimitiveCodecs{}.RegisterPrimitiveCodecs(rb)
reg.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorType{}), exerr.ErrorType{})
reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorType{})), exerr.ErrorType{})
// otherwise we get []primitve.E when unmarshalling into any
// which will result in {'key': .., 'value': ...}[] json when json-marshalling
rb.RegisterTypeMapEntry(bsontype.EmbeddedDocument, reflect.TypeOf(primitive.M{}))
reg.RegisterTypeMapEntry(bson.TypeEmbeddedDocument, reflect.TypeOf(primitive.M{}))
return rb.Build()
return reg
}