v0.0.644 exerr.DeregisterListener

.claude/settings.json

@@ -0,0 +1,44 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(make:*)",
+
+      "Bash(mkdir:*)",
+
+      "Bash(go build:*)",
+      "Bash(go test:*)",
+      "Bash(go get:*)",
+      "Bash(go mod:*)",
+      "Bash(go clean:*)",
+      "Bash(go doc:*)",
+
+      "Bash(grep:*)",
+      "Bash(find:*)",
+      "Bash(rg:*)",
+      "Bash(base64:*)",
+      "Bash(sed:*)",
+      "Bash(ls:*)",
+
+      "Bash(curl:*)",
+
+      "Bash(timeout 60s go test -v -count=1 ./...)",
+      "Bash(timeout 60s go test -v -count=1 ./tests/integration/...)",
+      "Bash(timeout 60s go test:*)",
+      "Bash(timeout 300 make test)",
+      "Bash(timeout 30s go test ./tests/integration -run:*)",
+
+      "Bash(done)",
+      "Bash(awk:*)",
+
+      "WebFetch(domain:platform.openai.com)"
+    ],
+    "deny": [
+    ],
+    "defaultMode": "acceptEdits"
+  },
+  "env": {
+    "CLAUDE_CODE_ENABLE_TELEMETRY": "0",
+    "DISABLE_ERROR_REPORTING": "1",
+    "DISABLE_TELEMETRY": "1"
+  }
+}

.gitea/workflows/tests.yml

@@ -4,7 +4,7 @@
 # https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
 
 name: Build Docker and Deploy
-run-name: Build & Deploy ${{ gitea.ref }} on ${{ gitea.actor }}
+run-name: "[test]: ${{ github.event.head_commit.message }}"
 
 on:
   push:
@@ -39,17 +39,4 @@ jobs:
       - name: Run tests
         run: cd "${{ gitea.workspace }}" && make test
 
-      - name: Send failure mail
-        if: failure()
-        uses: dawidd6/action-send-mail@v3
-        with:
-          server_address: smtp.fastmail.com
-          server_port: 465
-          secure: true
-          username: ${{secrets.MAIL_USERNAME}}
-          password: ${{secrets.MAIL_PASSWORD}}
-          subject: Pipeline on '${{ gitea.repository }}' failed
-          to: ${{ steps.commiter_info.outputs.MAIL }}
-          from: Gitea Actions <gitea_actions@blackforestbytes.de>
-          body: "Go to https://gogs.blackforestbytes.com/${{ gitea.repository }}/actions"
 

.gitignore

@@ -1,4 +1,6 @@
 
+.claude-queue
+
 ##########################################################################
 
 .idea/**/workspace.xml

.idea/go.imports.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoImports">
+    <option name="excludedPackages">
+      <array>
+        <option value="github.com/pkg/errors" />
+        <option value="golang.org/x/net/context" />
+      </array>
+    </option>
+  </component>
+</project>

README.md

@@ -26,10 +26,14 @@ Potentially needs `export GOPRIVATE="git.blackforestbytes.com"`
 | cursortoken | Mike       | MongoDB cursortoken implementation                                                                            |
 | pagination  | Mike       | Pagination implementation                                                                                     |
 |             |            |                                                                                                               |
+| ginext      | Mike       | gin wrapper                                                                                                   |
+| wsw         | Mike       | websocket wrapper                                                                                             |
+|             |            |                                                                                                               |
 | totpext     | Mike       | Implementation of TOTP (2-Factor-Auth)                                                                        |
 | termext     | Mike       | Utilities for terminals (mostly color output)                                                                 |
 | confext     | Mike       | Parses environment configuration into structs                                                                 |
 | cmdext      | Mike       | Runner for external commands/processes                                                                        |
+| excelext    | Mike       | Build Excel files                                                                                             |
 |             |            |                                                                                                               |
 | sq          | Mike       | Utility functions for sql based databases (primarily sqlite)                                                  |
 | tst         | Mike       | Utility functions for unit tests                                                                              |

bfcodegen/csid-generate.go

@@ -5,11 +5,11 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
-	"go/format"
 	"git.blackforestbytes.com/BlackForestBytes/goext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/cryptext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
+	"go/format"
 	"io"
 	"os"
 	"path"
@@ -64,16 +64,17 @@ func GenerateCharsetIDSpecs(sourceDir string, destFile string, opt CSIDGenOption
 	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return !strings.HasSuffix(v.Name(), "_gen.go") })
 	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
 
-	newChecksumStr := goext.GoextVersion
+	var newChecksumStr strings.Builder
+	newChecksumStr.WriteString(goext.GoextVersion)
 	for _, f := range files {
 		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
 		if err != nil {
 			return err
 		}
-		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
+		newChecksumStr.WriteString("\n" + f.Name() + "\t" + cryptext.BytesSha256(content))
 	}
 
-	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
+	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr.String()))
 
 	if newChecksum != oldChecksum {
 		fmt.Printf("[CSIDGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)

bfcodegen/enum-generate.go

@@ -95,16 +95,17 @@ func _generateEnumSpecs(sourceDir string, destFile string, oldChecksum string, g
 	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return !strings.HasSuffix(v.Name(), "_gen.go") })
 	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
 
-	newChecksumStr := goext.GoextVersion
+	var newChecksumStr strings.Builder
+	newChecksumStr.WriteString(goext.GoextVersion)
 	for _, f := range files {
 		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
 		if err != nil {
 			return "", "", false, err
 		}
-		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
+		newChecksumStr.WriteString("\n" + f.Name() + "\t" + cryptext.BytesSha256(content))
 	}
 
-	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
+	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr.String()))
 
 	if newChecksum != oldChecksum {
 		fmt.Printf("[EnumGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)
@@ -213,7 +214,7 @@ func processEnumFile(basedir string, fn string, debugOutput bool) ([]EnumDef, st
 			var descr *string = nil
 			var data *map[string]any = nil
 			if comment != nil {
-				comment = langext.Ptr(strings.TrimSpace(*comment))
+				comment = new(strings.TrimSpace(*comment))
 				if strings.HasPrefix(*comment, "{") {
 					if v, ok := tryParseDataComment(*comment); ok {
 						data = &v
@@ -278,7 +279,7 @@ func tryParseDataComment(s string) (map[string]any, bool) {
 
 		rv := reflect.ValueOf(v)
 
-		if rv.Kind() == reflect.Ptr && rv.IsNil() {
+		if rv.Kind() == reflect.Pointer && rv.IsNil() {
 			continue
 		}
 		if rv.Kind() == reflect.Bool {

bfcodegen/enum-generate.template

@@ -108,7 +108,7 @@ func (e {{.EnumTypeName}}) PackageName() string {
 }
 
 func (e {{.EnumTypeName}}) Meta() enums.EnumMetaValue {
-    {{if $hasDescr}} return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: langext.Ptr(e.Description())} {{else}} return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: nil} {{end}}
+    {{if $hasDescr}} return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: new(e.Description())} {{else}} return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: nil} {{end}}
 }
 
 {{if $hasDescr}}
@@ -122,7 +122,7 @@ func (e {{.EnumTypeName}}) DataMeta() enums.EnumDataMetaValue {
     return enums.EnumDataMetaValue{
         VarName: e.VarName(),
         Value: e,
-        {{if $hasDescr}} Description: langext.Ptr(e.Description()), {{else}} Description: nil, {{end}}
+        {{if $hasDescr}} Description: new(e.Description()), {{else}} Description: nil, {{end}}
         Data: map[string]any{
             {{ range $datakey, $datatype := $enumdef | generalDataKeys  }} "{{ $datakey }}": e.Data().{{ $datakey | godatakey }},
             {{ end }}
@@ -150,11 +150,13 @@ func {{.EnumTypeName}}ValuesMeta() []enums.EnumMetaValue {
 	}
 }
 
-func {{.EnumTypeName}}ValuesDataMeta() []enums.EnumMetaValue {
+{{if $hasData}}
+func {{.EnumTypeName}}ValuesDataMeta() []enums.EnumDataMetaValue {
 	return []enums.EnumDataMetaValue{ {{range .Values}}
             {{.VarName}}.DataMeta(), {{end}}
 	}
 }
+{{end}}
 
 {{if $hasDescr}}
 func {{.EnumTypeName}}ValuesDescriptionMeta() []enums.EnumDescriptionMetaValue {

bfcodegen/id-generate.go

@@ -5,11 +5,11 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
-	"go/format"
 	"git.blackforestbytes.com/BlackForestBytes/goext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/cryptext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
+	"go/format"
 	"io"
 	"os"
 	"path"
@@ -63,16 +63,17 @@ func GenerateIDSpecs(sourceDir string, destFile string, opt IDGenOptions) error
 	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return !strings.HasSuffix(v.Name(), "_gen.go") })
 	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
 
-	newChecksumStr := goext.GoextVersion
+	var newChecksumStr strings.Builder
+	newChecksumStr.WriteString(goext.GoextVersion)
 	for _, f := range files {
 		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
 		if err != nil {
 			return err
 		}
-		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
+		newChecksumStr.WriteString("\n" + f.Name() + "\t" + cryptext.BytesSha256(content))
 	}
 
-	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
+	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr.String()))
 
 	if newChecksum != oldChecksum {
 		fmt.Printf("[IDGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)

bfcodegen/id-generate.template

@@ -2,10 +2,9 @@
 
 package {{.PkgName}}
 
-import "go.mongodb.org/mongo-driver/bson"
-import "go.mongodb.org/mongo-driver/bson/bsontype"
-import "go.mongodb.org/mongo-driver/bson/primitive"
+import "go.mongodb.org/mongo-driver/v2/bson"
 import "git.blackforestbytes.com/BlackForestBytes/goext/exerr"
+import "git.blackforestbytes.com/BlackForestBytes/goext/wmo"
 
 const ChecksumIDGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}}
 
@@ -13,9 +12,10 @@ const ChecksumIDGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}}
 
 // ================================ {{.Name}} ({{.FileRelative}}) ================================
 
-func (i {{.Name}}) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	if objId, err := primitive.ObjectIDFromHex(string(i)); err == nil {
-		return bson.MarshalValue(objId)
+func (i {{.Name}}) MarshalBSONValue() (byte, []byte, error) {
+	if objId, err := bson.ObjectIDFromHex(string(i)); err == nil {
+		tp, data, err := bson.MarshalValue(objId)
+		return byte(tp), data, err
 	} else {
 		return 0, nil, exerr.New(exerr.TypeMarshalEntityID, "Failed to marshal {{.Name}}("+i.String()+") to ObjectId").Str("value", string(i)).Type("type", i).Build()
 	}
@@ -25,12 +25,12 @@ func (i {{.Name}}) String() string {
 	return string(i)
 }
 
-func (i {{.Name}}) ObjID() (primitive.ObjectID, error) {
-	return primitive.ObjectIDFromHex(string(i))
+func (i {{.Name}}) ObjID() (bson.ObjectID, error) {
+	return bson.ObjectIDFromHex(string(i))
 }
 
 func (i {{.Name}}) Valid() bool {
-	_, err := primitive.ObjectIDFromHex(string(i))
+	_, err := bson.ObjectIDFromHex(string(i))
 	return err == nil
 }
 
@@ -50,7 +50,9 @@ func (i {{.Name}}) IsZero() bool {
 }
 
 func New{{.Name}}() {{.Name}} {
-	return {{.Name}}(primitive.NewObjectID().Hex())
+	return {{.Name}}(bson.NewObjectID().Hex())
 }
 
+var _ wmo.MongoEntityID = (*{{.Name}})(nil)
+
 {{end}}

bfcodegen/unit_csid_test.go

@@ -0,0 +1,160 @@
+package bfcodegen
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestProcessCSIDFileSimple(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package mymodels
+
+type UserID string // @csid:type [USR]
+type OrderID string // @csid:type [ORD]
+`
+	fp := writeTestFile(t, dir, "models.go", src)
+
+	ids, pkg, err := processCSIDFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "mymodels")
+	tst.AssertEqual(t, len(ids), 2)
+	tst.AssertEqual(t, ids[0].Name, "UserID")
+	tst.AssertEqual(t, ids[0].Prefix, "USR")
+	tst.AssertEqual(t, ids[1].Name, "OrderID")
+	tst.AssertEqual(t, ids[1].Prefix, "ORD")
+	tst.AssertEqual(t, ids[0].FileRelative, "models.go")
+}
+
+func TestProcessCSIDFilePrefixMustBeUppercase(t *testing.T) {
+	dir := t.TempDir()
+
+	// lowercase prefix should not match the regex (only [A-Z0-9]{3})
+	src := `package x
+
+type FooID string // @csid:type [usr]
+`
+	fp := writeTestFile(t, dir, "x.go", src)
+
+	ids, pkg, err := processCSIDFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "x")
+	tst.AssertEqual(t, len(ids), 0)
+}
+
+func TestProcessCSIDFileGeneratedHeaderSkipped(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `// Code generated by csid-generate.go DO NOT EDIT.
+
+package x
+
+type SkipMeID string // @csid:type [SKP]
+`
+	fp := writeTestFile(t, dir, "skip.go", src)
+
+	ids, pkg, err := processCSIDFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "")
+	tst.AssertEqual(t, len(ids), 0)
+}
+
+func TestGenerateCharsetIDSpecsEndToEnd(t *testing.T) {
+	dir := t.TempDir()
+
+	src1 := `package models
+
+type EntityID string // @csid:type [ENT]
+type UserID string // @csid:type [USR]
+`
+	writeTestFile(t, dir, "a_models.go", src1)
+
+	src2 := `package models
+
+type OrderID string // @csid:type [ORD]
+`
+	writeTestFile(t, dir, "b_models.go", src2)
+
+	dest := filepath.Join(dir, "csid_gen.go")
+
+	err := GenerateCharsetIDSpecs(dir, dest, CSIDGenOptions{DebugOutput: langext.PFalse})
+	tst.AssertNoErr(t, err)
+
+	out, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+	outStr := string(out)
+
+	tst.AssertTrue(t, strings.Contains(outStr, "package models"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ChecksumCharsetIDGenerator"))
+	tst.AssertTrue(t, strings.Contains(outStr, "func NewUserID()"))
+	tst.AssertTrue(t, strings.Contains(outStr, "func NewOrderID()"))
+	tst.AssertTrue(t, strings.Contains(outStr, "func NewEntityID()"))
+	tst.AssertTrue(t, strings.Contains(outStr, `prefixUserID`) && strings.Contains(outStr, `"USR"`))
+	tst.AssertTrue(t, strings.Contains(outStr, `prefixOrderID`) && strings.Contains(outStr, `"ORD"`))
+	tst.AssertTrue(t, strings.Contains(outStr, `prefixEntityID`) && strings.Contains(outStr, `"ENT"`))
+}
+
+func TestGenerateCharsetIDSpecsIdempotentWhenUnchanged(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type SomeID string // @csid:type [SOM]
+`
+	writeTestFile(t, dir, "models.go", src)
+	dest := filepath.Join(dir, "csid_gen.go")
+
+	err := GenerateCharsetIDSpecs(dir, dest, CSIDGenOptions{})
+	tst.AssertNoErr(t, err)
+
+	content1, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+
+	err = GenerateCharsetIDSpecs(dir, dest, CSIDGenOptions{})
+	tst.AssertNoErr(t, err)
+
+	content2, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, string(content1), string(content2))
+}
+
+func TestGenerateCharsetIDSpecsErrorsWithoutPackage(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `// Code generated by csid-generate.go DO NOT EDIT.
+
+package x
+
+type SkippedID string // @csid:type [SKP]
+`
+	writeTestFile(t, dir, "z.go", src)
+	dest := filepath.Join(dir, "csid_gen.go")
+
+	err := GenerateCharsetIDSpecs(dir, dest, CSIDGenOptions{})
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestGenerateCharsetIDSpecsMissingDir(t *testing.T) {
+	dir := filepath.Join(t.TempDir(), "definitely-missing")
+	err := GenerateCharsetIDSpecs(dir, filepath.Join(dir, "csid_gen.go"), CSIDGenOptions{})
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestFmtCSIDOutputContainsAllNames(t *testing.T) {
+	ids := []CSIDDef{
+		{File: "a.go", FileRelative: "a.go", Name: "AlphaID", Prefix: "ALP"},
+		{File: "b.go", FileRelative: "b.go", Name: "BetaID", Prefix: "BET"},
+	}
+	out := fmtCSIDOutput("CHK_XYZ", ids, "models")
+	tst.AssertTrue(t, strings.Contains(out, "package models"))
+	tst.AssertTrue(t, strings.Contains(out, "CHK_XYZ"))
+	tst.AssertTrue(t, strings.Contains(out, "AlphaID"))
+	tst.AssertTrue(t, strings.Contains(out, "BetaID"))
+	tst.AssertTrue(t, strings.Contains(out, `prefixAlphaID`) && strings.Contains(out, `"ALP"`))
+	tst.AssertTrue(t, strings.Contains(out, `prefixBetaID`) && strings.Contains(out, `"BET"`))
+}

bfcodegen/unit_enum_test.go

@@ -0,0 +1,369 @@
+package bfcodegen
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestProcessEnumFileBasicStringEnum(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package mymodels
+
+type Color string // @enum:type
+
+const (
+	ColorRed   Color = "red"
+	ColorBlue  Color = "blue"
+	ColorGreen Color = "green"
+)
+`
+	fp := writeTestFile(t, dir, "color.go", src)
+
+	enums, pkg, err := processEnumFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "mymodels")
+	tst.AssertEqual(t, len(enums), 1)
+	tst.AssertEqual(t, enums[0].EnumTypeName, "Color")
+	tst.AssertEqual(t, enums[0].Type, "string")
+	tst.AssertEqual(t, len(enums[0].Values), 3)
+	tst.AssertEqual(t, enums[0].Values[0].VarName, "ColorRed")
+	tst.AssertEqual(t, enums[0].Values[0].Value, `"red"`)
+	tst.AssertEqual(t, enums[0].Values[1].VarName, "ColorBlue")
+	tst.AssertEqual(t, enums[0].Values[2].VarName, "ColorGreen")
+}
+
+func TestProcessEnumFileIntEnum(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package m
+
+type Priority int // @enum:type
+
+const (
+	PriorityLow    Priority = 0
+	PriorityMedium Priority = 1
+	PriorityHigh   Priority = 2
+)
+`
+	fp := writeTestFile(t, dir, "prio.go", src)
+
+	enums, pkg, err := processEnumFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "m")
+	tst.AssertEqual(t, len(enums), 1)
+	tst.AssertEqual(t, enums[0].EnumTypeName, "Priority")
+	tst.AssertEqual(t, enums[0].Type, "int")
+	tst.AssertEqual(t, len(enums[0].Values), 3)
+	tst.AssertEqual(t, enums[0].Values[0].Value, "0")
+	tst.AssertEqual(t, enums[0].Values[2].Value, "2")
+}
+
+func TestProcessEnumFileWithDescriptions(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package m
+
+type Status string // @enum:type
+
+const (
+	StatusActive   Status = "active"   // The active status
+	StatusInactive Status = "inactive" // The inactive status
+)
+`
+	fp := writeTestFile(t, dir, "s.go", src)
+
+	enums, _, err := processEnumFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, len(enums), 1)
+	tst.AssertEqual(t, len(enums[0].Values), 2)
+
+	v0 := enums[0].Values[0]
+	tst.AssertTrue(t, v0.Description != nil)
+	tst.AssertEqual(t, *v0.Description, "The active status")
+	tst.AssertTrue(t, v0.Data == nil)
+}
+
+func TestProcessEnumFileWithDataComment(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package m
+
+type Severity string // @enum:type
+
+const (
+	SeverityLow  Severity = "low"  // {"description": "Low severity", "weight": 1}
+	SeverityHigh Severity = "high" // {"description": "High severity", "weight": 9}
+)
+`
+	fp := writeTestFile(t, dir, "sev.go", src)
+
+	enums, _, err := processEnumFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, len(enums), 1)
+	tst.AssertEqual(t, len(enums[0].Values), 2)
+
+	v0 := enums[0].Values[0]
+	tst.AssertTrue(t, v0.Data != nil)
+	tst.AssertTrue(t, v0.Description != nil)
+	tst.AssertEqual(t, *v0.Description, "Low severity")
+}
+
+func TestProcessEnumFileNonMatchingValuesNotAttached(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package m
+
+type Color string // @enum:type
+
+const (
+	ColorRed Color = "red"
+)
+
+const (
+	OtherX OtherType = "x"
+)
+`
+	fp := writeTestFile(t, dir, "c.go", src)
+
+	enums, _, err := processEnumFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, len(enums), 1)
+	tst.AssertEqual(t, len(enums[0].Values), 1)
+	tst.AssertEqual(t, enums[0].Values[0].VarName, "ColorRed")
+}
+
+func TestProcessEnumFileGeneratedHeaderSkipped(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `// Code generated by enum-generate.go DO NOT EDIT.
+
+package x
+
+type Foo string // @enum:type
+`
+	fp := writeTestFile(t, dir, "skip.go", src)
+
+	enums, pkg, err := processEnumFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "")
+	tst.AssertEqual(t, len(enums), 0)
+}
+
+func TestTryParseDataCommentValid(t *testing.T) {
+	m, ok := tryParseDataComment(`{"description": "hello", "weight": 5}`)
+	tst.AssertTrue(t, ok)
+	descr, _ := m["description"].(string)
+	tst.AssertEqual(t, descr, "hello")
+	weight, _ := m["weight"].(float64)
+	tst.AssertEqual(t, weight, float64(5))
+}
+
+func TestTryParseDataCommentBool(t *testing.T) {
+	m, ok := tryParseDataComment(`{"a": true, "b": false}`)
+	tst.AssertTrue(t, ok)
+	a, _ := m["a"].(bool)
+	tst.AssertTrue(t, a)
+	b, _ := m["b"].(bool)
+	tst.AssertFalse(t, b)
+}
+
+func TestTryParseDataCommentRejectsNull(t *testing.T) {
+	// null becomes a nil interface — its reflect.Kind is Invalid, not Pointer,
+	// so it does not match any of the allowed kinds and is rejected.
+	_, ok := tryParseDataComment(`{"x": null}`)
+	tst.AssertFalse(t, ok)
+}
+
+func TestTryParseDataCommentInvalidJSON(t *testing.T) {
+	_, ok := tryParseDataComment(`{not valid json}`)
+	tst.AssertFalse(t, ok)
+}
+
+func TestTryParseDataCommentRejectsArrays(t *testing.T) {
+	// arrays as values are not in the supported kinds list
+	_, ok := tryParseDataComment(`{"x": [1, 2, 3]}`)
+	tst.AssertFalse(t, ok)
+}
+
+func TestTryParseDataCommentRejectsObjects(t *testing.T) {
+	_, ok := tryParseDataComment(`{"x": {"nested": 1}}`)
+	tst.AssertFalse(t, ok)
+}
+
+func TestGenerateEnumSpecsEndToEnd(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type Color string // @enum:type
+
+const (
+	ColorRed   Color = "red"
+	ColorGreen Color = "green"
+	ColorBlue  Color = "blue"
+)
+`
+	writeTestFile(t, dir, "color.go", src)
+	dest := filepath.Join(dir, "enum_gen.go")
+
+	err := GenerateEnumSpecs(dir, dest, EnumGenOptions{
+		DebugOutput: langext.PFalse,
+		GoFormat:    langext.PTrue,
+	})
+	tst.AssertNoErr(t, err)
+
+	out, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+	outStr := string(out)
+
+	tst.AssertTrue(t, strings.Contains(outStr, "package models"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ChecksumEnumGenerator"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ParseColor"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ColorValues"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ColorRed"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ColorBlue"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ColorGreen"))
+}
+
+func TestGenerateEnumSpecsDeterministic(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type Status string // @enum:type
+
+const (
+	StatusActive Status = "active" // The active one
+	StatusOff    Status = "off"    // The off one
+)
+`
+	writeTestFile(t, dir, "s.go", src)
+
+	s1, cs1, changed1, err := _generateEnumSpecs(dir, "", "N/A", true, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, changed1)
+
+	s2, cs2, changed2, err := _generateEnumSpecs(dir, "", "N/A", true, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, changed2)
+
+	tst.AssertEqual(t, cs1, cs2)
+	tst.AssertEqual(t, s1, s2)
+}
+
+func TestGenerateEnumSpecsNoChangeWhenChecksumMatches(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type Status string // @enum:type
+
+const (
+	StatusActive Status = "active"
+)
+`
+	writeTestFile(t, dir, "s.go", src)
+
+	_, cs, changed, err := _generateEnumSpecs(dir, "", "N/A", true, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, changed)
+
+	s2, cs2, changed2, err := _generateEnumSpecs(dir, "", cs, true, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertFalse(t, changed2)
+	tst.AssertEqual(t, cs2, cs)
+	tst.AssertEqual(t, s2, "")
+}
+
+func TestGenerateEnumSpecsWithoutGoFormat(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type Color string // @enum:type
+
+const (
+	ColorRed Color = "red"
+)
+`
+	writeTestFile(t, dir, "c.go", src)
+
+	out, _, _, err := _generateEnumSpecs(dir, "", "N/A", false, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.Contains(out, "ColorRed"))
+	tst.AssertTrue(t, strings.Contains(out, "package models"))
+}
+
+func TestGenerateEnumSpecsErrorsWithoutPackage(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `// Code generated by enum-generate.go DO NOT EDIT.
+
+package x
+
+type Foo string // @enum:type
+`
+	writeTestFile(t, dir, "z.go", src)
+
+	_, _, _, err := _generateEnumSpecs(dir, "", "N/A", false, false)
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestGenerateEnumSpecsMissingDir(t *testing.T) {
+	dir := filepath.Join(t.TempDir(), "definitely-missing")
+	_, _, _, err := _generateEnumSpecs(dir, "", "N/A", false, false)
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestFmtEnumOutputContainsTypes(t *testing.T) {
+	descr := "the red one"
+	enums := []EnumDef{
+		{
+			File:         "color.go",
+			FileRelative: "color.go",
+			EnumTypeName: "Color",
+			Type:         "string",
+			Values: []EnumDefVal{
+				{VarName: "ColorRed", Value: `"red"`, Description: &descr},
+				{VarName: "ColorBlue", Value: `"blue"`, Description: &descr},
+			},
+		},
+	}
+	out := fmtEnumOutput("CHK1", enums, "models")
+	tst.AssertTrue(t, strings.Contains(out, "package models"))
+	tst.AssertTrue(t, strings.Contains(out, "CHK1"))
+	tst.AssertTrue(t, strings.Contains(out, "ColorRed"))
+	tst.AssertTrue(t, strings.Contains(out, "ColorBlue"))
+	tst.AssertTrue(t, strings.Contains(out, "ParseColor"))
+}
+
+func TestGenerateEnumSpecsSkipsGenFile(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type Color string // @enum:type
+
+const (
+	ColorRed Color = "red"
+)
+`
+	writeTestFile(t, dir, "c.go", src)
+
+	// generated file in same dir - should be filtered out
+	gensrc := `package models
+
+type ShouldBeIgnored string // @enum:type
+`
+	writeTestFile(t, dir, "ignored_gen.go", gensrc)
+
+	out, _, _, err := _generateEnumSpecs(dir, filepath.Join(dir, "enum_gen.go"), "N/A", false, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.Contains(out, "ColorRed"))
+	tst.AssertFalse(t, strings.Contains(out, "ShouldBeIgnored"))
+}

bfcodegen/unit_id_test.go

@@ -0,0 +1,209 @@
+package bfcodegen
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func writeTestFile(t *testing.T, dir string, name string, content string) string {
+	t.Helper()
+	p := filepath.Join(dir, name)
+	err := os.WriteFile(p, []byte(content), 0o644)
+	tst.AssertNoErr(t, err)
+	return p
+}
+
+func TestProcessIDFileSimple(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package mymodels
+
+type UserID string // @id:type
+type OrderID string // @id:type
+`
+	fp := writeTestFile(t, dir, "models.go", src)
+
+	ids, pkg, err := processIDFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "mymodels")
+	tst.AssertEqual(t, len(ids), 2)
+	tst.AssertEqual(t, ids[0].Name, "UserID")
+	tst.AssertEqual(t, ids[1].Name, "OrderID")
+	tst.AssertEqual(t, ids[0].FileRelative, "models.go")
+}
+
+func TestProcessIDFileNoMatches(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package x
+
+type Foo string
+type Bar int
+type Baz string // not the right marker
+`
+	fp := writeTestFile(t, dir, "x.go", src)
+
+	ids, pkg, err := processIDFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "x")
+	tst.AssertEqual(t, len(ids), 0)
+}
+
+func TestProcessIDFileGeneratedHeaderSkipped(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `// Code generated by id-generate.go DO NOT EDIT.
+
+package x
+
+type SkipMeID string // @id:type
+`
+	fp := writeTestFile(t, dir, "skip.go", src)
+
+	ids, pkg, err := processIDFile(dir, fp, false)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, pkg, "")
+	tst.AssertEqual(t, len(ids), 0)
+}
+
+func TestProcessIDFileMissingFile(t *testing.T) {
+	_, _, err := processIDFile(t.TempDir(), filepath.Join(t.TempDir(), "does_not_exist.go"), false)
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestGenerateIDSpecsEndToEnd(t *testing.T) {
+	dir := t.TempDir()
+
+	src1 := `package models
+
+type UserID string // @id:type
+type AnyID string // @id:type
+`
+	writeTestFile(t, dir, "a_models.go", src1)
+
+	src2 := `package models
+
+type OrderID string // @id:type
+`
+	writeTestFile(t, dir, "b_models.go", src2)
+
+	dest := filepath.Join(dir, "id_gen.go")
+
+	err := GenerateIDSpecs(dir, dest, IDGenOptions{DebugOutput: langext.PFalse})
+	tst.AssertNoErr(t, err)
+
+	out, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+	outStr := string(out)
+
+	tst.AssertTrue(t, strings.Contains(outStr, "package models"))
+	tst.AssertTrue(t, strings.Contains(outStr, "ChecksumIDGenerator"))
+	tst.AssertTrue(t, strings.Contains(outStr, "func NewUserID()"))
+	tst.AssertTrue(t, strings.Contains(outStr, "func NewOrderID()"))
+	tst.AssertTrue(t, strings.Contains(outStr, "func NewAnyID()"))
+	tst.AssertTrue(t, strings.Contains(outStr, "AsAny()"))
+}
+
+func TestGenerateIDSpecsIdempotentWhenUnchanged(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type SomeID string // @id:type
+`
+	writeTestFile(t, dir, "models.go", src)
+	dest := filepath.Join(dir, "id_gen.go")
+
+	err := GenerateIDSpecs(dir, dest, IDGenOptions{})
+	tst.AssertNoErr(t, err)
+
+	stat1, err := os.Stat(dest)
+	tst.AssertNoErr(t, err)
+
+	content1, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+
+	err = GenerateIDSpecs(dir, dest, IDGenOptions{})
+	tst.AssertNoErr(t, err)
+
+	stat2, err := os.Stat(dest)
+	tst.AssertNoErr(t, err)
+
+	content2, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, stat1.ModTime().Equal(stat2.ModTime()), true)
+	tst.AssertEqual(t, string(content1), string(content2))
+}
+
+func TestGenerateIDSpecsRegeneratesAfterChange(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `package models
+
+type FirstID string // @id:type
+`
+	fp := writeTestFile(t, dir, "models.go", src)
+	dest := filepath.Join(dir, "id_gen.go")
+
+	err := GenerateIDSpecs(dir, dest, IDGenOptions{})
+	tst.AssertNoErr(t, err)
+
+	content1, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.Contains(string(content1), "FirstID"))
+	tst.AssertFalse(t, strings.Contains(string(content1), "SecondID"))
+
+	src2 := `package models
+
+type FirstID string // @id:type
+type SecondID string // @id:type
+`
+	err = os.WriteFile(fp, []byte(src2), 0o644)
+	tst.AssertNoErr(t, err)
+
+	err = GenerateIDSpecs(dir, dest, IDGenOptions{})
+	tst.AssertNoErr(t, err)
+
+	content2, err := os.ReadFile(dest)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.Contains(string(content2), "SecondID"))
+}
+
+func TestGenerateIDSpecsErrorsWithoutPackage(t *testing.T) {
+	dir := t.TempDir()
+
+	src := `// Code generated by id-generate.go DO NOT EDIT.
+
+package x
+
+type SkippedID string // @id:type
+`
+	writeTestFile(t, dir, "z.go", src)
+	dest := filepath.Join(dir, "id_gen.go")
+
+	err := GenerateIDSpecs(dir, dest, IDGenOptions{})
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestGenerateIDSpecsMissingDir(t *testing.T) {
+	dir := filepath.Join(t.TempDir(), "definitely-missing")
+	err := GenerateIDSpecs(dir, filepath.Join(dir, "id_gen.go"), IDGenOptions{})
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestFmtIDOutputContainsAllNames(t *testing.T) {
+	ids := []IDDef{
+		{File: "a.go", FileRelative: "a.go", Name: "AlphaID"},
+		{File: "b.go", FileRelative: "b.go", Name: "BetaID"},
+	}
+	out := fmtIDOutput("CHK_ABC", ids, "models")
+	tst.AssertTrue(t, strings.Contains(out, "package models"))
+	tst.AssertTrue(t, strings.Contains(out, "CHK_ABC"))
+	tst.AssertTrue(t, strings.Contains(out, "AlphaID"))
+	tst.AssertTrue(t, strings.Contains(out, "BetaID"))
+}

cmdext/builder.go

@@ -61,12 +61,12 @@ func (r *CommandRunner) Envs(env []string) *CommandRunner {
 }
 
 func (r *CommandRunner) EnsureExitcode(arg ...int) *CommandRunner {
-	r.enforceExitCodes = langext.Ptr(langext.ForceArray(arg))
+	r.enforceExitCodes = new(langext.ForceArray(arg))
 	return r
 }
 
 func (r *CommandRunner) FailOnExitCode() *CommandRunner {
-	r.enforceExitCodes = langext.Ptr([]int{0})
+	r.enforceExitCodes = new([]int{0})
 	return r
 }
 

cmdext/builder_test.go

@@ -0,0 +1,324 @@
+package cmdext
+
+import (
+	"reflect"
+	"testing"
+	"time"
+)
+
+func TestRunnerInit(t *testing.T) {
+	r := Runner("myprog")
+
+	if r == nil {
+		t.Fatalf("Runner returned nil")
+	}
+	if r.program != "myprog" {
+		t.Errorf("program == %v, want myprog", r.program)
+	}
+	if r.args == nil {
+		t.Errorf("args is nil, want empty slice")
+	}
+	if len(r.args) != 0 {
+		t.Errorf("len(args) == %v, want 0", len(r.args))
+	}
+	if r.env == nil {
+		t.Errorf("env is nil, want empty slice")
+	}
+	if len(r.env) != 0 {
+		t.Errorf("len(env) == %v, want 0", len(r.env))
+	}
+	if r.listener == nil {
+		t.Errorf("listener is nil, want empty slice")
+	}
+	if len(r.listener) != 0 {
+		t.Errorf("len(listener) == %v, want 0", len(r.listener))
+	}
+	if r.timeout != nil {
+		t.Errorf("timeout == %v, want nil", r.timeout)
+	}
+	if r.enforceExitCodes != nil {
+		t.Errorf("enforceExitCodes == %v, want nil", r.enforceExitCodes)
+	}
+	if r.enforceNoTimeout {
+		t.Errorf("enforceNoTimeout == true, want false")
+	}
+	if r.enforceNoStderr {
+		t.Errorf("enforceNoStderr == true, want false")
+	}
+}
+
+func TestArgSingle(t *testing.T) {
+	r := Runner("p").Arg("a")
+	if !reflect.DeepEqual(r.args, []string{"a"}) {
+		t.Errorf("args == %v, want [a]", r.args)
+	}
+}
+
+func TestArgMultiple(t *testing.T) {
+	r := Runner("p").Arg("a").Arg("b").Arg("c")
+	if !reflect.DeepEqual(r.args, []string{"a", "b", "c"}) {
+		t.Errorf("args == %v, want [a b c]", r.args)
+	}
+}
+
+func TestArgsAppendsAll(t *testing.T) {
+	r := Runner("p").Args([]string{"x", "y"}).Args([]string{"z"})
+	if !reflect.DeepEqual(r.args, []string{"x", "y", "z"}) {
+		t.Errorf("args == %v, want [x y z]", r.args)
+	}
+}
+
+func TestArgAndArgsMixed(t *testing.T) {
+	r := Runner("p").Arg("a").Args([]string{"b", "c"}).Arg("d")
+	if !reflect.DeepEqual(r.args, []string{"a", "b", "c", "d"}) {
+		t.Errorf("args == %v, want [a b c d]", r.args)
+	}
+}
+
+func TestArgsEmptySlice(t *testing.T) {
+	r := Runner("p").Args([]string{})
+	if len(r.args) != 0 {
+		t.Errorf("len(args) == %v, want 0", len(r.args))
+	}
+}
+
+func TestTimeoutSet(t *testing.T) {
+	d := 500 * time.Millisecond
+	r := Runner("p").Timeout(d)
+	if r.timeout == nil {
+		t.Fatalf("timeout is nil")
+	}
+	if *r.timeout != d {
+		t.Errorf("timeout == %v, want %v", *r.timeout, d)
+	}
+}
+
+func TestTimeoutOverride(t *testing.T) {
+	r := Runner("p").Timeout(1 * time.Second).Timeout(2 * time.Second)
+	if *r.timeout != 2*time.Second {
+		t.Errorf("timeout == %v, want 2s", *r.timeout)
+	}
+}
+
+func TestEnv(t *testing.T) {
+	r := Runner("p").Env("KEY", "VALUE")
+	if !reflect.DeepEqual(r.env, []string{"KEY=VALUE"}) {
+		t.Errorf("env == %v, want [KEY=VALUE]", r.env)
+	}
+}
+
+func TestEnvMultiple(t *testing.T) {
+	r := Runner("p").Env("A", "1").Env("B", "2")
+	if !reflect.DeepEqual(r.env, []string{"A=1", "B=2"}) {
+		t.Errorf("env == %v, want [A=1 B=2]", r.env)
+	}
+}
+
+func TestEnvWithEmptyValue(t *testing.T) {
+	r := Runner("p").Env("KEY", "")
+	if !reflect.DeepEqual(r.env, []string{"KEY="}) {
+		t.Errorf("env == %v, want [KEY=]", r.env)
+	}
+}
+
+func TestRawEnv(t *testing.T) {
+	r := Runner("p").RawEnv("FOO=BAR=BAZ")
+	if !reflect.DeepEqual(r.env, []string{"FOO=BAR=BAZ"}) {
+		t.Errorf("env == %v, want [FOO=BAR=BAZ]", r.env)
+	}
+}
+
+func TestEnvs(t *testing.T) {
+	r := Runner("p").Envs([]string{"A=1", "B=2"})
+	if !reflect.DeepEqual(r.env, []string{"A=1", "B=2"}) {
+		t.Errorf("env == %v, want [A=1 B=2]", r.env)
+	}
+}
+
+func TestEnvMixed(t *testing.T) {
+	r := Runner("p").Env("A", "1").RawEnv("B=2").Envs([]string{"C=3", "D=4"})
+	if !reflect.DeepEqual(r.env, []string{"A=1", "B=2", "C=3", "D=4"}) {
+		t.Errorf("env == %v, want [A=1 B=2 C=3 D=4]", r.env)
+	}
+}
+
+func TestEnsureExitcodeSingle(t *testing.T) {
+	r := Runner("p").EnsureExitcode(2)
+	if r.enforceExitCodes == nil {
+		t.Fatalf("enforceExitCodes is nil")
+	}
+	if !reflect.DeepEqual(*r.enforceExitCodes, []int{2}) {
+		t.Errorf("enforceExitCodes == %v, want [2]", *r.enforceExitCodes)
+	}
+}
+
+func TestEnsureExitcodeMultiple(t *testing.T) {
+	r := Runner("p").EnsureExitcode(0, 1, 2)
+	if r.enforceExitCodes == nil {
+		t.Fatalf("enforceExitCodes is nil")
+	}
+	if !reflect.DeepEqual(*r.enforceExitCodes, []int{0, 1, 2}) {
+		t.Errorf("enforceExitCodes == %v, want [0 1 2]", *r.enforceExitCodes)
+	}
+}
+
+func TestFailOnExitCode(t *testing.T) {
+	r := Runner("p").FailOnExitCode()
+	if r.enforceExitCodes == nil {
+		t.Fatalf("enforceExitCodes is nil")
+	}
+	if !reflect.DeepEqual(*r.enforceExitCodes, []int{0}) {
+		t.Errorf("enforceExitCodes == %v, want [0]", *r.enforceExitCodes)
+	}
+}
+
+func TestFailOnTimeoutFlag(t *testing.T) {
+	r := Runner("p")
+	if r.enforceNoTimeout {
+		t.Errorf("enforceNoTimeout was true before set")
+	}
+	r = r.FailOnTimeout()
+	if !r.enforceNoTimeout {
+		t.Errorf("enforceNoTimeout == false after FailOnTimeout()")
+	}
+}
+
+func TestFailOnStderrFlag(t *testing.T) {
+	r := Runner("p")
+	if r.enforceNoStderr {
+		t.Errorf("enforceNoStderr was true before set")
+	}
+	r = r.FailOnStderr()
+	if !r.enforceNoStderr {
+		t.Errorf("enforceNoStderr == false after FailOnStderr()")
+	}
+}
+
+func TestListen(t *testing.T) {
+	r := Runner("p").Listen(genericCommandListener{})
+	if len(r.listener) != 1 {
+		t.Errorf("len(listener) == %v, want 1", len(r.listener))
+	}
+}
+
+func TestListenMultiple(t *testing.T) {
+	r := Runner("p").
+		Listen(genericCommandListener{}).
+		Listen(genericCommandListener{}).
+		Listen(genericCommandListener{})
+	if len(r.listener) != 3 {
+		t.Errorf("len(listener) == %v, want 3", len(r.listener))
+	}
+}
+
+func TestListenStdoutAddsListener(t *testing.T) {
+	r := Runner("p").ListenStdout(func(string) {})
+	if len(r.listener) != 1 {
+		t.Errorf("len(listener) == %v, want 1", len(r.listener))
+	}
+}
+
+func TestListenStdoutForwardsCalls(t *testing.T) {
+	got := ""
+	r := Runner("p").ListenStdout(func(s string) { got = s })
+	if len(r.listener) != 1 {
+		t.Fatalf("len(listener) == %v, want 1", len(r.listener))
+	}
+	r.listener[0].ReadStdoutLine("hello")
+	if got != "hello" {
+		t.Errorf("listener got %q, want hello", got)
+	}
+	// non-stdout methods should not panic and should not affect state
+	r.listener[0].ReadStderrLine("nope")
+	r.listener[0].ReadRawStdout([]byte("raw"))
+	r.listener[0].ReadRawStderr([]byte("raw"))
+	r.listener[0].Finished(0)
+	r.listener[0].Timeout()
+	if got != "hello" {
+		t.Errorf("listener got mutated to %q, want hello", got)
+	}
+}
+
+func TestListenStderrAddsListener(t *testing.T) {
+	r := Runner("p").ListenStderr(func(string) {})
+	if len(r.listener) != 1 {
+		t.Errorf("len(listener) == %v, want 1", len(r.listener))
+	}
+}
+
+func TestListenStderrForwardsCalls(t *testing.T) {
+	got := ""
+	r := Runner("p").ListenStderr(func(s string) { got = s })
+	if len(r.listener) != 1 {
+		t.Fatalf("len(listener) == %v, want 1", len(r.listener))
+	}
+	r.listener[0].ReadStderrLine("oops")
+	if got != "oops" {
+		t.Errorf("listener got %q, want oops", got)
+	}
+	r.listener[0].ReadStdoutLine("nope")
+	if got != "oops" {
+		t.Errorf("listener got mutated to %q, want oops", got)
+	}
+}
+
+func TestChainReturnsSameInstance(t *testing.T) {
+	r := Runner("p")
+	if r.Arg("a") != r {
+		t.Errorf("Arg returned different instance")
+	}
+	if r.Args([]string{"b"}) != r {
+		t.Errorf("Args returned different instance")
+	}
+	if r.Timeout(time.Second) != r {
+		t.Errorf("Timeout returned different instance")
+	}
+	if r.Env("K", "V") != r {
+		t.Errorf("Env returned different instance")
+	}
+	if r.RawEnv("K=V") != r {
+		t.Errorf("RawEnv returned different instance")
+	}
+	if r.Envs([]string{"K=V"}) != r {
+		t.Errorf("Envs returned different instance")
+	}
+	if r.EnsureExitcode(0) != r {
+		t.Errorf("EnsureExitcode returned different instance")
+	}
+	if r.FailOnExitCode() != r {
+		t.Errorf("FailOnExitCode returned different instance")
+	}
+	if r.FailOnTimeout() != r {
+		t.Errorf("FailOnTimeout returned different instance")
+	}
+	if r.FailOnStderr() != r {
+		t.Errorf("FailOnStderr returned different instance")
+	}
+	if r.Listen(genericCommandListener{}) != r {
+		t.Errorf("Listen returned different instance")
+	}
+	if r.ListenStdout(func(string) {}) != r {
+		t.Errorf("ListenStdout returned different instance")
+	}
+	if r.ListenStderr(func(string) {}) != r {
+		t.Errorf("ListenStderr returned different instance")
+	}
+}
+
+func TestSeparateInstancesIndependent(t *testing.T) {
+	r1 := Runner("p1").Arg("a")
+	r2 := Runner("p2").Arg("b")
+
+	if r1.program != "p1" {
+		t.Errorf("r1.program == %v, want p1", r1.program)
+	}
+	if r2.program != "p2" {
+		t.Errorf("r2.program == %v, want p2", r2.program)
+	}
+	if !reflect.DeepEqual(r1.args, []string{"a"}) {
+		t.Errorf("r1.args == %v, want [a]", r1.args)
+	}
+	if !reflect.DeepEqual(r2.args, []string{"b"}) {
+		t.Errorf("r2.args == %v, want [b]", r2.args)
+	}
+}

cmdext/cmdrunner.go

@@ -37,7 +37,7 @@ func run(opt CommandRunner) (CommandResult, error) {
 	}
 
 	preader := pipeReader{
-		lineBufferSize: langext.Ptr(128 * 1024 * 1024), // 128MB max size of a single line, is hopefully enough....
+		lineBufferSize: new(128 * 1024 * 1024), // 128MB max size of a single line, is hopefully enough....
 		stdout:         stdoutPipe,
 		stderr:         stderrPipe,
 	}
@@ -66,7 +66,7 @@ func run(opt CommandRunner) (CommandResult, error) {
 
 		if opt.enforceNoStderr {
 			listener = append(listener, genericCommandListener{
-				_readRawStderr: langext.Ptr(func(v []byte) {
+				_readRawStderr: new(func(v []byte) {
 					if len(v) > 0 {
 						stderrFailChan <- true
 					}

cmdext/listener_test.go

@@ -0,0 +1,143 @@
+package cmdext
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestGenericListenerEmptyDoesNotPanic(t *testing.T) {
+	l := genericCommandListener{}
+	l.ReadRawStdout([]byte("x"))
+	l.ReadRawStderr([]byte("x"))
+	l.ReadStdoutLine("x")
+	l.ReadStderrLine("x")
+	l.Finished(0)
+	l.Timeout()
+}
+
+func TestGenericListenerReadRawStdout(t *testing.T) {
+	var got []byte
+	fn := func(b []byte) { got = append(got, b...) }
+	l := genericCommandListener{_readRawStdout: &fn}
+
+	l.ReadRawStdout([]byte("hello"))
+	l.ReadRawStdout([]byte(" world"))
+
+	if string(got) != "hello world" {
+		t.Errorf("got %q, want %q", string(got), "hello world")
+	}
+}
+
+func TestGenericListenerReadRawStderr(t *testing.T) {
+	var got []byte
+	fn := func(b []byte) { got = append(got, b...) }
+	l := genericCommandListener{_readRawStderr: &fn}
+
+	l.ReadRawStderr([]byte("err"))
+
+	if string(got) != "err" {
+		t.Errorf("got %q, want %q", string(got), "err")
+	}
+}
+
+func TestGenericListenerReadStdoutLine(t *testing.T) {
+	var got []string
+	fn := func(s string) { got = append(got, s) }
+	l := genericCommandListener{_readStdoutLine: &fn}
+
+	l.ReadStdoutLine("line1")
+	l.ReadStdoutLine("line2")
+
+	if !reflect.DeepEqual(got, []string{"line1", "line2"}) {
+		t.Errorf("got %v, want [line1 line2]", got)
+	}
+}
+
+func TestGenericListenerReadStderrLine(t *testing.T) {
+	var got []string
+	fn := func(s string) { got = append(got, s) }
+	l := genericCommandListener{_readStderrLine: &fn}
+
+	l.ReadStderrLine("line1")
+	l.ReadStderrLine("line2")
+
+	if !reflect.DeepEqual(got, []string{"line1", "line2"}) {
+		t.Errorf("got %v, want [line1 line2]", got)
+	}
+}
+
+func TestGenericListenerFinished(t *testing.T) {
+	var got int
+	called := false
+	fn := func(v int) { got = v; called = true }
+	l := genericCommandListener{_finished: &fn}
+
+	l.Finished(42)
+
+	if !called {
+		t.Errorf("Finished callback was not called")
+	}
+	if got != 42 {
+		t.Errorf("got %v, want 42", got)
+	}
+}
+
+func TestGenericListenerTimeout(t *testing.T) {
+	called := false
+	fn := func() { called = true }
+	l := genericCommandListener{_timeout: &fn}
+
+	l.Timeout()
+
+	if !called {
+		t.Errorf("Timeout callback was not called")
+	}
+}
+
+func TestGenericListenerOnlySpecifiedCalled(t *testing.T) {
+	stdoutCalled := false
+	stderrCalled := false
+	stdoutFn := func(string) { stdoutCalled = true }
+	stderrFn := func(string) { stderrCalled = true }
+	l := genericCommandListener{_readStdoutLine: &stdoutFn, _readStderrLine: &stderrFn}
+
+	l.ReadStdoutLine("x")
+	if !stdoutCalled {
+		t.Errorf("stdout callback not called")
+	}
+	if stderrCalled {
+		t.Errorf("stderr callback called when it shouldn't be")
+	}
+
+	stdoutCalled = false
+	l.ReadStderrLine("x")
+	if stdoutCalled {
+		t.Errorf("stdout callback called when it shouldn't be")
+	}
+	if !stderrCalled {
+		t.Errorf("stderr callback not called")
+	}
+
+	// these have no callbacks set; should be no-ops
+	l.ReadRawStdout([]byte("x"))
+	l.ReadRawStderr([]byte("x"))
+	l.Finished(0)
+	l.Timeout()
+}
+
+func TestGenericListenerImplementsCommandListener(t *testing.T) {
+	var _ CommandListener = genericCommandListener{}
+}
+
+func TestGenericListenerEmptyByteSlice(t *testing.T) {
+	calls := 0
+	fn := func(b []byte) { calls++ }
+	l := genericCommandListener{_readRawStdout: &fn}
+
+	l.ReadRawStdout([]byte{})
+	l.ReadRawStdout(nil)
+
+	if calls != 2 {
+		t.Errorf("calls == %v, want 2", calls)
+	}
+}

cmdext/pipereader.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
 	"io"
+	"strings"
 	"sync"
 )
 
@@ -29,14 +30,14 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 
 	wg.Add(1)
 	stdoutBufferReader, stdoutBufferWriter := io.Pipe()
-	stdout := ""
+	var stdout strings.Builder
 	go func() {
 		buf := make([]byte, 128)
 		for {
 			n, err := pr.stdout.Read(buf)
 			if n > 0 {
 				txt := string(buf[:n])
-				stdout += txt
+				stdout.WriteString(txt)
 				_, _ = stdoutBufferWriter.Write(buf[:n])
 				for _, lstr := range listener {
 					lstr.ReadRawStdout(buf[:n])
@@ -58,7 +59,7 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 
 	wg.Add(1)
 	stderrBufferReader, stderrBufferWriter := io.Pipe()
-	stderr := ""
+	var stderr strings.Builder
 	go func() {
 		buf := make([]byte, 128)
 		for {
@@ -66,7 +67,7 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 
 			if n > 0 {
 				txt := string(buf[:n])
-				stderr += txt
+				stderr.WriteString(txt)
 				_, _ = stderrBufferWriter.Write(buf[:n])
 				for _, lstr := range listener {
 					lstr.ReadRawStderr(buf[:n])
@@ -88,8 +89,7 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 
 	// [3] collect stdout line-by-line
 
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		scanner := bufio.NewScanner(stdoutBufferReader)
 		if pr.lineBufferSize != nil {
 			scanner.Buffer([]byte{}, *pr.lineBufferSize)
@@ -105,13 +105,11 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 			errch <- err
 		}
 		combch <- combevt{"", true}
-		wg.Done()
-	}()
+	})
 
 	// [4] collect stderr line-by-line
 
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		scanner := bufio.NewScanner(stderrBufferReader)
 		if pr.lineBufferSize != nil {
 			scanner.Buffer([]byte{}, *pr.lineBufferSize)
@@ -127,13 +125,12 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 			errch <- err
 		}
 		combch <- combevt{"", true}
-		wg.Done()
-	}()
+	})
 
 	// [5] combine stdcombined
 
 	wg.Add(1)
-	stdcombined := ""
+	var stdcombined strings.Builder
 	go func() {
 		stopctr := 0
 		for stopctr < 2 {
@@ -141,7 +138,7 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 			if vvv.stop {
 				stopctr++
 			} else {
-				stdcombined += vvv.line + "\n" // this comes from bufio.Scanner and has no newlines...
+				stdcombined.WriteString(vvv.line + "\n") // this comes from bufio.Scanner and has no newlines...
 			}
 		}
 		wg.Done()
@@ -154,5 +151,5 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 		return "", "", "", err
 	}
 
-	return stdout, stderr, stdcombined, nil
+	return stdout.String(), stderr.String(), stdcombined.String(), nil
 }

confext/confParser.go

@@ -101,11 +101,11 @@ func processEnvOverrides(rval reflect.Value, delim string, prefix string) error
 }
 
 func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (reflect.Value, error) {
-	if rvtype == reflect.TypeOf("") {
+	if rvtype == reflect.TypeFor[string]() {
 
 		return reflect.ValueOf(envval), nil
 
-	} else if rvtype == reflect.TypeOf(int(0)) {
+	} else if rvtype == reflect.TypeFor[int]() {
 
 		envint, err := strconv.ParseInt(envval, 10, bits.UintSize)
 		if err != nil {
@@ -114,7 +114,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 
 		return reflect.ValueOf(int(envint)), nil
 
-	} else if rvtype == reflect.TypeOf(int64(0)) {
+	} else if rvtype == reflect.TypeFor[int64]() {
 
 		envint, err := strconv.ParseInt(envval, 10, 64)
 		if err != nil {
@@ -123,7 +123,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 
 		return reflect.ValueOf(int64(envint)), nil
 
-	} else if rvtype == reflect.TypeOf(int32(0)) {
+	} else if rvtype == reflect.TypeFor[int32]() {
 
 		envint, err := strconv.ParseInt(envval, 10, 32)
 		if err != nil {
@@ -132,7 +132,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 
 		return reflect.ValueOf(int32(envint)), nil
 
-	} else if rvtype == reflect.TypeOf(int8(0)) {
+	} else if rvtype == reflect.TypeFor[int8]() {
 
 		envint, err := strconv.ParseInt(envval, 10, 8)
 		if err != nil {
@@ -141,7 +141,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 
 		return reflect.ValueOf(int8(envint)), nil
 
-	} else if rvtype == reflect.TypeOf(time.Duration(0)) {
+	} else if rvtype == reflect.TypeFor[time.Duration]() {
 
 		dur, err := timeext.ParseDurationShortString(envval)
 		if err != nil {
@@ -159,7 +159,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 
 		return reflect.ValueOf(tim), nil
 
-	} else if rvtype.ConvertibleTo(reflect.TypeOf(int(0))) {
+	} else if rvtype.ConvertibleTo(reflect.TypeFor[int]()) {
 
 		envint, err := strconv.ParseInt(envval, 10, 8)
 		if err != nil {
@@ -170,7 +170,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 
 		return envcvl, nil
 
-	} else if rvtype.ConvertibleTo(reflect.TypeOf(false)) {
+	} else if rvtype.ConvertibleTo(reflect.TypeFor[bool]()) {
 
 		if strings.TrimSpace(strings.ToLower(envval)) == "true" {
 			return reflect.ValueOf(true).Convert(rvtype), nil
@@ -184,7 +184,7 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 			return reflect.Value{}, errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to <%s, ,bool> (value := '%s')", rvtype.Name(), fullEnvKey, envval))
 		}
 
-	} else if rvtype.ConvertibleTo(reflect.TypeOf("")) {
+	} else if rvtype.ConvertibleTo(reflect.TypeFor[string]()) {
 
 		envcvl := reflect.ValueOf(envval).Convert(rvtype)
 		return envcvl, nil

confext/confParser_extra_test.go

@@ -0,0 +1,390 @@
+package confext
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"testing"
+	"time"
+)
+
+func TestApplyEnvOverridesPrefix(t *testing.T) {
+	type testdata struct {
+		V1 int    `env:"V1"`
+		V2 string `env:"V2"`
+	}
+
+	data := testdata{V1: 1, V2: "x"}
+
+	t.Setenv("MYAPP_V1", "42")
+	t.Setenv("MYAPP_V2", "hello")
+	t.Setenv("V1", "111")
+	t.Setenv("V2", "noprefix")
+
+	err := ApplyEnvOverrides("MYAPP_", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.V1, 42)
+	tst.AssertEqual(t, data.V2, "hello")
+}
+
+func TestApplyEnvOverridesUnexportedFieldsIgnored(t *testing.T) {
+	type testdata struct {
+		V1 int `env:"TEST_V1"`
+		v2 int `env:"TEST_V2"`
+	}
+
+	data := testdata{V1: 1, v2: 2}
+
+	t.Setenv("TEST_V1", "11")
+	t.Setenv("TEST_V2", "22")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.V1, 11)
+	tst.AssertEqual(t, data.v2, 2)
+}
+
+func TestApplyEnvOverridesNoEnvTagIgnored(t *testing.T) {
+	type testdata struct {
+		V1 int `env:"TEST_V1"`
+		V2 int ``
+	}
+
+	data := testdata{V1: 1, V2: 2}
+
+	t.Setenv("TEST_V1", "11")
+	t.Setenv("V2", "22")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.V1, 11)
+	tst.AssertEqual(t, data.V2, 2)
+}
+
+func TestApplyEnvOverridesDashTagIgnored(t *testing.T) {
+	type testdata struct {
+		V1 int    `env:"TEST_V1"`
+		V2 string `env:"-"`
+	}
+
+	data := testdata{V1: 1, V2: "no"}
+
+	t.Setenv("TEST_V1", "11")
+	t.Setenv("-", "yes")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.V1, 11)
+	tst.AssertEqual(t, data.V2, "no")
+}
+
+func TestApplyEnvOverridesEnvNotSetKeepsValue(t *testing.T) {
+	type testdata struct {
+		V1 int    `env:"NOT_SET_INT_KEY_XYZ"`
+		V2 string `env:"NOT_SET_STR_KEY_XYZ"`
+	}
+
+	data := testdata{V1: 7, V2: "keep"}
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.V1, 7)
+	tst.AssertEqual(t, data.V2, "keep")
+}
+
+func TestApplyEnvOverridesBoolVariants(t *testing.T) {
+	type testdata struct {
+		B1 bool `env:"B1"`
+		B2 bool `env:"B2"`
+		B3 bool `env:"B3"`
+		B4 bool `env:"B4"`
+		B5 bool `env:"B5"`
+		B6 bool `env:"B6"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("B1", "true")
+	t.Setenv("B2", "false")
+	t.Setenv("B3", "1")
+	t.Setenv("B4", "0")
+	t.Setenv("B5", "  TRUE  ")
+	t.Setenv("B6", "FaLsE")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.B1, true)
+	tst.AssertEqual(t, data.B2, false)
+	tst.AssertEqual(t, data.B3, true)
+	tst.AssertEqual(t, data.B4, false)
+	tst.AssertEqual(t, data.B5, true)
+	tst.AssertEqual(t, data.B6, false)
+}
+
+func TestApplyEnvOverridesInvalidIntReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 int `env:"BAD_INT"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_INT", "not_a_number")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid int, got nil")
+	}
+}
+
+func TestApplyEnvOverridesInvalidInt8ReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 int8 `env:"BAD_INT8"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_INT8", "9999")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid int8, got nil")
+	}
+}
+
+func TestApplyEnvOverridesInvalidInt32ReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 int32 `env:"BAD_INT32"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_INT32", "not_an_int32")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid int32, got nil")
+	}
+}
+
+func TestApplyEnvOverridesInvalidInt64ReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 int64 `env:"BAD_INT64"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_INT64", "not_an_int64")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid int64, got nil")
+	}
+}
+
+func TestApplyEnvOverridesInvalidDurationReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 time.Duration `env:"BAD_DUR"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_DUR", "not_a_duration")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid duration, got nil")
+	}
+}
+
+func TestApplyEnvOverridesInvalidTimeReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 time.Time `env:"BAD_TIME"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_TIME", "not_a_time")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid time, got nil")
+	}
+}
+
+func TestApplyEnvOverridesInvalidBoolReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 bool `env:"BAD_BOOL"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("BAD_BOOL", "yesno")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid bool, got nil")
+	}
+}
+
+func TestApplyEnvOverridesUnsupportedTypeReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 []int `env:"UNSUPPORTED"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("UNSUPPORTED", "1,2,3")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for unsupported type, got nil")
+	}
+}
+
+func TestApplyEnvOverridesFloatUnsupportedReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 float64 `env:"UNSUPPORTED_FLOAT"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("UNSUPPORTED_FLOAT", "1.5")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for float64, got nil")
+	}
+}
+
+func TestApplyEnvOverridesPointerInvalidReturnsError(t *testing.T) {
+	type testdata struct {
+		V1 *int `env:"PTR_BAD_INT"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("PTR_BAD_INT", "not_a_number")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error for invalid pointer int, got nil")
+	}
+}
+
+func TestApplyEnvOverridesPointerNotSetStaysNil(t *testing.T) {
+	type testdata struct {
+		V1 *int    `env:"PTR_NOT_SET_KEY_ABC"`
+		V2 *string `env:"PTR_NOT_SET_KEY_DEF"`
+	}
+
+	data := testdata{}
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	if data.V1 != nil {
+		t.Errorf("expected V1 to remain nil, got %v", *data.V1)
+	}
+	if data.V2 != nil {
+		t.Errorf("expected V2 to remain nil, got %v", *data.V2)
+	}
+}
+
+func TestApplyEnvOverridesAliasBool(t *testing.T) {
+	type aliasbool bool
+
+	type testdata struct {
+		V1 aliasbool `env:"ALIAS_BOOL"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("ALIAS_BOOL", "true")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.V1, aliasbool(true))
+}
+
+func TestApplyEnvOverridesNestedRecursiveError(t *testing.T) {
+	type subdata struct {
+		V1 int `env:"V1"`
+	}
+	type testdata struct {
+		Sub subdata `env:"SUB"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("SUB.V1", "not_a_number")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	if err == nil {
+		t.Errorf("expected error from nested struct invalid value, got nil")
+	}
+}
+
+func TestApplyEnvOverridesTimeFieldInsideStructIsParsed(t *testing.T) {
+	type testdata struct {
+		T time.Time `env:"MYTIME"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("MYTIME", "2023-01-02T03:04:05Z")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.T.Equal(time.Date(2023, 1, 2, 3, 4, 5, 0, time.UTC)), true)
+}
+
+func TestApplyEnvOverridesPointerStringAlias(t *testing.T) {
+	type aliasstr string
+
+	type testdata struct {
+		V1 *aliasstr `env:"PTR_ALIAS_STR"`
+	}
+
+	data := testdata{}
+
+	t.Setenv("PTR_ALIAS_STR", "hello")
+
+	err := ApplyEnvOverrides("", &data, ".")
+	tst.AssertNoErr(t, err)
+
+	if data.V1 == nil {
+		t.Fatalf("expected V1 to be set")
+	}
+	tst.AssertEqual(t, *data.V1, aliasstr("hello"))
+}
+
+func TestApplyEnvOverridesEmptyEnvTagOnSubstruct(t *testing.T) {
+	type subdata struct {
+		V1 int `env:"INNER"`
+	}
+	type testdata struct {
+		Sub subdata `env:""`
+	}
+
+	data := testdata{}
+
+	t.Setenv("INNER", "55")
+
+	err := ApplyEnvOverrides("PRE_", &data, "_")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.Sub.V1, 0)
+
+	t.Setenv("PRE_INNER", "77")
+
+	err = ApplyEnvOverrides("PRE_", &data, "_")
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, data.Sub.V1, 77)
+}

cryptext/aes_additional_test.go

@@ -0,0 +1,139 @@
+package cryptext
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"strings"
+	"testing"
+)
+
+func TestAESSimpleEmptyData(t *testing.T) {
+	pw := []byte("password")
+	enc, err := EncryptAESSimple(pw, []byte{}, 256)
+	tst.AssertNoErr(t, err)
+	tst.AssertNotEqual(t, enc, "")
+
+	dec, err := DecryptAESSimple(pw, enc)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, len(dec), 0)
+}
+
+func TestAESSimpleEmptyPassword(t *testing.T) {
+	pw := []byte{}
+	plain := []byte("some content")
+
+	enc, err := EncryptAESSimple(pw, plain, 256)
+	tst.AssertNoErr(t, err)
+
+	dec, err := DecryptAESSimple(pw, enc)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(dec), string(plain))
+}
+
+func TestAESSimpleWrongPassword(t *testing.T) {
+	plain := []byte("Hello World")
+	enc, err := EncryptAESSimple([]byte("right"), plain, 256)
+	tst.AssertNoErr(t, err)
+
+	_, err = DecryptAESSimple([]byte("wrong"), enc)
+	if err == nil {
+		t.Errorf("expected error when decrypting with wrong password")
+	}
+}
+
+func TestAESSimpleInvalidBase32(t *testing.T) {
+	_, err := DecryptAESSimple([]byte("pw"), "!!!not-base32!!!")
+	if err == nil {
+		t.Errorf("expected error on invalid base32 input")
+	}
+}
+
+func TestAESSimpleInvalidJSON(t *testing.T) {
+	// "AAAAAAAA" decodes to valid base32 but not valid JSON
+	_, err := DecryptAESSimple([]byte("pw"), "AAAAAAAA")
+	if err == nil {
+		t.Errorf("expected error on invalid JSON payload")
+	}
+}
+
+func TestAESSimpleEmptyEncText(t *testing.T) {
+	_, err := DecryptAESSimple([]byte("pw"), "")
+	if err == nil {
+		t.Errorf("expected error on empty text")
+	}
+}
+
+func TestAESSimpleLargeData(t *testing.T) {
+	pw := []byte("hunter12")
+	plain := []byte(strings.Repeat("ABCDEFGHIJ", 1024))
+
+	enc, err := EncryptAESSimple(pw, plain, 256)
+	tst.AssertNoErr(t, err)
+
+	dec, err := DecryptAESSimple(pw, enc)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(dec), string(plain))
+}
+
+func TestAESSimpleBinaryData(t *testing.T) {
+	pw := []byte("hunter12")
+	plain := []byte{0x00, 0x01, 0x02, 0x7F, 0x80, 0xFE, 0xFF, 0x00, 0xAA, 0x55}
+
+	enc, err := EncryptAESSimple(pw, plain, 256)
+	tst.AssertNoErr(t, err)
+
+	dec, err := DecryptAESSimple(pw, enc)
+	tst.AssertNoErr(t, err)
+	tst.AssertArrayEqual(t, dec, plain)
+}
+
+func TestAESSimpleDifferentRoundsForEachCall(t *testing.T) {
+	pw := []byte("hunter12")
+	plain := []byte("Hello")
+
+	enc1, err := EncryptAESSimple(pw, plain, 256)
+	tst.AssertNoErr(t, err)
+
+	enc2, err := EncryptAESSimple(pw, plain, 256)
+	tst.AssertNoErr(t, err)
+
+	// Two separate encrypt calls on same plaintext should differ (random salt + IV)
+	tst.AssertNotEqual(t, enc1, enc2)
+
+	// Both should decrypt back to the same plaintext
+	d1, err := DecryptAESSimple(pw, enc1)
+	tst.AssertNoErr(t, err)
+	d2, err := DecryptAESSimple(pw, enc2)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(d1), string(plain))
+	tst.AssertEqual(t, string(d2), string(plain))
+}
+
+func TestAESSimpleVariableRounds(t *testing.T) {
+	pw := []byte("hunter12")
+	plain := []byte("rounds-test")
+
+	for _, r := range []int{16, 32, 64, 128, 256, 512, 1024} {
+		enc, err := EncryptAESSimple(pw, plain, r)
+		tst.AssertNoErr(t, err)
+		dec, err := DecryptAESSimple(pw, enc)
+		tst.AssertNoErr(t, err)
+		tst.AssertEqual(t, string(dec), string(plain))
+	}
+}
+
+func TestAESSimpleResultIsBase32(t *testing.T) {
+	pw := []byte("hunter12")
+	plain := []byte("Hello World")
+
+	enc, err := EncryptAESSimple(pw, plain, 64)
+	tst.AssertNoErr(t, err)
+
+	for _, c := range enc {
+		isUpper := c >= 'A' && c <= 'Z'
+		isDigit := c >= '2' && c <= '7'
+		if !(isUpper || isDigit) {
+			t.Errorf("non-base32 character %q in output", c)
+			break
+		}
+	}
+}

cryptext/hash_additional_test.go

@@ -0,0 +1,54 @@
+package cryptext
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"strings"
+	"testing"
+)
+
+func TestStrSha256SameAsBytesSha256(t *testing.T) {
+	inputs := []string{"", "a", "Hello World", "lorem ipsum dolor sit amet", "🎉 unicode"}
+	for _, in := range inputs {
+		tst.AssertEqual(t, StrSha256(in), BytesSha256([]byte(in)))
+	}
+}
+
+func TestStrSha256Length(t *testing.T) {
+	// SHA-256 hex output must always be 64 characters
+	tst.AssertEqual(t, len(StrSha256("")), 64)
+	tst.AssertEqual(t, len(StrSha256("x")), 64)
+	tst.AssertEqual(t, len(StrSha256(strings.Repeat("x", 10000))), 64)
+}
+
+func TestStrSha256Deterministic(t *testing.T) {
+	v := "deterministic input"
+	a := StrSha256(v)
+	b := StrSha256(v)
+	tst.AssertEqual(t, a, b)
+}
+
+func TestStrSha256DifferentInputs(t *testing.T) {
+	tst.AssertNotEqual(t, StrSha256("a"), StrSha256("b"))
+	tst.AssertNotEqual(t, StrSha256("Hello"), StrSha256("hello"))
+	tst.AssertNotEqual(t, StrSha256("Hello World"), StrSha256("Hello World "))
+}
+
+func TestStrSha256IsHex(t *testing.T) {
+	out := StrSha256("anything")
+	for _, c := range out {
+		isLowerHex := (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')
+		if !isLowerHex {
+			t.Errorf("non-hex char %q in StrSha256 output", c)
+			return
+		}
+	}
+}
+
+func TestBytesSha256NilSameAsEmpty(t *testing.T) {
+	tst.AssertEqual(t, BytesSha256(nil), BytesSha256([]byte{}))
+}
+
+func TestBytesSha256KnownVectors(t *testing.T) {
+	// "abc" => sha-256 standard vector
+	tst.AssertEqual(t, StrSha256("abc"), "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+}

cryptext/passHash_additional_test.go

@@ -0,0 +1,379 @@
+package cryptext
+
+import (
+	"encoding/json"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"strings"
+	"testing"
+)
+
+func TestPassHashInvalidEmpty(t *testing.T) {
+	ph := PassHash("")
+	tst.AssertFalse(t, ph.Valid())
+	tst.AssertFalse(t, ph.HasTOTP())
+	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
+}
+
+func TestPassHashInvalidGarbage(t *testing.T) {
+	for _, raw := range []string{
+		"garbage",
+		"99|nope",
+		"abc|payload",
+		"3|onlytwo",
+		"4|onlytwo",
+		"5|onlytwo",
+		"2|notbase64!|notbase64!",
+		"1|!!!notbase64!!!",
+		"3|!!notb64|!!notb64|0",
+		"3|abc|!!notb64|0",
+	} {
+		ph := PassHash(raw)
+		if ph.Valid() {
+			t.Errorf("expected %q to be invalid", raw)
+		}
+	}
+}
+
+func TestPassHashVerifyInvalid(t *testing.T) {
+	ph := PassHash("garbage-value")
+	tst.AssertFalse(t, ph.Verify("anything", nil))
+}
+
+func TestPassHashUpgradeInvalid(t *testing.T) {
+	ph := PassHash("garbage-value")
+	_, err := ph.Upgrade("anything")
+	if err == nil {
+		t.Errorf("expected error for invalid PassHash upgrade")
+	}
+}
+
+func TestPassHashStringRoundtrip(t *testing.T) {
+	ph, err := HashPassword("hunter2", nil)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, ph.String(), string(ph))
+}
+
+func TestPassHashMarshalJSONEmpty(t *testing.T) {
+	ph := PassHash("")
+	data, err := json.Marshal(ph)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(data), `""`)
+}
+
+func TestPassHashMarshalJSONMasked(t *testing.T) {
+	ph, err := HashPassword("hunter2", nil)
+	tst.AssertNoErr(t, err)
+	data, err := json.Marshal(ph)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(data), `"*****"`)
+}
+
+func TestPassHashDataV0(t *testing.T) {
+	ph, err := HashPasswordV0("test123")
+	tst.AssertNoErr(t, err)
+
+	v, seed, payload, hastotp, totpsecret, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, 0)
+	tst.AssertEqual(t, len(seed), 0)
+	tst.AssertEqual(t, string(payload), "test123")
+	tst.AssertFalse(t, hastotp)
+	tst.AssertEqual(t, len(totpsecret), 0)
+}
+
+func TestPassHashDataV1(t *testing.T) {
+	ph, err := HashPasswordV1("test123")
+	tst.AssertNoErr(t, err)
+
+	v, seed, payload, hastotp, _, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, 1)
+	tst.AssertEqual(t, len(seed), 0)
+	tst.AssertEqual(t, len(payload), 32) // sha-256 is 32 bytes
+	tst.AssertFalse(t, hastotp)
+}
+
+func TestPassHashDataV2(t *testing.T) {
+	ph, err := HashPasswordV2("test123")
+	tst.AssertNoErr(t, err)
+
+	v, seed, payload, hastotp, _, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, 2)
+	tst.AssertEqual(t, len(seed), 32)
+	tst.AssertEqual(t, len(payload), 32)
+	tst.AssertFalse(t, hastotp)
+}
+
+func TestPassHashDataV3(t *testing.T) {
+	ph, err := HashPasswordV3("test123", nil)
+	tst.AssertNoErr(t, err)
+
+	v, seed, payload, hastotp, _, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, 3)
+	tst.AssertEqual(t, len(seed), 32)
+	tst.AssertEqual(t, len(payload), 32)
+	tst.AssertFalse(t, hastotp)
+}
+
+func TestPassHashDataV4(t *testing.T) {
+	ph, err := HashPasswordV4("test123", nil)
+	tst.AssertNoErr(t, err)
+
+	v, _, _, hastotp, _, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, 4)
+	tst.AssertFalse(t, hastotp)
+}
+
+func TestPassHashDataV5(t *testing.T) {
+	ph, err := HashPasswordV5("test123", nil)
+	tst.AssertNoErr(t, err)
+
+	v, _, _, hastotp, _, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, 5)
+	tst.AssertFalse(t, hastotp)
+}
+
+func TestPassHashLatestIsV5(t *testing.T) {
+	ph, err := HashPassword("test", nil)
+	tst.AssertNoErr(t, err)
+	v, _, _, _, _, valid := ph.Data()
+	tst.AssertTrue(t, valid)
+	tst.AssertEqual(t, v, LatestPassHashVersion)
+	tst.AssertEqual(t, v, 5)
+}
+
+func TestPassHashUpgradeLatestIsNoop(t *testing.T) {
+	ph, err := HashPassword("test", nil)
+	tst.AssertNoErr(t, err)
+
+	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
+
+	ph2, err := ph.Upgrade("test")
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(ph), string(ph2))
+}
+
+func TestPassHashClearTOTPInvalid(t *testing.T) {
+	_, err := PassHash("garbage").ClearTOTP()
+	if err == nil {
+		t.Errorf("expected error from ClearTOTP on invalid")
+	}
+}
+
+func TestPassHashClearTOTPV0V1V2Noop(t *testing.T) {
+	ph0, _ := HashPasswordV0("x")
+	r0, err := ph0.ClearTOTP()
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(r0), string(ph0))
+
+	ph1, _ := HashPasswordV1("x")
+	r1, err := ph1.ClearTOTP()
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(r1), string(ph1))
+
+	ph2, _ := HashPasswordV2("x")
+	r2, err := ph2.ClearTOTP()
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(r2), string(ph2))
+}
+
+func TestPassHashClearTOTPV3(t *testing.T) {
+	secret := []byte{0x01, 0x02, 0x03}
+	ph, err := HashPasswordV3("test123", secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, ph.HasTOTP())
+
+	cleared, err := ph.ClearTOTP()
+	tst.AssertNoErr(t, err)
+	tst.AssertFalse(t, cleared.HasTOTP())
+	tst.AssertTrue(t, cleared.Valid())
+	tst.AssertTrue(t, cleared.Verify("test123", nil))
+}
+
+func TestPassHashClearTOTPV4(t *testing.T) {
+	secret := []byte{0x01, 0x02, 0x03}
+	ph, err := HashPasswordV4("test123", secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, ph.HasTOTP())
+
+	cleared, err := ph.ClearTOTP()
+	tst.AssertNoErr(t, err)
+	tst.AssertFalse(t, cleared.HasTOTP())
+	tst.AssertTrue(t, cleared.Verify("test123", nil))
+}
+
+func TestPassHashClearTOTPV5(t *testing.T) {
+	secret := []byte{0x01, 0x02, 0x03}
+	ph, err := HashPasswordV5("test123", secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, ph.HasTOTP())
+
+	cleared, err := ph.ClearTOTP()
+	tst.AssertNoErr(t, err)
+	tst.AssertFalse(t, cleared.HasTOTP())
+	tst.AssertTrue(t, cleared.Verify("test123", nil))
+}
+
+func TestPassHashWithTOTPInvalid(t *testing.T) {
+	_, err := PassHash("garbage").WithTOTP([]byte{0x01})
+	if err == nil {
+		t.Errorf("expected error for WithTOTP on invalid")
+	}
+}
+
+func TestPassHashWithTOTPV0V1V2Errors(t *testing.T) {
+	ph0, _ := HashPasswordV0("x")
+	if _, err := ph0.WithTOTP([]byte{0x01}); err == nil {
+		t.Errorf("expected v0 not to support TOTP")
+	}
+	ph1, _ := HashPasswordV1("x")
+	if _, err := ph1.WithTOTP([]byte{0x01}); err == nil {
+		t.Errorf("expected v1 not to support TOTP")
+	}
+	ph2, _ := HashPasswordV2("x")
+	if _, err := ph2.WithTOTP([]byte{0x01}); err == nil {
+		t.Errorf("expected v2 not to support TOTP")
+	}
+}
+
+func TestPassHashWithTOTPV3V4V5(t *testing.T) {
+	secret := []byte{0xDE, 0xAD, 0xBE, 0xEF}
+
+	ph3, _ := HashPasswordV3("pw", nil)
+	tst.AssertFalse(t, ph3.HasTOTP())
+	r3, err := ph3.WithTOTP(secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, r3.HasTOTP())
+
+	ph4, _ := HashPasswordV4("pw", nil)
+	tst.AssertFalse(t, ph4.HasTOTP())
+	r4, err := ph4.WithTOTP(secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, r4.HasTOTP())
+
+	ph5, _ := HashPasswordV5("pw", nil)
+	tst.AssertFalse(t, ph5.HasTOTP())
+	r5, err := ph5.WithTOTP(secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, r5.HasTOTP())
+}
+
+func TestPassHashChangeInvalid(t *testing.T) {
+	_, err := PassHash("garbage").Change("new-pw")
+	if err == nil {
+		t.Errorf("expected error from Change on invalid")
+	}
+}
+
+func TestPassHashChangeKeepsVersion(t *testing.T) {
+	cases := []struct {
+		name    string
+		hashed  func() (PassHash, error)
+		version int
+	}{
+		{"V0", func() (PassHash, error) { return HashPasswordV0("old") }, 0},
+		{"V1", func() (PassHash, error) { return HashPasswordV1("old") }, 1},
+		{"V2", func() (PassHash, error) { return HashPasswordV2("old") }, 2},
+		{"V3", func() (PassHash, error) { return HashPasswordV3("old", nil) }, 3},
+		{"V4", func() (PassHash, error) { return HashPasswordV4("old", nil) }, 4},
+		{"V5", func() (PassHash, error) { return HashPasswordV5("old", nil) }, 5},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			ph, err := c.hashed()
+			tst.AssertNoErr(t, err)
+
+			changed, err := ph.Change("new-pw")
+			tst.AssertNoErr(t, err)
+
+			v, _, _, _, _, valid := changed.Data()
+			tst.AssertTrue(t, valid)
+			tst.AssertEqual(t, v, c.version)
+
+			tst.AssertTrue(t, changed.Verify("new-pw", nil))
+			tst.AssertFalse(t, changed.Verify("old", nil))
+		})
+	}
+}
+
+func TestPassHashChangeKeepsTOTPV3(t *testing.T) {
+	secret := []byte{0xAB, 0xCD}
+	ph, err := HashPasswordV3("old", secret)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, ph.HasTOTP())
+
+	changed, err := ph.Change("new")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, changed.HasTOTP())
+}
+
+func TestPassHashV0Format(t *testing.T) {
+	ph, err := HashPasswordV0("plaintext-pw")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.HasPrefix(string(ph), "0|"))
+	tst.AssertEqual(t, string(ph), "0|plaintext-pw")
+}
+
+func TestPassHashV1Format(t *testing.T) {
+	ph, err := HashPasswordV1("test")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.HasPrefix(string(ph), "1|"))
+}
+
+func TestPassHashV2Format(t *testing.T) {
+	ph, err := HashPasswordV2("test")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.HasPrefix(string(ph), "2|"))
+	tst.AssertEqual(t, strings.Count(string(ph), "|"), 2)
+}
+
+func TestPassHashV3Format(t *testing.T) {
+	ph, err := HashPasswordV3("test", nil)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.HasPrefix(string(ph), "3|"))
+	tst.AssertEqual(t, strings.Count(string(ph), "|"), 3)
+	tst.AssertTrue(t, strings.HasSuffix(string(ph), "|0"))
+}
+
+func TestPassHashV4Format(t *testing.T) {
+	ph, err := HashPasswordV4("test", nil)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.HasPrefix(string(ph), "4|"))
+	tst.AssertTrue(t, strings.HasSuffix(string(ph), "|0"))
+}
+
+func TestPassHashV5Format(t *testing.T) {
+	ph, err := HashPasswordV5("test", nil)
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, strings.HasPrefix(string(ph), "5|"))
+	tst.AssertTrue(t, strings.HasSuffix(string(ph), "|0"))
+}
+
+func TestPassHashV5VerifyLongPassword(t *testing.T) {
+	// V5 hashes via sha512 first → bcrypt's 72-byte limit shouldn't apply
+	longPw := strings.Repeat("a", 200)
+	ph, err := HashPasswordV5(longPw, nil)
+	tst.AssertNoErr(t, err)
+
+	tst.AssertTrue(t, ph.Verify(longPw, nil))
+	tst.AssertFalse(t, ph.Verify(longPw+"x", nil))
+}
+
+func TestPassHashV5DifferentEachCall(t *testing.T) {
+	ph1, err := HashPasswordV5("samepw", nil)
+	tst.AssertNoErr(t, err)
+	ph2, err := HashPasswordV5("samepw", nil)
+	tst.AssertNoErr(t, err)
+
+	// Bcrypt salts internally — same password should produce different hashes
+	tst.AssertNotEqual(t, string(ph1), string(ph2))
+
+	// Both must verify
+	tst.AssertTrue(t, ph1.Verify("samepw", nil))
+	tst.AssertTrue(t, ph2.Verify("samepw", nil))
+}

cryptext/passHash_test.go

@@ -1,7 +1,6 @@
 package cryptext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/totpext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
 	"testing"
@@ -32,7 +31,7 @@ func TestPassHashTOTP(t *testing.T) {
 
 	tst.AssertFalse(t, ph.Verify("test123", nil))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
+	tst.AssertTrue(t, ph.Verify("test123", new(totpext.TOTP(sec))))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
 }
 
@@ -141,7 +140,7 @@ func TestPassHashUpgrade_V3_TOTP(t *testing.T) {
 
 	tst.AssertFalse(t, ph.Verify("test123", nil))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
+	tst.AssertTrue(t, ph.Verify("test123", new(totpext.TOTP(sec))))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
 
 	ph, err = ph.Upgrade("test123")
@@ -153,7 +152,7 @@ func TestPassHashUpgrade_V3_TOTP(t *testing.T) {
 
 	tst.AssertFalse(t, ph.Verify("test123", nil))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
+	tst.AssertTrue(t, ph.Verify("test123", new(totpext.TOTP(sec))))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
 }
 
@@ -193,7 +192,7 @@ func TestPassHashUpgrade_V4_TOTP(t *testing.T) {
 
 	tst.AssertFalse(t, ph.Verify("test123", nil))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
+	tst.AssertTrue(t, ph.Verify("test123", new(totpext.TOTP(sec))))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
 
 	ph, err = ph.Upgrade("test123")
@@ -205,6 +204,6 @@ func TestPassHashUpgrade_V4_TOTP(t *testing.T) {
 
 	tst.AssertFalse(t, ph.Verify("test123", nil))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
+	tst.AssertTrue(t, ph.Verify("test123", new(totpext.TOTP(sec))))
 	tst.AssertFalse(t, ph.Verify("test124", nil))
 }

cryptext/pronouncablePassword_additional_test.go

@@ -0,0 +1,180 @@
+package cryptext
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	mathrand "math/rand"
+	"strings"
+	"testing"
+	"unicode"
+)
+
+func TestPronouncablePasswordLength(t *testing.T) {
+	for _, n := range []int{1, 2, 3, 5, 8, 13, 21, 50, 128} {
+		pw := PronouncablePassword(n)
+		tst.AssertEqual(t, len(pw), n)
+	}
+}
+
+func TestPronouncablePasswordZeroOrNegative(t *testing.T) {
+	tst.AssertEqual(t, PronouncablePassword(0), "")
+	tst.AssertEqual(t, PronouncablePassword(-1), "")
+	tst.AssertEqual(t, PronouncablePassword(-1000), "")
+}
+
+func TestPronouncablePasswordSeededDeterministic(t *testing.T) {
+	pw1 := PronouncablePasswordSeeded(42, 16)
+	pw2 := PronouncablePasswordSeeded(42, 16)
+	tst.AssertEqual(t, pw1, pw2)
+	tst.AssertEqual(t, len(pw1), 16)
+}
+
+func TestPronouncablePasswordSeededDifferentSeeds(t *testing.T) {
+	pw1 := PronouncablePasswordSeeded(1, 16)
+	pw2 := PronouncablePasswordSeeded(2, 16)
+	tst.AssertNotEqual(t, pw1, pw2)
+}
+
+func TestPronouncablePasswordExtEntropy(t *testing.T) {
+	rng := mathrand.New(mathrand.NewSource(1))
+	pw, entropy := PronouncablePasswordExt(rng, 32)
+	tst.AssertEqual(t, len(pw), 32)
+	if entropy <= 0 {
+		t.Errorf("expected positive entropy, got %f", entropy)
+	}
+}
+
+func TestPronouncablePasswordExtZeroLen(t *testing.T) {
+	rng := mathrand.New(mathrand.NewSource(1))
+	pw, entropy := PronouncablePasswordExt(rng, 0)
+	tst.AssertEqual(t, pw, "")
+	tst.AssertEqual(t, entropy, float64(0))
+}
+
+func TestPronouncablePasswordCharacters(t *testing.T) {
+	// Output should be only ASCII letters
+	for i := range 50 {
+		pw := PronouncablePasswordSeeded(int64(i), 32)
+		for _, c := range pw {
+			if !unicode.IsLetter(c) || c > unicode.MaxASCII {
+				t.Errorf("non-letter or non-ASCII rune %q in password %q", c, pw)
+				break
+			}
+		}
+	}
+}
+
+func TestPronouncablePasswordStartsUpper(t *testing.T) {
+	for i := range 50 {
+		pw := PronouncablePasswordSeeded(int64(i), 16)
+		if pw == "" {
+			continue
+		}
+		first := rune(pw[0])
+		if !unicode.IsUpper(first) {
+			t.Errorf("expected first letter uppercase in %q (seed %d)", pw, i)
+		}
+		if !strings.ContainsRune(ppStartChar, first) {
+			t.Errorf("expected first letter from start-set in %q (seed %d)", pw, i)
+		}
+	}
+}
+
+func TestPpMakeSet(t *testing.T) {
+	set := ppMakeSet("ABC")
+	tst.AssertTrue(t, set['A'])
+	tst.AssertTrue(t, set['B'])
+	tst.AssertTrue(t, set['C'])
+	tst.AssertFalse(t, set['D'])
+	tst.AssertEqual(t, len(set), 3)
+}
+
+func TestPpMakeSetEmpty(t *testing.T) {
+	set := ppMakeSet("")
+	tst.AssertEqual(t, len(set), 0)
+}
+
+func TestPpCharType(t *testing.T) {
+	v, c := ppCharType('A')
+	tst.AssertTrue(t, v)
+	tst.AssertFalse(t, c)
+
+	v, c = ppCharType('B')
+	tst.AssertFalse(t, v)
+	tst.AssertTrue(t, c)
+
+	v, c = ppCharType('Y')
+	tst.AssertTrue(t, v)
+	tst.AssertFalse(t, c)
+
+	v, c = ppCharType('1')
+	tst.AssertFalse(t, v)
+	tst.AssertFalse(t, c)
+}
+
+func TestPpCharsetRemove(t *testing.T) {
+	set := ppMakeSet("AEIOU")
+	out := ppCharsetRemove("ABCDEFG", set, false)
+	tst.AssertEqual(t, out, "BCDFG")
+}
+
+func TestPpCharsetRemoveEmptyDisallowed(t *testing.T) {
+	set := ppMakeSet("AB")
+	out := ppCharsetRemove("AB", set, false)
+	// when result would be empty and allowEmpty=false, it returns the original
+	tst.AssertEqual(t, out, "AB")
+}
+
+func TestPpCharsetRemoveEmptyAllowed(t *testing.T) {
+	set := ppMakeSet("AB")
+	out := ppCharsetRemove("AB", set, true)
+	tst.AssertEqual(t, out, "")
+}
+
+func TestPpCharsetFilter(t *testing.T) {
+	set := ppMakeSet("AEIOU")
+	out := ppCharsetFilter("ABCDEFG", set, false)
+	tst.AssertEqual(t, out, "AE")
+}
+
+func TestPpCharsetFilterEmptyDisallowed(t *testing.T) {
+	set := ppMakeSet("XYZ")
+	out := ppCharsetFilter("ABC", set, false)
+	tst.AssertEqual(t, out, "ABC") // returns original when result empty & not allowed
+}
+
+func TestPpCharsetFilterEmptyAllowed(t *testing.T) {
+	set := ppMakeSet("XYZ")
+	out := ppCharsetFilter("ABC", set, true)
+	tst.AssertEqual(t, out, "")
+}
+
+func TestPronouncablePasswordContinuationFollowsRules(t *testing.T) {
+	// Make sure each continuation pair (lowercased) appears in ppContinuation
+	// Note: when a new segment starts (uppercase letter mid-string), the continuation
+	// check does not apply across the segment boundary.
+	for s := range 30 {
+		seed := int64(s)
+		pw := PronouncablePasswordSeeded(seed, 32)
+		if len(pw) < 2 {
+			continue
+		}
+		runes := []byte(strings.ToUpper(pw))
+		for i := 1; i < len(runes); i++ {
+			// Detect new segment (original char was uppercase and it's not the first char)
+			origUpper := pw[i] >= 'A' && pw[i] <= 'Z'
+			if origUpper && i > 0 {
+				continue
+			}
+			prev := runes[i-1]
+			cur := runes[i]
+			cont, ok := ppContinuation[prev]
+			if !ok {
+				t.Errorf("no continuation map for %q (pw=%q)", prev, pw)
+				continue
+			}
+			if !strings.ContainsRune(cont, rune(cur)) {
+				t.Errorf("invalid continuation %q -> %q in %q (seed %d)", prev, cur, pw, seed)
+			}
+		}
+	}
+}

cryptext/pronouncablePassword_test.go

@@ -7,21 +7,21 @@ import (
 )
 
 func TestPronouncablePasswordExt(t *testing.T) {
-	for i := 0; i < 20; i++ {
+	for i := range 20 {
 		pw, entropy := PronouncablePasswordExt(rand.New(rand.NewSource(int64(i))), 16)
 		fmt.Printf("[%.2f] => %s\n", entropy, pw)
 	}
 }
 
 func TestPronouncablePasswordSeeded(t *testing.T) {
-	for i := 0; i < 20; i++ {
+	for i := range 20 {
 		pw := PronouncablePasswordSeeded(int64(i), 8)
 		fmt.Printf("%s\n", pw)
 	}
 }
 
 func TestPronouncablePassword(t *testing.T) {
-	for i := 0; i < 20; i++ {
+	for i := range 20 {
 		pw := PronouncablePassword(i + 1)
 		fmt.Printf("%s\n", pw)
 	}

ctxext/getter_test.go

@@ -0,0 +1,237 @@
+package ctxext
+
+import (
+	"context"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"testing"
+)
+
+type ctxKey string
+
+const (
+	keyString ctxKey = "string-key"
+	keyInt    ctxKey = "int-key"
+	keyStruct ctxKey = "struct-key"
+	keyPtr    ctxKey = "ptr-key"
+	keyMissing ctxKey = "missing-key"
+)
+
+type sampleStruct struct {
+	Name string
+	N    int
+}
+
+func TestValueStringPresent(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "hello")
+	v, ok := Value[string](ctx, keyString)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v, "hello")
+}
+
+func TestValueIntPresent(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyInt, 42)
+	v, ok := Value[int](ctx, keyInt)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v, 42)
+}
+
+func TestValueStructPresent(t *testing.T) {
+	want := sampleStruct{Name: "abc", N: 7}
+	ctx := context.WithValue(context.Background(), keyStruct, want)
+	v, ok := Value[sampleStruct](ctx, keyStruct)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v.Name, "abc")
+	tst.AssertEqual(t, v.N, 7)
+}
+
+func TestValuePointerPresent(t *testing.T) {
+	want := &sampleStruct{Name: "ptr", N: 99}
+	ctx := context.WithValue(context.Background(), keyPtr, want)
+	v, ok := Value[*sampleStruct](ctx, keyPtr)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v == want, true)
+	tst.AssertEqual(t, v.Name, "ptr")
+}
+
+func TestValueMissing(t *testing.T) {
+	ctx := context.Background()
+	v, ok := Value[string](ctx, keyMissing)
+	tst.AssertEqual(t, ok, false)
+	tst.AssertEqual(t, v, "")
+}
+
+func TestValueMissingInt(t *testing.T) {
+	ctx := context.Background()
+	v, ok := Value[int](ctx, keyMissing)
+	tst.AssertEqual(t, ok, false)
+	tst.AssertEqual(t, v, 0)
+}
+
+func TestValueMissingStruct(t *testing.T) {
+	ctx := context.Background()
+	v, ok := Value[sampleStruct](ctx, keyMissing)
+	tst.AssertEqual(t, ok, false)
+	tst.AssertEqual(t, v.Name, "")
+	tst.AssertEqual(t, v.N, 0)
+}
+
+func TestValueMissingPointer(t *testing.T) {
+	ctx := context.Background()
+	v, ok := Value[*sampleStruct](ctx, keyMissing)
+	tst.AssertEqual(t, ok, false)
+	tst.AssertEqual(t, v == nil, true)
+}
+
+func TestValueWrongType(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "hello")
+	v, ok := Value[int](ctx, keyString)
+	tst.AssertEqual(t, ok, false)
+	tst.AssertEqual(t, v, 0)
+}
+
+func TestValueWrongTypeStructToString(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyStruct, sampleStruct{Name: "x"})
+	v, ok := Value[string](ctx, keyStruct)
+	tst.AssertEqual(t, ok, false)
+	tst.AssertEqual(t, v, "")
+}
+
+func TestValueNilStoredAsInterface(t *testing.T) {
+	var stored *sampleStruct = nil
+	ctx := context.WithValue(context.Background(), keyPtr, stored)
+	v, ok := Value[*sampleStruct](ctx, keyPtr)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v == nil, true)
+}
+
+func TestValueEmptyString(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "")
+	v, ok := Value[string](ctx, keyString)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v, "")
+}
+
+func TestValueZeroInt(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyInt, 0)
+	v, ok := Value[int](ctx, keyInt)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v, 0)
+}
+
+func TestValueWithStringKey(t *testing.T) {
+	type stringKey string
+	k := stringKey("my-key")
+	ctx := context.WithValue(context.Background(), k, "value")
+	v, ok := Value[string](ctx, k)
+	tst.AssertEqual(t, ok, true)
+	tst.AssertEqual(t, v, "value")
+}
+
+func TestValueOrDefaultPresent(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "hello")
+	v := ValueOrDefault(ctx, keyString, "default")
+	tst.AssertEqual(t, v, "hello")
+}
+
+func TestValueOrDefaultIntPresent(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyInt, 42)
+	v := ValueOrDefault(ctx, keyInt, -1)
+	tst.AssertEqual(t, v, 42)
+}
+
+func TestValueOrDefaultMissing(t *testing.T) {
+	ctx := context.Background()
+	v := ValueOrDefault(ctx, keyMissing, "default")
+	tst.AssertEqual(t, v, "default")
+}
+
+func TestValueOrDefaultMissingInt(t *testing.T) {
+	ctx := context.Background()
+	v := ValueOrDefault(ctx, keyMissing, 99)
+	tst.AssertEqual(t, v, 99)
+}
+
+func TestValueOrDefaultMissingStruct(t *testing.T) {
+	ctx := context.Background()
+	def := sampleStruct{Name: "default", N: 1}
+	v := ValueOrDefault(ctx, keyMissing, def)
+	tst.AssertEqual(t, v.Name, "default")
+	tst.AssertEqual(t, v.N, 1)
+}
+
+func TestValueOrDefaultWrongType(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "hello")
+	v := ValueOrDefault(ctx, keyString, 7)
+	tst.AssertEqual(t, v, 7)
+}
+
+func TestValueOrDefaultWrongTypeStruct(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyStruct, sampleStruct{Name: "x"})
+	def := "fallback"
+	v := ValueOrDefault(ctx, keyStruct, def)
+	tst.AssertEqual(t, v, "fallback")
+}
+
+func TestValueOrDefaultEmptyStringStored(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "")
+	v := ValueOrDefault(ctx, keyString, "default")
+	tst.AssertEqual(t, v, "")
+}
+
+func TestValueOrDefaultZeroIntStored(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyInt, 0)
+	v := ValueOrDefault(ctx, keyInt, 99)
+	tst.AssertEqual(t, v, 0)
+}
+
+func TestValueOrDefaultPointerPresent(t *testing.T) {
+	want := &sampleStruct{Name: "p", N: 5}
+	ctx := context.WithValue(context.Background(), keyPtr, want)
+	def := &sampleStruct{Name: "def", N: 0}
+	v := ValueOrDefault(ctx, keyPtr, def)
+	tst.AssertEqual(t, v == want, true)
+}
+
+func TestValueOrDefaultPointerMissing(t *testing.T) {
+	ctx := context.Background()
+	def := &sampleStruct{Name: "def", N: 0}
+	v := ValueOrDefault(ctx, keyMissing, def)
+	tst.AssertEqual(t, v == def, true)
+}
+
+func TestValueOrDefaultNilPointerStored(t *testing.T) {
+	var stored *sampleStruct = nil
+	ctx := context.WithValue(context.Background(), keyPtr, stored)
+	def := &sampleStruct{Name: "def"}
+	v := ValueOrDefault(ctx, keyPtr, def)
+	tst.AssertEqual(t, v == nil, true)
+}
+
+func TestValueNestedContext(t *testing.T) {
+	ctx := context.WithValue(context.Background(), keyString, "outer")
+	ctx = context.WithValue(ctx, keyInt, 123)
+	ctx = context.WithValue(ctx, keyString, "inner")
+
+	vs, oks := Value[string](ctx, keyString)
+	tst.AssertEqual(t, oks, true)
+	tst.AssertEqual(t, vs, "inner")
+
+	vi, oki := Value[int](ctx, keyInt)
+	tst.AssertEqual(t, oki, true)
+	tst.AssertEqual(t, vi, 123)
+}
+
+func TestValueDifferentKeyTypesDoNotCollide(t *testing.T) {
+	type keyA string
+	type keyB string
+	ctx := context.WithValue(context.Background(), keyA("k"), "a-val")
+	ctx = context.WithValue(ctx, keyB("k"), "b-val")
+
+	va, oka := Value[string](ctx, keyA("k"))
+	tst.AssertEqual(t, oka, true)
+	tst.AssertEqual(t, va, "a-val")
+
+	vb, okb := Value[string](ctx, keyB("k"))
+	tst.AssertEqual(t, okb, true)
+	tst.AssertEqual(t, vb, "b-val")
+}

cursortoken/direction_test.go

@@ -0,0 +1,29 @@
+package cursortoken
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"testing"
+)
+
+func TestSortDirectionToMongoASC(t *testing.T) {
+	tst.AssertEqual(t, SortASC.ToMongo(), 1)
+}
+
+func TestSortDirectionToMongoDESC(t *testing.T) {
+	tst.AssertEqual(t, SortDESC.ToMongo(), -1)
+}
+
+func TestSortDirectionToMongoEmpty(t *testing.T) {
+	var sd SortDirection
+	tst.AssertEqual(t, sd.ToMongo(), 0)
+}
+
+func TestSortDirectionToMongoUnknown(t *testing.T) {
+	sd := SortDirection("xyz")
+	tst.AssertEqual(t, sd.ToMongo(), 0)
+}
+
+func TestSortDirectionConstants(t *testing.T) {
+	tst.AssertEqual(t, string(SortASC), "ASC")
+	tst.AssertEqual(t, string(SortDESC), "DESC")
+}

cursortoken/filter.go

@@ -2,7 +2,8 @@ package cursortoken
 
 import (
 	"context"
-	"go.mongodb.org/mongo-driver/mongo"
+
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
 type RawFilter interface {

cursortoken/token.go

@@ -3,10 +3,11 @@ package cursortoken
 import (
 	"encoding/base32"
 	"encoding/json"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
 	"strconv"
 	"strings"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
 )
 
 type CursorToken interface {

cursortoken/tokenKeySort.go

@@ -3,8 +3,9 @@ package cursortoken
 import (
 	"encoding/base32"
 	"encoding/json"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"time"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type CTKeySort struct {
@@ -119,18 +120,18 @@ func (c CTKeySort) IsStart() bool {
 	return c.Mode == CTMStart
 }
 
-func (c CTKeySort) valuePrimaryObjectId() (primitive.ObjectID, bool) {
-	if oid, err := primitive.ObjectIDFromHex(c.ValuePrimary); err == nil {
+func (c CTKeySort) valuePrimaryObjectId() (bson.ObjectID, bool) {
+	if oid, err := bson.ObjectIDFromHex(c.ValuePrimary); err == nil {
 		return oid, true
 	} else {
-		return primitive.ObjectID{}, false
+		return bson.ObjectID{}, false
 	}
 }
 
-func (c CTKeySort) valueSecondaryObjectId() (primitive.ObjectID, bool) {
-	if oid, err := primitive.ObjectIDFromHex(c.ValueSecondary); err == nil {
+func (c CTKeySort) valueSecondaryObjectId() (bson.ObjectID, bool) {
+	if oid, err := bson.ObjectIDFromHex(c.ValueSecondary); err == nil {
 		return oid, true
 	} else {
-		return primitive.ObjectID{}, false
+		return bson.ObjectID{}, false
 	}
 }

cursortoken/tokenKeySort_test.go

@@ -0,0 +1,136 @@
+package cursortoken
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestStartToken(t *testing.T) {
+	tok := Start()
+	tst.AssertEqual(t, tok.Token(), "@start")
+	tst.AssertTrue(t, tok.IsStart())
+	tst.AssertFalse(t, tok.IsEnd())
+}
+
+func TestEndToken(t *testing.T) {
+	tok := End()
+	tst.AssertEqual(t, tok.Token(), "@end")
+	tst.AssertTrue(t, tok.IsEnd())
+	tst.AssertFalse(t, tok.IsStart())
+}
+
+func TestNewKeySortTokenBasic(t *testing.T) {
+	tok := NewKeySortToken("alpha", "beta", SortASC, SortDESC, 50, Extra{})
+	tst.AssertFalse(t, tok.IsEnd())
+	tst.AssertFalse(t, tok.IsStart())
+	str := tok.Token()
+	tst.AssertTrue(t, strings.HasPrefix(str, "tok_"))
+}
+
+func TestNewKeySortTokenRoundTrip(t *testing.T) {
+	original := NewKeySortToken("primary-val", "secondary-val", SortASC, SortDESC, 25, Extra{})
+	encoded := original.Token()
+
+	decoded, err := Decode(encoded)
+	tst.AssertNoErr(t, err)
+
+	ks, ok := decoded.(CTKeySort)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, ks.ValuePrimary, "primary-val")
+	tst.AssertEqual(t, ks.ValueSecondary, "secondary-val")
+	tst.AssertEqual(t, ks.Direction, SortASC)
+	tst.AssertEqual(t, ks.DirectionSecondary, SortDESC)
+	tst.AssertEqual(t, ks.PageSize, 25)
+	tst.AssertEqual(t, ks.Mode, CTMNormal)
+}
+
+func TestKeySortTokenWithExtra(t *testing.T) {
+	ts := time.Date(2024, 6, 15, 10, 30, 0, 0, time.UTC)
+	id := "object-id-123"
+	page := 7
+	pageSize := 42
+
+	original := NewKeySortToken("p", "s", SortDESC, SortASC, 10, Extra{
+		Timestamp: &ts,
+		Id:        &id,
+		Page:      &page,
+		PageSize:  &pageSize,
+	})
+	encoded := original.Token()
+
+	decoded, err := Decode(encoded)
+	tst.AssertNoErr(t, err)
+
+	ks, ok := decoded.(CTKeySort)
+	tst.AssertTrue(t, ok)
+	tst.AssertTrue(t, ks.Extra.Timestamp != nil)
+	tst.AssertTrue(t, ks.Extra.Timestamp.Equal(ts))
+	tst.AssertDeRefEqual(t, ks.Extra.Id, "object-id-123")
+	tst.AssertDeRefEqual(t, ks.Extra.Page, 7)
+	tst.AssertDeRefEqual(t, ks.Extra.PageSize, 42)
+}
+
+func TestKeySortTokenStartRoundTrip(t *testing.T) {
+	original := Start()
+	decoded, err := Decode(original.Token())
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, decoded.IsStart())
+	tst.AssertFalse(t, decoded.IsEnd())
+}
+
+func TestKeySortTokenEndRoundTrip(t *testing.T) {
+	original := End()
+	decoded, err := Decode(original.Token())
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, decoded.IsEnd())
+	tst.AssertFalse(t, decoded.IsStart())
+}
+
+func TestKeySortTokenEmptyValues(t *testing.T) {
+	tok := CTKeySort{Mode: CTMNormal}
+	encoded := tok.Token()
+	tst.AssertTrue(t, strings.HasPrefix(encoded, "tok_"))
+
+	decoded, err := Decode(encoded)
+	tst.AssertNoErr(t, err)
+
+	ks, ok := decoded.(CTKeySort)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, ks.ValuePrimary, "")
+	tst.AssertEqual(t, ks.ValueSecondary, "")
+	tst.AssertEqual(t, ks.Direction, SortDirection(""))
+	tst.AssertEqual(t, ks.DirectionSecondary, SortDirection(""))
+	tst.AssertEqual(t, ks.PageSize, 0)
+}
+
+func TestKeySortTokenOnlyTimestamp(t *testing.T) {
+	ts := time.Date(2020, 1, 2, 3, 4, 5, 0, time.UTC)
+	tok := CTKeySort{
+		Mode:  CTMNormal,
+		Extra: Extra{Timestamp: &ts},
+	}
+
+	decoded, err := Decode(tok.Token())
+	tst.AssertNoErr(t, err)
+
+	ks, ok := decoded.(CTKeySort)
+	tst.AssertTrue(t, ok)
+	tst.AssertTrue(t, ks.Extra.Timestamp != nil)
+	tst.AssertTrue(t, ks.Extra.Timestamp.Equal(ts))
+	tst.AssertTrue(t, ks.Extra.Id == nil)
+	tst.AssertTrue(t, ks.Extra.Page == nil)
+	tst.AssertTrue(t, ks.Extra.PageSize == nil)
+}
+
+func TestKeySortTokenSpecialChars(t *testing.T) {
+	original := NewKeySortToken("hello world / @!#$%", "äöü€", SortASC, SortASC, 1, Extra{})
+	decoded, err := Decode(original.Token())
+	tst.AssertNoErr(t, err)
+
+	ks, ok := decoded.(CTKeySort)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, ks.ValuePrimary, "hello world / @!#$%")
+	tst.AssertEqual(t, ks.ValueSecondary, "äöü€")
+}

cursortoken/tokenPaginate_test.go

@@ -0,0 +1,61 @@
+package cursortoken
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"testing"
+)
+
+func TestPageToken(t *testing.T) {
+	tok := Page(5)
+	tst.AssertEqual(t, tok.Token(), "$5")
+	tst.AssertFalse(t, tok.IsEnd())
+	tst.AssertFalse(t, tok.IsStart())
+}
+
+func TestPageTokenOne(t *testing.T) {
+	tok := Page(1)
+	tst.AssertEqual(t, tok.Token(), "$1")
+	tst.AssertFalse(t, tok.IsEnd())
+	tst.AssertTrue(t, tok.IsStart())
+}
+
+func TestPageTokenLarge(t *testing.T) {
+	tok := Page(123456)
+	tst.AssertEqual(t, tok.Token(), "$123456")
+}
+
+func TestPageTokenZero(t *testing.T) {
+	tok := Page(0)
+	tst.AssertEqual(t, tok.Token(), "$0")
+	tst.AssertFalse(t, tok.IsEnd())
+	tst.AssertFalse(t, tok.IsStart())
+}
+
+func TestPageEndToken(t *testing.T) {
+	tok := PageEnd()
+	tst.AssertEqual(t, tok.Token(), "$end")
+	tst.AssertTrue(t, tok.IsEnd())
+	tst.AssertFalse(t, tok.IsStart())
+}
+
+func TestPaginatedStartMode(t *testing.T) {
+	tok := CTPaginated{Mode: CTMStart, Page: 0}
+	tst.AssertEqual(t, tok.Token(), "$1")
+	tst.AssertTrue(t, tok.IsStart())
+	tst.AssertFalse(t, tok.IsEnd())
+}
+
+func TestPaginatedEndMode(t *testing.T) {
+	tok := CTPaginated{Mode: CTMEnd, Page: 99}
+	tst.AssertEqual(t, tok.Token(), "$end")
+	tst.AssertTrue(t, tok.IsEnd())
+}
+
+func TestPaginatedRoundTrip(t *testing.T) {
+	for _, page := range []int{2, 3, 7, 100, 9999} {
+		tok := Page(page)
+		decoded, err := Decode(tok.Token())
+		tst.AssertNoErr(t, err)
+		tst.AssertEqual(t, decoded.Token(), tok.Token())
+	}
+}

cursortoken/token_test.go

@@ -0,0 +1,125 @@
+package cursortoken
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"testing"
+)
+
+func TestDecodeEmpty(t *testing.T) {
+	tok, err := Decode("")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsStart())
+	tst.AssertFalse(t, tok.IsEnd())
+	tst.AssertEqual(t, tok.Token(), "@start")
+}
+
+func TestDecodeAtStart(t *testing.T) {
+	tok, err := Decode("@start")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsStart())
+	tst.AssertFalse(t, tok.IsEnd())
+}
+
+func TestDecodeAtStartUppercase(t *testing.T) {
+	tok, err := Decode("@START")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsStart())
+}
+
+func TestDecodeAtStartMixedCase(t *testing.T) {
+	tok, err := Decode("@StArT")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsStart())
+}
+
+func TestDecodeAtEnd(t *testing.T) {
+	tok, err := Decode("@end")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsEnd())
+	tst.AssertFalse(t, tok.IsStart())
+}
+
+func TestDecodeAtEndUppercase(t *testing.T) {
+	tok, err := Decode("@END")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsEnd())
+}
+
+func TestDecodeDollarEnd(t *testing.T) {
+	tok, err := Decode("$end")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsEnd())
+	_, ok := tok.(CTPaginated)
+	tst.AssertTrue(t, ok)
+}
+
+func TestDecodeDollarEndUppercase(t *testing.T) {
+	tok, err := Decode("$END")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsEnd())
+}
+
+func TestDecodeDollarPage(t *testing.T) {
+	tok, err := Decode("$5")
+	tst.AssertNoErr(t, err)
+	pg, ok := tok.(CTPaginated)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, pg.Page, 5)
+	tst.AssertEqual(t, pg.Mode, CTMNormal)
+}
+
+func TestDecodeDollarPageOne(t *testing.T) {
+	tok, err := Decode("$1")
+	tst.AssertNoErr(t, err)
+	tst.AssertTrue(t, tok.IsStart())
+	pg, ok := tok.(CTPaginated)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, pg.Page, 1)
+}
+
+func TestDecodeDollarPageInvalid(t *testing.T) {
+	_, err := Decode("$abc")
+	if err == nil {
+		t.Fatalf("expected error for invalid page")
+	}
+}
+
+func TestDecodeUnknownPrefix(t *testing.T) {
+	_, err := Decode("foobar")
+	if err == nil {
+		t.Fatalf("expected error for unknown prefix")
+	}
+}
+
+func TestDecodeInvalidBase32(t *testing.T) {
+	_, err := Decode("tok_!!!")
+	if err == nil {
+		t.Fatalf("expected error for invalid base32 body")
+	}
+}
+
+func TestDecodeInvalidJSON(t *testing.T) {
+	// "tok_" prefix with valid base32 but invalid JSON content
+	_, err := Decode("tok_NBSWY3DP")
+	if err == nil {
+		t.Fatalf("expected error for invalid json body")
+	}
+}
+
+func TestDecodeJustDollar(t *testing.T) {
+	// "$" alone (length == 1) should fall through to the unknown-prefix branch
+	_, err := Decode("$")
+	if err == nil {
+		t.Fatalf("expected error for bare $")
+	}
+}
+
+func TestDecodeKnownTokenContent(t *testing.T) {
+	tok := NewKeySortToken("k1", "k2", SortASC, SortDESC, 33, Extra{})
+	encoded := tok.Token()
+
+	decoded, err := Decode(encoded)
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, decoded.Token(), encoded)
+}

dataext/broadcaster_test.go

@@ -90,15 +90,17 @@ func TestBroadcast_SubscribeByIter(t *testing.T) {
 
 	// Channel to communicate when message is received
 	done := make(chan bool)
+	goroutineDone := make(chan struct{})
 	received := false
 
 	// Start a goroutine to use the iterator
 	go func() {
+		defer close(goroutineDone)
 		for msg := range iterSeq {
 			if msg == "hello" {
 				received = true
 				done <- true
-				return // Stop iteration
+				return // Stop iteration — triggers Unsubscribe via yield returning false
 			}
 		}
 	}()
@@ -119,6 +121,14 @@ func TestBroadcast_SubscribeByIter(t *testing.T) {
 		t.Fatal("Timed out waiting for message")
 	}
 
+	// Wait for the goroutine to fully exit so Unsubscribe (triggered by the
+	// iterator cleanup when yield returns false) has completed.
+	select {
+	case <-goroutineDone:
+	case <-time.After(time.Second):
+		t.Fatal("Timed out waiting for goroutine to finish")
+	}
+
 	subCount := bb.SubscriberCount()
 	if subCount != 0 {
 		t.Fatalf("Expected 0 receivers, got %d", subCount)

dataext/bufferedReadCloser_test.go

@@ -0,0 +1,129 @@
+package dataext
+
+import (
+	"bytes"
+	"io"
+	"testing"
+)
+
+type fakeReadCloser struct {
+	r      *bytes.Reader
+	closed bool
+}
+
+func newFakeReadCloser(data []byte) *fakeReadCloser {
+	return &fakeReadCloser{r: bytes.NewReader(data)}
+}
+
+func (f *fakeReadCloser) Read(p []byte) (int, error) {
+	return f.r.Read(p)
+}
+
+func (f *fakeReadCloser) Close() error {
+	f.closed = true
+	return nil
+}
+
+func TestBufferedReadCloser_ReadAll(t *testing.T) {
+	data := []byte("hello world")
+	brc := NewBufferedReadCloser(newFakeReadCloser(data))
+
+	buf := make([]byte, 64)
+	total := 0
+	for {
+		n, err := brc.Read(buf[total:])
+		total += n
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			t.Fatalf("unexpected err: %v", err)
+		}
+	}
+
+	if !bytes.Equal(buf[:total], data) {
+		t.Fatalf("got %q want %q", buf[:total], data)
+	}
+}
+
+func TestBufferedReadCloser_BufferedAllThenRead(t *testing.T) {
+	data := []byte("foobar baz")
+	brc := NewBufferedReadCloser(newFakeReadCloser(data))
+
+	all, err := brc.BufferedAll()
+	if err != nil {
+		t.Fatalf("BufferedAll err: %v", err)
+	}
+	if !bytes.Equal(all, data) {
+		t.Fatalf("BufferedAll got %q want %q", all, data)
+	}
+
+	// after BufferedAll, Reset put us in BufferReading mode - we can read again
+	out, err := io.ReadAll(brc)
+	if err != nil {
+		t.Fatalf("ReadAll err: %v", err)
+	}
+	if !bytes.Equal(out, data) {
+		t.Fatalf("ReadAll got %q want %q", out, data)
+	}
+}
+
+func TestBufferedReadCloser_FullyReadResetReread(t *testing.T) {
+	data := []byte("abcdefghij")
+	brc := NewBufferedReadCloser(newFakeReadCloser(data))
+
+	out, err := io.ReadAll(brc)
+	if err != nil {
+		t.Fatalf("first ReadAll err: %v", err)
+	}
+	if !bytes.Equal(out, data) {
+		t.Fatalf("first read got %q want %q", out, data)
+	}
+
+	if err := brc.Reset(); err != nil {
+		t.Fatalf("reset err: %v", err)
+	}
+
+	out2, err := io.ReadAll(brc)
+	if err != nil {
+		t.Fatalf("second ReadAll err: %v", err)
+	}
+	if !bytes.Equal(out2, data) {
+		t.Fatalf("after reset got %q want %q", out2, data)
+	}
+}
+
+func TestBufferedReadCloser_Close(t *testing.T) {
+	data := []byte("xyz")
+	inner := newFakeReadCloser(data)
+	brc := NewBufferedReadCloser(inner)
+
+	if err := brc.Close(); err != nil {
+		t.Fatalf("close err: %v", err)
+	}
+	if !inner.closed {
+		t.Fatal("inner not closed")
+	}
+
+	// double close should be no-op
+	if err := brc.Close(); err != nil {
+		t.Fatalf("second close err: %v", err)
+	}
+}
+
+func TestBufferedReadCloser_ResetWithoutRead(t *testing.T) {
+	data := []byte("abc")
+	brc := NewBufferedReadCloser(newFakeReadCloser(data))
+
+	if err := brc.Reset(); err != nil {
+		t.Fatalf("reset err: %v", err)
+	}
+
+	out, err := io.ReadAll(brc)
+	if err != nil {
+		t.Fatalf("ReadAll err: %v", err)
+	}
+	if !bytes.Equal(out, data) {
+		t.Fatalf("got %q want %q", out, data)
+	}
+}

dataext/casMutex_test.go

@@ -0,0 +1,122 @@
+package dataext
+
+import (
+	"context"
+	"sync"
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+func TestCASMutex_LockUnlock(t *testing.T) {
+	m := NewCASMutex()
+	m.Lock()
+	m.Unlock()
+}
+
+func TestCASMutex_TryLock(t *testing.T) {
+	m := NewCASMutex()
+	if !m.TryLock() {
+		t.Fatal("TryLock should succeed on fresh mutex")
+	}
+	if m.TryLock() {
+		t.Fatal("TryLock should fail when already locked")
+	}
+	m.Unlock()
+	if !m.TryLock() {
+		t.Fatal("TryLock should succeed after Unlock")
+	}
+	m.Unlock()
+}
+
+func TestCASMutex_TryLockWithTimeout(t *testing.T) {
+	m := NewCASMutex()
+	m.Lock()
+	start := time.Now()
+	if m.TryLockWithTimeout(20 * time.Millisecond) {
+		t.Fatal("TryLockWithTimeout should fail when locked")
+	}
+	if time.Since(start) < 15*time.Millisecond {
+		t.Fatal("TryLockWithTimeout returned too quickly")
+	}
+	m.Unlock()
+
+	if !m.TryLockWithTimeout(50 * time.Millisecond) {
+		t.Fatal("TryLockWithTimeout should succeed when unlocked")
+	}
+	m.Unlock()
+}
+
+func TestCASMutex_TryLockWithContext_Cancel(t *testing.T) {
+	m := NewCASMutex()
+	m.Lock()
+	defer m.Unlock()
+
+	ctx, cancel := context.WithCancel(context.Background())
+	go func() {
+		time.Sleep(10 * time.Millisecond)
+		cancel()
+	}()
+	if m.TryLockWithContext(ctx) {
+		t.Fatal("expected lock to fail after cancel")
+	}
+}
+
+func TestCASMutex_RLockMultiple(t *testing.T) {
+	m := NewCASMutex()
+	if !m.RTryLock() {
+		t.Fatal("RTryLock should succeed")
+	}
+	if !m.RTryLock() {
+		t.Fatal("Second RTryLock should succeed")
+	}
+	if m.TryLock() {
+		t.Fatal("Write TryLock should fail with read locks held")
+	}
+	m.RUnlock()
+	m.RUnlock()
+	if !m.TryLock() {
+		t.Fatal("Write TryLock should succeed after read unlocks")
+	}
+	m.Unlock()
+}
+
+func TestCASMutex_RLocker(t *testing.T) {
+	m := NewCASMutex()
+	rl := m.RLocker()
+	rl.Lock()
+	rl.Unlock()
+}
+
+func TestCASMutex_Concurrent(t *testing.T) {
+	m := NewCASMutex()
+	var counter int64
+	const n = 50
+	var wg sync.WaitGroup
+	wg.Add(n)
+	for i := 0; i < n; i++ {
+		go func() {
+			defer wg.Done()
+			m.Lock()
+			atomic.AddInt64(&counter, 1)
+			m.Unlock()
+		}()
+	}
+	wg.Wait()
+	if atomic.LoadInt64(&counter) != n {
+		t.Fatalf("counter=%d want %d", counter, n)
+	}
+}
+
+func TestCASMutex_RTryLockWithTimeout(t *testing.T) {
+	m := NewCASMutex()
+	m.Lock()
+	if m.RTryLockWithTimeout(20 * time.Millisecond) {
+		t.Fatal("RTryLockWithTimeout should fail when write-locked")
+	}
+	m.Unlock()
+	if !m.RTryLockWithTimeout(20 * time.Millisecond) {
+		t.Fatal("RTryLockWithTimeout should succeed when free")
+	}
+	m.RUnlock()
+}

dataext/delayedCombiningInvoker.go

@@ -97,10 +97,7 @@ func (d *DelayedCombiningInvoker) run() {
 
 	for {
 		d.syncLock.Lock()
-		timeOut := min(d.maxDelay-time.Since(d.initialRequestTime), d.delay-time.Since(d.lastRequestTime))
-		if timeOut < 0 {
-			timeOut = 0
-		}
+		timeOut := max(min(d.maxDelay-time.Since(d.initialRequestTime), d.delay-time.Since(d.lastRequestTime)), 0)
 		d.syncLock.Unlock()
 
 		immediately := false

dataext/delayedCombiningInvoker_test.go

@@ -0,0 +1,182 @@
+package dataext
+
+import (
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+func waitForCalls(t *testing.T, calls *int64, want int64, max time.Duration) {
+	t.Helper()
+	deadline := time.Now().Add(max)
+	for time.Now().Before(deadline) {
+		if atomic.LoadInt64(calls) >= want {
+			return
+		}
+		time.Sleep(5 * time.Millisecond)
+	}
+}
+
+func TestDelayedCombiningInvoker_SingleRequest(t *testing.T) {
+	var calls int64
+	d := NewDelayedCombiningInvoker(func() {
+		atomic.AddInt64(&calls, 1)
+	}, 20*time.Millisecond, 200*time.Millisecond)
+
+	d.Request()
+
+	waitForCalls(t, &calls, 1, 2*time.Second)
+	if c := atomic.LoadInt64(&calls); c != 1 {
+		t.Fatalf("calls=%d want 1", c)
+	}
+}
+
+func TestDelayedCombiningInvoker_TwoRequestsCombine(t *testing.T) {
+	var calls int64
+	d := NewDelayedCombiningInvoker(func() {
+		atomic.AddInt64(&calls, 1)
+	}, 50*time.Millisecond, 1*time.Second)
+
+	d.Request()
+	time.Sleep(10 * time.Millisecond)
+	d.Request()
+
+	waitForCalls(t, &calls, 1, 2*time.Second)
+	if c := atomic.LoadInt64(&calls); c != 1 {
+		t.Fatalf("calls=%d want 1 (should be combined)", c)
+	}
+}
+
+func TestDelayedCombiningInvoker_SequentialRuns(t *testing.T) {
+	var calls int64
+	d := NewDelayedCombiningInvoker(func() {
+		atomic.AddInt64(&calls, 1)
+	}, 20*time.Millisecond, 200*time.Millisecond)
+
+	d.Request()
+	waitForCalls(t, &calls, 1, 2*time.Second)
+	if c := atomic.LoadInt64(&calls); c != 1 {
+		t.Fatalf("after first wait calls=%d want 1", c)
+	}
+
+	// allow executorRunning to clear
+	time.Sleep(50 * time.Millisecond)
+
+	d.Request()
+	waitForCalls(t, &calls, 2, 2*time.Second)
+	if c := atomic.LoadInt64(&calls); c != 2 {
+		t.Fatalf("calls=%d want 2", c)
+	}
+}
+
+func TestDelayedCombiningInvoker_ExecuteNow(t *testing.T) {
+	var calls int64
+	d := NewDelayedCombiningInvoker(func() {
+		atomic.AddInt64(&calls, 1)
+	}, 5*time.Second, 30*time.Second)
+
+	d.Request()
+	if !d.HasPendingRequests() {
+		t.Fatal("should have pending requests")
+	}
+
+	if !d.ExecuteNow() {
+		t.Fatal("ExecuteNow should return true when running")
+	}
+
+	deadline := time.Now().Add(2 * time.Second)
+	for time.Now().Before(deadline) {
+		if atomic.LoadInt64(&calls) >= 1 {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	if c := atomic.LoadInt64(&calls); c != 1 {
+		t.Fatalf("calls=%d want 1 (ExecuteNow should fire well before delay)", c)
+	}
+
+	// allow internal state cleanup
+	for i := 0; i < 100; i++ {
+		if !d.HasPendingRequests() {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	if d.ExecuteNow() {
+		t.Fatal("ExecuteNow should return false when no pending")
+	}
+}
+
+func TestDelayedCombiningInvoker_Cancel(t *testing.T) {
+	var calls int64
+	d := NewDelayedCombiningInvoker(func() {
+		atomic.AddInt64(&calls, 1)
+	}, 500*time.Millisecond, 5*time.Second)
+
+	d.Request()
+	d.CancelPendingRequests()
+
+	time.Sleep(200 * time.Millisecond)
+
+	if c := atomic.LoadInt64(&calls); c != 0 {
+		t.Fatalf("calls=%d want 0 after cancel", c)
+	}
+}
+
+func TestDelayedCombiningInvoker_HasAndCountPending(t *testing.T) {
+	d := NewDelayedCombiningInvoker(func() {
+		// no-op
+	}, 500*time.Millisecond, 5*time.Second)
+
+	if d.HasPendingRequests() {
+		t.Fatal("should not have pending before any Request")
+	}
+	if d.CountPendingRequests() != 0 {
+		t.Fatalf("count=%d want 0", d.CountPendingRequests())
+	}
+
+	d.Request()
+	if !d.HasPendingRequests() {
+		t.Fatal("should have pending")
+	}
+	if d.CountPendingRequests() < 1 {
+		t.Fatalf("count=%d want >=1", d.CountPendingRequests())
+	}
+	d.CancelPendingRequests()
+}
+
+func TestDelayedCombiningInvoker_Listeners(t *testing.T) {
+	var (
+		startCount   int64
+		doneCount    int64
+		requestCount int64
+	)
+
+	d := NewDelayedCombiningInvoker(func() {
+		// no-op
+	}, 20*time.Millisecond, 200*time.Millisecond)
+
+	d.RegisterOnExecutionStart(func(immediately bool) {
+		atomic.AddInt64(&startCount, 1)
+	})
+	d.RegisterOnExecutionDone(func() {
+		atomic.AddInt64(&doneCount, 1)
+	})
+	d.RegisterOnRequest(func(pending int, initial bool) {
+		atomic.AddInt64(&requestCount, 1)
+	})
+
+	d.Request()
+
+	waitForCalls(t, &doneCount, 1, 2*time.Second)
+
+	if atomic.LoadInt64(&startCount) != 1 {
+		t.Fatalf("startCount=%d want 1", startCount)
+	}
+	if atomic.LoadInt64(&doneCount) != 1 {
+		t.Fatalf("doneCount=%d want 1", doneCount)
+	}
+	if atomic.LoadInt64(&requestCount) != 1 {
+		t.Fatalf("requestCount=%d want 1", requestCount)
+	}
+}

dataext/merge.go

@@ -14,7 +14,7 @@ func ObjectMerge[T1 any, T2 any](base T1, override T2) T1 {
 		fieldBase := reflBase.Field(i)
 		fieldOvrd := reflOvrd.Field(i)
 
-		if fieldBase.Kind() != reflect.Ptr || fieldOvrd.Kind() != reflect.Ptr {
+		if fieldBase.Kind() != reflect.Pointer || fieldOvrd.Kind() != reflect.Pointer {
 			continue
 		}
 

dataext/merge_test.go

@@ -1,7 +1,6 @@
 package dataext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
 	"testing"
 )
@@ -26,17 +25,17 @@ func TestObjectMerge(t *testing.T) {
 
 	valueA := A{
 		Field1:   nil,
-		Field2:   langext.Ptr("99"),
-		Field3:   langext.Ptr(12.2),
+		Field2:   new("99"),
+		Field3:   new(12.2),
 		Field4:   nil,
 		OnlyA:    1,
 		DiffType: 2,
 	}
 
 	valueB := B{
-		Field1:   langext.Ptr(12),
+		Field1:   new(12),
 		Field2:   nil,
-		Field3:   langext.Ptr(13.2),
+		Field3:   new(13.2),
 		Field4:   nil,
 		OnlyB:    1,
 		DiffType: "X",

dataext/multiMutex.go

@@ -0,0 +1,105 @@
+package dataext
+
+import (
+	"context"
+	"sync"
+	"time"
+)
+
+// MultiMutex is a simple map[key -> mutex]
+type MultiMutex[TKey comparable] struct {
+	mutextMap *SyncMap[TKey, *CASMutex]
+}
+
+func NewMultiMutex[TKey comparable]() *MultiMutex[TKey] {
+	return &MultiMutex[TKey]{
+		mutextMap: NewSyncMap[TKey, *CASMutex](),
+	}
+}
+
+// TryLockWithContext attempts to acquire the lock, blocking until resources
+// are available or ctx is done (timeout or cancellation).
+func (mm *MultiMutex[TKey]) TryLockWithContext(ctx context.Context, key TKey) bool {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.TryLockWithContext(ctx)
+}
+
+// Lock acquires the lock.
+// If it is currently held by others, Lock will wait until it has a chance to acquire it.
+func (mm *MultiMutex[TKey]) Lock(key TKey) {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	lck.Lock()
+}
+
+// TryLock attempts to acquire the lock without blocking.
+// Return false if someone is holding it now.
+func (mm *MultiMutex[TKey]) TryLock(key TKey) bool {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.TryLock()
+}
+
+// TryLockWithTimeout attempts to acquire the lock within a period of time.
+// Return false if spending time is more than duration and no chance to acquire it.
+func (mm *MultiMutex[TKey]) TryLockWithTimeout(key TKey, duration time.Duration) bool {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.TryLockWithTimeout(duration)
+}
+
+// Unlock releases the lock.
+func (mm *MultiMutex[TKey]) Unlock(key TKey) {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	lck.Unlock()
+}
+
+// RTryLockWithContext attempts to acquire the read lock, blocking until resources
+// are available or ctx is done (timeout or cancellation).
+func (mm *MultiMutex[TKey]) RTryLockWithContext(ctx context.Context, key TKey) bool {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.RTryLockWithContext(ctx)
+}
+
+// RLock acquires the read lock.
+// If it is currently held by others writing, RLock will wait until it has a chance to acquire it.
+func (mm *MultiMutex[TKey]) RLock(key TKey) {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	lck.RLock()
+}
+
+// RTryLock attempts to acquire the read lock without blocking.
+// Return false if someone is writing it now.
+func (mm *MultiMutex[TKey]) RTryLock(key TKey) bool {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.RTryLock()
+}
+
+// RTryLockWithTimeout attempts to acquire the read lock within a period of time.
+// Return false if spending time is more than duration and no chance to acquire it.
+func (mm *MultiMutex[TKey]) RTryLockWithTimeout(duration time.Duration, key TKey) bool {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.RTryLockWithTimeout(duration)
+}
+
+// RUnlock releases the read lock.
+func (mm *MultiMutex[TKey]) RUnlock(key TKey) {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	lck.RUnlock()
+}
+
+// RLocker returns a Locker interface that implements the Lock and Unlock methods
+// by calling CASMutex.RLock and CASMutex.RUnlock.
+func (mm *MultiMutex[TKey]) RLocker(key TKey) sync.Locker {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck.RLocker()
+}
+
+// Get returns a Locker interface
+func (mm *MultiMutex[TKey]) Get(key TKey) sync.Locker {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck
+}
+
+// GetCAS returns the underlying CASMutex
+func (mm *MultiMutex[TKey]) GetCAS(key TKey) *CASMutex {
+	lck := mm.mutextMap.GetAndSetIfNotContainsFunc(key, NewCASMutex)
+	return lck
+}

dataext/multiMutex_test.go

@@ -0,0 +1,89 @@
+package dataext
+
+import (
+	"context"
+	"testing"
+	"time"
+)
+
+func TestMultiMutex_LockDifferentKeys(t *testing.T) {
+	mm := NewMultiMutex[string]()
+	mm.Lock("a")
+	mm.Lock("b")
+	mm.Unlock("a")
+	mm.Unlock("b")
+}
+
+func TestMultiMutex_TryLockSameKey(t *testing.T) {
+	mm := NewMultiMutex[string]()
+	if !mm.TryLock("k") {
+		t.Fatal("TryLock should succeed first time")
+	}
+	if mm.TryLock("k") {
+		t.Fatal("TryLock should fail second time")
+	}
+	mm.Unlock("k")
+	if !mm.TryLock("k") {
+		t.Fatal("TryLock should succeed after unlock")
+	}
+	mm.Unlock("k")
+}
+
+func TestMultiMutex_TryLockDifferentKeys(t *testing.T) {
+	mm := NewMultiMutex[int]()
+	if !mm.TryLock(1) {
+		t.Fatal("TryLock(1) failed")
+	}
+	if !mm.TryLock(2) {
+		t.Fatal("TryLock(2) failed - different keys should be independent")
+	}
+	mm.Unlock(1)
+	mm.Unlock(2)
+}
+
+func TestMultiMutex_RLockMultiple(t *testing.T) {
+	mm := NewMultiMutex[string]()
+	if !mm.RTryLock("k") {
+		t.Fatal("first RTryLock failed")
+	}
+	if !mm.RTryLock("k") {
+		t.Fatal("second RTryLock failed")
+	}
+	mm.RUnlock("k")
+	mm.RUnlock("k")
+}
+
+func TestMultiMutex_TryLockWithTimeout(t *testing.T) {
+	mm := NewMultiMutex[string]()
+	mm.Lock("k")
+	if mm.TryLockWithTimeout("k", 10*time.Millisecond) {
+		t.Fatal("expected timeout failure")
+	}
+	mm.Unlock("k")
+}
+
+func TestMultiMutex_TryLockWithContext(t *testing.T) {
+	mm := NewMultiMutex[string]()
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
+	defer cancel()
+	if !mm.TryLockWithContext(ctx, "k") {
+		t.Fatal("TryLockWithContext should succeed on free key")
+	}
+	mm.Unlock("k")
+}
+
+func TestMultiMutex_GetAndGetCAS(t *testing.T) {
+	mm := NewMultiMutex[string]()
+	l := mm.Get("a")
+	if l == nil {
+		t.Fatal("Get returned nil")
+	}
+	cas := mm.GetCAS("a")
+	if cas == nil {
+		t.Fatal("GetCAS returned nil")
+	}
+	rl := mm.RLocker("a")
+	if rl == nil {
+		t.Fatal("RLocker returned nil")
+	}
+}

dataext/mutexSet.go

@@ -0,0 +1,53 @@
+package dataext
+
+import "sync"
+
+type MutexSet[T comparable] struct {
+	master sync.RWMutex
+	locks  map[T]*sync.RWMutex
+}
+
+func NewMutexSet[T comparable]() *MutexSet[T] {
+	return &MutexSet[T]{
+		master: sync.RWMutex{},
+		locks:  make(map[T]*sync.RWMutex),
+	}
+}
+
+func (ms *MutexSet[T]) get(key T) *sync.RWMutex {
+	ms.master.RLock()
+	if v, ok := ms.locks[key]; ok {
+		ms.master.RUnlock()
+		return v
+	}
+	ms.master.RUnlock()
+
+	// ---------
+
+	ms.master.Lock()
+	defer ms.master.Unlock()
+
+	if v, ok := ms.locks[key]; ok {
+		return v
+	}
+
+	m := &sync.RWMutex{}
+	ms.locks[key] = m
+	return m
+}
+
+func (ms *MutexSet[T]) Lock(key T) {
+	ms.get(key).Lock()
+}
+
+func (ms *MutexSet[T]) Unlock(key T) {
+	ms.get(key).Unlock()
+}
+
+func (ms *MutexSet[T]) RLock(key T) {
+	ms.get(key).RLock()
+}
+
+func (ms *MutexSet[T]) RUnlock(key T) {
+	ms.get(key).RUnlock()
+}

dataext/mutexSet_test.go

@@ -0,0 +1,51 @@
+package dataext
+
+import (
+	"sync"
+	"sync/atomic"
+	"testing"
+)
+
+func TestMutexSet_BasicLockUnlock(t *testing.T) {
+	ms := NewMutexSet[string]()
+	ms.Lock("a")
+	ms.Unlock("a")
+	ms.RLock("b")
+	ms.RUnlock("b")
+}
+
+func TestMutexSet_DifferentKeysIndependent(t *testing.T) {
+	ms := NewMutexSet[int]()
+	ms.Lock(1)
+	ms.Lock(2)
+	ms.Unlock(1)
+	ms.Unlock(2)
+}
+
+func TestMutexSet_SameKeyMutuallyExclusive(t *testing.T) {
+	ms := NewMutexSet[string]()
+	var counter int64
+	const n = 50
+	var wg sync.WaitGroup
+	wg.Add(n)
+	for i := 0; i < n; i++ {
+		go func() {
+			defer wg.Done()
+			ms.Lock("shared")
+			atomic.AddInt64(&counter, 1)
+			ms.Unlock("shared")
+		}()
+	}
+	wg.Wait()
+	if atomic.LoadInt64(&counter) != n {
+		t.Fatalf("got %d want %d", counter, n)
+	}
+}
+
+func TestMutexSet_RLockMultiple(t *testing.T) {
+	ms := NewMutexSet[string]()
+	ms.RLock("k")
+	ms.RLock("k")
+	ms.RUnlock("k")
+	ms.RUnlock("k")
+}

dataext/optional_test.go

@@ -0,0 +1,142 @@
+package dataext
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestJsonOpt_NewAndEmpty(t *testing.T) {
+	o := NewJsonOpt[int](42)
+	if !o.IsSet() {
+		t.Fatal("expected IsSet=true")
+	}
+	if o.IsUnset() {
+		t.Fatal("expected IsUnset=false")
+	}
+
+	e := EmptyJsonOpt[int]()
+	if e.IsSet() {
+		t.Fatal("expected IsSet=false")
+	}
+	if !e.IsUnset() {
+		t.Fatal("expected IsUnset=true")
+	}
+}
+
+func TestJsonOpt_Value(t *testing.T) {
+	o := NewJsonOpt[string]("hello")
+	v, ok := o.Value()
+	if !ok || v != "hello" {
+		t.Fatalf("got (%q,%v)", v, ok)
+	}
+
+	e := EmptyJsonOpt[string]()
+	v, ok = e.Value()
+	if ok || v != "" {
+		t.Fatalf("empty got (%q,%v)", v, ok)
+	}
+}
+
+func TestJsonOpt_ValueOrNil(t *testing.T) {
+	o := NewJsonOpt[int](7)
+	p := o.ValueOrNil()
+	if p == nil || *p != 7 {
+		t.Fatalf("expected ptr to 7")
+	}
+	e := EmptyJsonOpt[int]()
+	if e.ValueOrNil() != nil {
+		t.Fatal("expected nil")
+	}
+}
+
+func TestJsonOpt_ValueDblPtrOrNil(t *testing.T) {
+	o := NewJsonOpt[int](7)
+	p := o.ValueDblPtrOrNil()
+	if p == nil || *p == nil || **p != 7 {
+		t.Fatalf("expected double ptr to 7")
+	}
+	e := EmptyJsonOpt[int]()
+	if e.ValueDblPtrOrNil() != nil {
+		t.Fatal("expected nil")
+	}
+}
+
+func TestJsonOpt_MustValue(t *testing.T) {
+	o := NewJsonOpt[int](9)
+	if o.MustValue() != 9 {
+		t.Fatal("MustValue wrong")
+	}
+	defer func() {
+		if recover() == nil {
+			t.Fatal("expected panic")
+		}
+	}()
+	EmptyJsonOpt[int]().MustValue()
+}
+
+func TestJsonOpt_IfSet(t *testing.T) {
+	called := false
+	NewJsonOpt[int](1).IfSet(func(v int) {
+		called = true
+		if v != 1 {
+			t.Fatalf("v=%d", v)
+		}
+	})
+	if !called {
+		t.Fatal("IfSet did not invoke fn")
+	}
+
+	called = false
+	EmptyJsonOpt[int]().IfSet(func(v int) { called = true })
+	if called {
+		t.Fatal("IfSet invoked fn on empty")
+	}
+}
+
+func TestJsonOpt_MarshalJSON(t *testing.T) {
+	o := NewJsonOpt[int](5)
+	b, err := json.Marshal(o)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(b) != "5" {
+		t.Fatalf("got %s", b)
+	}
+
+	e := EmptyJsonOpt[int]()
+	b, err = json.Marshal(e)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(b) != "null" {
+		t.Fatalf("got %s", b)
+	}
+}
+
+func TestJsonOpt_UnmarshalJSON(t *testing.T) {
+	var o JsonOpt[int]
+	if err := json.Unmarshal([]byte("42"), &o); err != nil {
+		t.Fatal(err)
+	}
+	if !o.IsSet() {
+		t.Fatal("should be set")
+	}
+	if v, _ := o.Value(); v != 42 {
+		t.Fatalf("got %d", v)
+	}
+}
+
+func TestJsonOpt_StructWithJsonOpt(t *testing.T) {
+	type S struct {
+		A JsonOpt[int]    `json:"a"`
+		B JsonOpt[string] `json:"b"`
+	}
+	s := S{A: NewJsonOpt[int](1), B: EmptyJsonOpt[string]()}
+	b, err := json.Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(b) != `{"a":1,"b":null}` {
+		t.Fatalf("got %s", b)
+	}
+}

dataext/orderedMap.go

@@ -0,0 +1,187 @@
+package dataext
+
+import (
+	"fmt"
+	"iter"
+)
+
+// OrderedMap is like a normal map[TKey, TVal] - but its elements stay in order
+// NOT THREADSAFE !!!
+type OrderedMap[TKey comparable, TVal any] struct {
+	m map[TKey]*TVal
+	a []TKey
+}
+
+func NewOrderedMap[TKey comparable, TVal any](caps ...int) *OrderedMap[TKey, TVal] {
+	if len(caps) == 0 {
+		return &OrderedMap[TKey, TVal]{
+			m: make(map[TKey]*TVal),
+			a: make([]TKey, 0),
+		}
+	}
+
+	omcap := 0
+	for _, v := range caps {
+		omcap += v
+	}
+
+	return &OrderedMap[TKey, TVal]{
+		m: make(map[TKey]*TVal, omcap),
+		a: make([]TKey, 0, omcap),
+	}
+}
+
+func (o *OrderedMap[TKey, TVal]) Get(key TKey) (TVal, bool) {
+	v, ok := o.m[key]
+	if ok {
+		return *v, ok
+	}
+
+	return *new(TVal), false
+}
+
+func (o *OrderedMap[TKey, TVal]) GetOrNil(key TKey) *TVal {
+	v, ok := o.m[key]
+	if ok {
+		return v
+	}
+
+	return nil
+}
+
+func (o *OrderedMap[TKey, TVal]) GetOrDefault(key TKey, defaultVal TVal) TVal {
+	v, ok := o.m[key]
+	if ok {
+		return *v
+	}
+
+	return defaultVal
+}
+
+// Add adds the new value to the map
+// At the end of the map-ordering (even if key already exists, its then "moved" to the end)
+// returns true if key already existed
+func (o *OrderedMap[TKey, TVal]) Add(key TKey, val TVal) bool {
+	if _, ok := o.m[key]; ok {
+		o.remFromArray(key)
+		o.m[key] = &val
+		o.a = append(o.a, key)
+		return true
+	}
+
+	o.m[key] = &val
+	o.a = append(o.a, key)
+	return false
+}
+
+// AddOrReplace adds the new value to the map
+// Normally at the end of the map, but if teh key already exists, its only replaced
+// returns true if key already existed
+func (o *OrderedMap[TKey, TVal]) AddOrReplace(key TKey, val TVal) bool {
+	if _, ok := o.m[key]; ok {
+		o.m[key] = &val
+		return true
+	}
+
+	o.m[key] = &val
+	o.a = append(o.a, key)
+	return false
+}
+
+func (o *OrderedMap[TKey, TVal]) Remove(key TKey) bool {
+	if _, ok := o.m[key]; ok {
+		o.remFromArray(key)
+		delete(o.m, key)
+		return true
+	}
+
+	return false
+}
+
+func (o *OrderedMap[TKey, TVal]) Iterate() iter.Seq2[TKey, TVal] {
+	return func(yield func(TKey, TVal) bool) {
+		for _, v := range o.a {
+			if !yield(v, *o.m[v]) {
+				return
+			}
+		}
+	}
+}
+
+func (o *OrderedMap[TKey, TVal]) IterateValues() iter.Seq[TVal] {
+	return func(yield func(TVal) bool) {
+		for _, v := range o.a {
+			if !yield(*o.m[v]) {
+				return
+			}
+		}
+	}
+}
+
+func (o *OrderedMap[TKey, TVal]) IterateKeys() iter.Seq[TKey] {
+	return func(yield func(TKey) bool) {
+		for _, v := range o.a {
+			if !yield(v) {
+				return
+			}
+		}
+	}
+}
+
+func (o *OrderedMap[TKey, TVal]) Array() []TVal {
+	res := make([]TVal, len(o.a))
+	for i, v := range o.a {
+		res[i] = *o.m[v]
+	}
+
+	return res
+}
+
+func (o *OrderedMap[TKey, TVal]) Keys() []TKey {
+	res := make([]TKey, len(o.a))
+	for i, v := range o.a {
+		res[i] = v
+	}
+
+	return res
+}
+
+func (o *OrderedMap[TKey, TVal]) Clear() {
+	mapCap := max(len(o.m), cap(o.a))
+	o.m = make(map[TKey]*TVal, mapCap)
+	o.a = make([]TKey, 0, mapCap)
+}
+
+func (o *OrderedMap[TKey, TVal]) Size() int {
+	return len(o.a)
+}
+
+func (o *OrderedMap[TKey, TVal]) Capacity() int {
+	return min(cap(o.a), len(o.m))
+}
+
+func (o *OrderedMap[TKey, TVal]) Contains(key TKey) bool {
+	_, ok := o.m[key]
+	return ok
+}
+
+func (o *OrderedMap[TKey, TVal]) IndexOf(key TKey) int {
+	for i, v := range o.a {
+		if v == key {
+			return i
+		}
+	}
+
+	return -1
+}
+
+func (o *OrderedMap[TKey, TVal]) remFromArray(key TKey) {
+	for i, v := range o.a {
+		if v == key {
+			o.a = append(o.a[:i], o.a[i+1:]...)
+			return
+		}
+	}
+
+	panic(fmt.Sprintf("Failed to remove key from OrderedMap -- key '%v' not found", key))
+}

dataext/orderedMap_test.go

@@ -0,0 +1,429 @@
+package dataext
+
+import (
+	"slices"
+	"testing"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+)
+
+func TestOrderedMapNew(t *testing.T) {
+	m := NewOrderedMap[string, int](4)
+
+	tst.AssertEqual(t, m.Size(), 0)
+	tst.AssertArrayEqual(t, m.Keys(), []string{})
+	tst.AssertArrayEqual(t, m.Array(), []int{})
+}
+
+func TestOrderedMapNewNoCap(t *testing.T) {
+	m := NewOrderedMap[string, int]()
+
+	tst.AssertEqual(t, m.Size(), 0)
+	tst.AssertArrayEqual(t, m.Keys(), []string{})
+	tst.AssertArrayEqual(t, m.Array(), []int{})
+}
+
+func TestOrderedMapNewWIthCap(t *testing.T) {
+	m := NewOrderedMap[string, int](4)
+
+	tst.AssertEqual(t, m.Size(), 0)
+	tst.AssertArrayEqual(t, m.Keys(), []string{})
+	tst.AssertArrayEqual(t, m.Array(), []int{})
+}
+
+func TestOrderedMapAddAndGet(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	tst.AssertFalse(t, m.Add("a", 1))
+	tst.AssertFalse(t, m.Add("b", 2))
+	tst.AssertFalse(t, m.Add("c", 3))
+
+	tst.AssertEqual(t, m.Size(), 3)
+
+	v, ok := m.Get("a")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v, 1)
+
+	v, ok = m.Get("b")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v, 2)
+
+	v, ok = m.Get("c")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v, 3)
+
+	v, ok = m.Get("missing")
+	tst.AssertFalse(t, ok)
+	tst.AssertEqual(t, v, 0)
+}
+
+func TestOrderedMapOrderPreserved(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	m.Add("first", 1)
+	m.Add("second", 2)
+	m.Add("third", 3)
+	m.Add("fourth", 4)
+
+	tst.AssertArrayEqual(t, m.Keys(), []string{"first", "second", "third", "fourth"})
+	tst.AssertArrayEqual(t, m.Array(), []int{1, 2, 3, 4})
+}
+
+func TestOrderedMapAddMovesExistingToEnd(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	tst.AssertTrue(t, m.Add("a", 10))
+
+	tst.AssertArrayEqual(t, m.Keys(), []string{"b", "c", "a"})
+	tst.AssertArrayEqual(t, m.Array(), []int{2, 3, 10})
+
+	v, ok := m.Get("a")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v, 10)
+}
+
+func TestOrderedMapAddOrReplaceKeepsOrder(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	tst.AssertTrue(t, m.AddOrReplace("b", 99))
+
+	tst.AssertArrayEqual(t, m.Keys(), []string{"a", "b", "c"})
+	tst.AssertArrayEqual(t, m.Array(), []int{1, 99, 3})
+
+	v, ok := m.Get("b")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v, 99)
+}
+
+func TestOrderedMapAddOrReplaceNew(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	tst.AssertFalse(t, m.AddOrReplace("a", 1))
+	tst.AssertFalse(t, m.AddOrReplace("b", 2))
+
+	tst.AssertArrayEqual(t, m.Keys(), []string{"a", "b"})
+	tst.AssertArrayEqual(t, m.Array(), []int{1, 2})
+}
+
+func TestOrderedMapGetOrNil(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 42)
+
+	v := m.GetOrNil("a")
+	if v == nil {
+		t.Errorf("expected non-nil pointer")
+		return
+	}
+	tst.AssertEqual(t, *v, 42)
+
+	v = m.GetOrNil("missing")
+	if v != nil {
+		t.Errorf("expected nil pointer")
+	}
+}
+
+func TestOrderedMapGetOrDefault(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 42)
+
+	tst.AssertEqual(t, m.GetOrDefault("a", -1), 42)
+	tst.AssertEqual(t, m.GetOrDefault("missing", -1), -1)
+}
+
+func TestOrderedMapRemove(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	tst.AssertTrue(t, m.Remove("b"))
+
+	tst.AssertEqual(t, m.Size(), 2)
+	tst.AssertArrayEqual(t, m.Keys(), []string{"a", "c"})
+	tst.AssertArrayEqual(t, m.Array(), []int{1, 3})
+
+	_, ok := m.Get("b")
+	tst.AssertFalse(t, ok)
+	tst.AssertFalse(t, m.Contains("b"))
+}
+
+func TestOrderedMapRemoveMissing(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	m.Add("a", 1)
+	tst.AssertFalse(t, m.Remove("missing"))
+
+	tst.AssertEqual(t, m.Size(), 1)
+	tst.AssertArrayEqual(t, m.Keys(), []string{"a"})
+}
+
+func TestOrderedMapRemoveFirstAndLast(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+	m.Add("d", 4)
+
+	tst.AssertTrue(t, m.Remove("a"))
+	tst.AssertTrue(t, m.Remove("d"))
+
+	tst.AssertArrayEqual(t, m.Keys(), []string{"b", "c"})
+	tst.AssertArrayEqual(t, m.Array(), []int{2, 3})
+}
+
+func TestOrderedMapContains(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+
+	tst.AssertTrue(t, m.Contains("a"))
+	tst.AssertFalse(t, m.Contains("b"))
+
+	m.Remove("a")
+	tst.AssertFalse(t, m.Contains("a"))
+}
+
+func TestOrderedMapIndexOf(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	tst.AssertEqual(t, m.IndexOf("a"), 0)
+	tst.AssertEqual(t, m.IndexOf("b"), 1)
+	tst.AssertEqual(t, m.IndexOf("c"), 2)
+	tst.AssertEqual(t, m.IndexOf("missing"), -1)
+
+	m.Add("a", 10) // moves to end
+	tst.AssertEqual(t, m.IndexOf("a"), 2)
+	tst.AssertEqual(t, m.IndexOf("b"), 0)
+	tst.AssertEqual(t, m.IndexOf("c"), 1)
+}
+
+func TestOrderedMapClear(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	m.Clear()
+
+	tst.AssertEqual(t, m.Size(), 0)
+	tst.AssertArrayEqual(t, m.Keys(), []string{})
+	tst.AssertArrayEqual(t, m.Array(), []int{})
+	tst.AssertFalse(t, m.Contains("a"))
+
+	m.Add("x", 99)
+	tst.AssertEqual(t, m.Size(), 1)
+	tst.AssertArrayEqual(t, m.Keys(), []string{"x"})
+}
+
+func TestOrderedMapSize(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	tst.AssertEqual(t, m.Size(), 0)
+
+	m.Add("a", 1)
+	tst.AssertEqual(t, m.Size(), 1)
+
+	m.Add("b", 2)
+	tst.AssertEqual(t, m.Size(), 2)
+
+	m.Add("a", 10) // replaces, size stays
+	tst.AssertEqual(t, m.Size(), 2)
+
+	m.AddOrReplace("b", 20) // replaces, size stays
+	tst.AssertEqual(t, m.Size(), 2)
+
+	m.Remove("a")
+	tst.AssertEqual(t, m.Size(), 1)
+}
+
+func TestOrderedMapIterate(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	got := make([]int, 0)
+	for v := range m.IterateValues() {
+		got = append(got, v)
+	}
+
+	tst.AssertArrayEqual(t, got, []int{1, 2, 3})
+}
+
+func TestOrderedMapIterateBreak(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	got := make([]int, 0)
+	for v := range m.IterateValues() {
+		got = append(got, v)
+		if v == 2 {
+			break
+		}
+	}
+
+	tst.AssertArrayEqual(t, got, []int{1, 2})
+}
+
+func TestOrderedMapIterateSeq2(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	gotKeys := make([]string, 0)
+	gotVals := make([]int, 0)
+	for k, v := range m.Iterate() {
+		gotKeys = append(gotKeys, k)
+		gotVals = append(gotVals, v)
+	}
+
+	tst.AssertArrayEqual(t, gotKeys, []string{"a", "b", "c"})
+	tst.AssertArrayEqual(t, gotVals, []int{1, 2, 3})
+}
+
+func TestOrderedMapIterateSeq2Break(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	gotKeys := make([]string, 0)
+	gotVals := make([]int, 0)
+	for k, v := range m.Iterate() {
+		gotKeys = append(gotKeys, k)
+		gotVals = append(gotVals, v)
+		if k == "b" {
+			break
+		}
+	}
+
+	tst.AssertArrayEqual(t, gotKeys, []string{"a", "b"})
+	tst.AssertArrayEqual(t, gotVals, []int{1, 2})
+}
+
+func TestOrderedMapIterateSeq2AfterReorder(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+	m.Add("a", 10) // moves "a" to end with new value
+
+	gotKeys := make([]string, 0)
+	gotVals := make([]int, 0)
+	for k, v := range m.Iterate() {
+		gotKeys = append(gotKeys, k)
+		gotVals = append(gotVals, v)
+	}
+
+	tst.AssertArrayEqual(t, gotKeys, []string{"b", "c", "a"})
+	tst.AssertArrayEqual(t, gotVals, []int{2, 3, 10})
+}
+
+func TestOrderedMapIterateKeys(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	got := make([]string, 0)
+	for k := range m.IterateKeys() {
+		got = append(got, k)
+	}
+
+	tst.AssertArrayEqual(t, got, []string{"a", "b", "c"})
+}
+
+func TestOrderedMapIterateKeysBreak(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+	m.Add("c", 3)
+
+	got := make([]string, 0)
+	for k := range m.IterateKeys() {
+		got = append(got, k)
+		if k == "b" {
+			break
+		}
+	}
+
+	tst.AssertArrayEqual(t, got, []string{"a", "b"})
+}
+
+func TestOrderedMapArrayIsCopy(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+
+	arr := m.Array()
+	arr[0] = 999
+
+	tst.AssertArrayEqual(t, m.Array(), []int{1, 2})
+}
+
+func TestOrderedMapKeysIsCopy(t *testing.T) {
+	m := NewOrderedMap[string, int](0)
+	m.Add("a", 1)
+	m.Add("b", 2)
+
+	keys := m.Keys()
+	keys[0] = "zzz"
+
+	tst.AssertArrayEqual(t, m.Keys(), []string{"a", "b"})
+}
+
+func TestOrderedMapIntKey(t *testing.T) {
+	m := NewOrderedMap[int, string](0)
+	m.Add(3, "three")
+	m.Add(1, "one")
+	m.Add(2, "two")
+
+	tst.AssertArrayEqual(t, m.Keys(), []int{3, 1, 2})
+	tst.AssertArrayEqual(t, m.Array(), []string{"three", "one", "two"})
+
+	v, ok := m.Get(1)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v, "one")
+}
+
+func TestOrderedMapStress(t *testing.T) {
+	m := NewOrderedMap[int, int](0)
+
+	for i := 0; i < 100; i++ {
+		m.Add(i, i*10)
+	}
+	tst.AssertEqual(t, m.Size(), 100)
+
+	for i := 0; i < 100; i++ {
+		v, ok := m.Get(i)
+		tst.AssertTrue(t, ok)
+		tst.AssertEqual(t, v, i*10)
+	}
+
+	for i := 0; i < 50; i++ {
+		m.Remove(i * 2)
+	}
+	tst.AssertEqual(t, m.Size(), 50)
+
+	expected := make([]int, 0, 50)
+	for i := 0; i < 50; i++ {
+		expected = append(expected, i*2+1)
+	}
+	keys := m.Keys()
+	slices.Sort(keys)
+	tst.AssertArrayEqual(t, keys, expected)
+}

dataext/pubsub.go

@@ -2,12 +2,13 @@ package dataext
 
 import (
 	"context"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
-	"github.com/rs/xid"
 	"iter"
 	"sync"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
+	"github.com/rs/xid"
 )
 
 // PubSub is a simple Pub/Sub Broker
@@ -162,6 +163,31 @@ func (ps *PubSub[TNamespace, TData]) PublishWithTimeout(ns TNamespace, data TDat
 	return subscriber, actualReceiver
 }
 
+// PublishAsync sends `data` to all subscriber
+// does not wait for subscriber (this method returns immediately), waits at most {timeout} seconds on channels (async)
+func (ps *PubSub[TNamespace, TData]) PublishAsync(ns TNamespace, data TData, timeout time.Duration) (subscriber int) {
+	ps.masterLock.Lock()
+	subs := langext.ArrCopy(ps.subscriptions[ns])
+	ps.masterLock.Unlock()
+
+	subscriber = len(subs)
+
+	for _, sub := range subs {
+		go func() {
+			sub.subLock.Lock()
+			defer sub.subLock.Unlock()
+
+			if sub.Func != nil {
+				go func() { sub.Func(data) }()
+			} else if sub.Chan != nil {
+				_ = syncext.WriteChannelWithTimeout(sub.Chan, data, timeout)
+			}
+		}()
+	}
+
+	return subscriber
+}
+
 func (ps *PubSub[TNamespace, TData]) SubscribeByCallback(ns TNamespace, fn func(TData)) PubSubSubscription {
 	ps.masterLock.Lock()
 	defer ps.masterLock.Unlock()

dataext/pubsub_test.go

@@ -129,15 +129,17 @@ func TestPubSub_SubscribeByIter(t *testing.T) {
 
 	// Channel to communicate when message is received
 	done := make(chan bool)
+	goroutineDone := make(chan struct{})
 	received := false
 
 	// Start a goroutine to use the iterator
 	go func() {
+		defer close(goroutineDone)
 		for msg := range iterSeq {
 			if msg == "hello" {
 				received = true
 				done <- true
-				return // Stop iteration
+				return // Stop iteration — triggers Unsubscribe via yield returning false
 			}
 		}
 	}()
@@ -158,6 +160,14 @@ func TestPubSub_SubscribeByIter(t *testing.T) {
 		t.Fatal("Timed out waiting for message")
 	}
 
+	// Wait for the goroutine to fully exit so Unsubscribe (triggered by the
+	// iterator cleanup when yield returns false) has completed.
+	select {
+	case <-goroutineDone:
+	case <-time.After(time.Second):
+		t.Fatal("Timed out waiting for goroutine to finish")
+	}
+
 	subCount := ps.SubscriberCount("test-ns")
 	if subCount != 0 {
 		t.Fatalf("Expected 0 receivers, got %d", subCount)

dataext/stack.go

@@ -2,7 +2,6 @@ package dataext
 
 import (
 	"errors"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"sync"
 )
 
@@ -64,7 +63,7 @@ func (s *Stack[T]) OptPop() *T {
 	result := s.data[l-1]
 	s.data = s.data[:l-1]
 
-	return langext.Ptr(result)
+	return new(result)
 }
 
 func (s *Stack[T]) Peek() (T, error) {
@@ -94,7 +93,7 @@ func (s *Stack[T]) OptPeek() *T {
 		return nil
 	}
 
-	return langext.Ptr(s.data[l-1])
+	return new(s.data[l-1])
 }
 
 func (s *Stack[T]) Length() int {

dataext/stack_test.go

@@ -0,0 +1,98 @@
+package dataext
+
+import (
+	"errors"
+	"sync"
+	"testing"
+)
+
+func TestStack_PushPop(t *testing.T) {
+	s := NewStack[int](false, 4)
+	s.Push(1)
+	s.Push(2)
+	s.Push(3)
+
+	if s.Length() != 3 {
+		t.Fatalf("Length=%d", s.Length())
+	}
+	if s.Empty() {
+		t.Fatal("should not be empty")
+	}
+
+	v, err := s.Pop()
+	if err != nil || v != 3 {
+		t.Fatalf("Pop got (%d,%v)", v, err)
+	}
+	v, err = s.Pop()
+	if err != nil || v != 2 {
+		t.Fatalf("Pop got (%d,%v)", v, err)
+	}
+	v, err = s.Pop()
+	if err != nil || v != 1 {
+		t.Fatalf("Pop got (%d,%v)", v, err)
+	}
+}
+
+func TestStack_PopEmpty(t *testing.T) {
+	s := NewStack[int](false, 0)
+	_, err := s.Pop()
+	if !errors.Is(err, ErrEmptyStack) {
+		t.Fatalf("expected ErrEmptyStack, got %v", err)
+	}
+	if !s.Empty() {
+		t.Fatal("should be empty")
+	}
+}
+
+func TestStack_Peek(t *testing.T) {
+	s := NewStack[string](false, 0)
+	if _, err := s.Peek(); !errors.Is(err, ErrEmptyStack) {
+		t.Fatalf("expected ErrEmptyStack got %v", err)
+	}
+	s.Push("a")
+	s.Push("b")
+	v, err := s.Peek()
+	if err != nil || v != "b" {
+		t.Fatalf("Peek got (%q,%v)", v, err)
+	}
+	if s.Length() != 2 {
+		t.Fatal("Peek must not pop")
+	}
+}
+
+func TestStack_OptPopOptPeek(t *testing.T) {
+	s := NewStack[int](false, 0)
+	if s.OptPop() != nil {
+		t.Fatal("OptPop on empty should return nil")
+	}
+	if s.OptPeek() != nil {
+		t.Fatal("OptPeek on empty should return nil")
+	}
+	s.Push(7)
+	if p := s.OptPeek(); p == nil || *p != 7 {
+		t.Fatalf("OptPeek bad")
+	}
+	if p := s.OptPop(); p == nil || *p != 7 {
+		t.Fatalf("OptPop bad")
+	}
+	if !s.Empty() {
+		t.Fatal("should be empty after OptPop")
+	}
+}
+
+func TestStack_ThreadSafe(t *testing.T) {
+	s := NewStack[int](true, 0)
+	var wg sync.WaitGroup
+	const n = 200
+	wg.Add(n)
+	for i := 0; i < n; i++ {
+		go func(v int) {
+			defer wg.Done()
+			s.Push(v)
+		}(i)
+	}
+	wg.Wait()
+	if s.Length() != n {
+		t.Fatalf("Length=%d want %d", s.Length(), n)
+	}
+}

dataext/structHash.go

@@ -82,7 +82,7 @@ func binarize(writer io.Writer, dat reflect.Value, opt StructHashOptions) error
 
 	err = binary.Write(writer, binary.LittleEndian, uint8(dat.Kind()))
 	switch dat.Kind() {
-	case reflect.Ptr, reflect.Map, reflect.Array, reflect.Chan, reflect.Slice, reflect.Interface:
+	case reflect.Pointer, reflect.Map, reflect.Array, reflect.Chan, reflect.Slice, reflect.Interface:
 		if dat.IsNil() {
 			err = binary.Write(writer, binary.LittleEndian, uint64(0))
 			if err != nil {

dataext/structHash_test.go

@@ -1,7 +1,6 @@
 package dataext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
 	"testing"
 )
@@ -46,7 +45,7 @@ func TestStructHashSimpleStruct(t *testing.T) {
 	tst.AssertHexEqual(t, "5d09090dc34ac59dd645f197a255f653387723de3afa1b614721ea5a081c675f", noErrStructHash(t, t0{
 		F1: 10,
 		F2: []string{"1", "2", "3"},
-		F3: langext.Ptr(99),
+		F3: new(99),
 	}))
 
 }

dataext/syncMap_test.go

@@ -0,0 +1,176 @@
+package dataext
+
+import (
+	"sort"
+	"sync"
+	"testing"
+)
+
+func TestSyncMap_SetGet(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	m.Set("a", 1)
+	v, ok := m.Get("a")
+	if !ok || v != 1 {
+		t.Fatalf("got (%d,%v)", v, ok)
+	}
+	if _, ok := m.Get("missing"); ok {
+		t.Fatal("expected missing")
+	}
+}
+
+func TestSyncMap_SetIfNotContains(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	if !m.SetIfNotContains("a", 1) {
+		t.Fatal("first set should succeed")
+	}
+	if m.SetIfNotContains("a", 2) {
+		t.Fatal("second set should fail")
+	}
+	v, _ := m.Get("a")
+	if v != 1 {
+		t.Fatalf("expected unchanged got %d", v)
+	}
+}
+
+func TestSyncMap_SetIfNotContainsFunc(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	calls := 0
+	if !m.SetIfNotContainsFunc("a", func() int { calls++; return 5 }) {
+		t.Fatal("first should succeed")
+	}
+	if m.SetIfNotContainsFunc("a", func() int { calls++; return 6 }) {
+		t.Fatal("second should fail")
+	}
+	if calls != 1 {
+		t.Fatalf("calls=%d want 1", calls)
+	}
+}
+
+func TestSyncMap_GetAndSetIfNotContains(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	if v := m.GetAndSetIfNotContains("a", 10); v != 10 {
+		t.Fatalf("got %d", v)
+	}
+	if v := m.GetAndSetIfNotContains("a", 99); v != 10 {
+		t.Fatalf("got %d", v)
+	}
+}
+
+func TestSyncMap_GetAndSetIfNotContainsFunc(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	calls := 0
+	if v := m.GetAndSetIfNotContainsFunc("a", func() int { calls++; return 1 }); v != 1 {
+		t.Fatalf("got %d", v)
+	}
+	if v := m.GetAndSetIfNotContainsFunc("a", func() int { calls++; return 2 }); v != 1 {
+		t.Fatalf("got %d", v)
+	}
+	if calls != 1 {
+		t.Fatalf("calls=%d", calls)
+	}
+}
+
+func TestSyncMap_Delete(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	m.Set("a", 1)
+	if !m.Delete("a") {
+		t.Fatal("delete existing returned false")
+	}
+	if m.Delete("a") {
+		t.Fatal("delete missing returned true")
+	}
+}
+
+func TestSyncMap_DeleteIf(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	m.Set("a", 1)
+	m.Set("b", 2)
+	m.Set("c", 3)
+	rm := m.DeleteIf(func(k string, v int) bool { return v%2 == 1 })
+	if rm != 2 {
+		t.Fatalf("removed=%d", rm)
+	}
+	if m.Count() != 1 {
+		t.Fatalf("count=%d", m.Count())
+	}
+}
+
+func TestSyncMap_UpdateIfExists(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	if m.UpdateIfExists("a", func(v int) int { return v + 1 }) {
+		t.Fatal("should be false on missing key")
+	}
+	m.Set("a", 5)
+	if !m.UpdateIfExists("a", func(v int) int { return v + 1 }) {
+		t.Fatal("should be true on existing")
+	}
+	v, _ := m.Get("a")
+	if v != 6 {
+		t.Fatalf("v=%d", v)
+	}
+}
+
+func TestSyncMap_UpdateOrInsert(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	if m.UpdateOrInsert("a", func(v int) int { return v + 1 }, 100) {
+		t.Fatal("should return false on insert")
+	}
+	if v, _ := m.Get("a"); v != 100 {
+		t.Fatalf("v=%d", v)
+	}
+	if !m.UpdateOrInsert("a", func(v int) int { return v + 1 }, 100) {
+		t.Fatal("should return true on update")
+	}
+	if v, _ := m.Get("a"); v != 101 {
+		t.Fatalf("v=%d", v)
+	}
+}
+
+func TestSyncMap_ClearContains(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	m.Set("a", 1)
+	if !m.Contains("a") {
+		t.Fatal("Contains should be true")
+	}
+	m.Clear()
+	if m.Contains("a") {
+		t.Fatal("after Clear should be false")
+	}
+	if m.Count() != 0 {
+		t.Fatalf("count=%d", m.Count())
+	}
+}
+
+func TestSyncMap_GetAllKeysValues(t *testing.T) {
+	m := NewSyncMap[string, int]()
+	m.Set("a", 1)
+	m.Set("b", 2)
+	m.Set("c", 3)
+	keys := m.GetAllKeys()
+	sort.Strings(keys)
+	if len(keys) != 3 || keys[0] != "a" || keys[2] != "c" {
+		t.Fatalf("keys=%v", keys)
+	}
+	vals := m.GetAllValues()
+	sort.Ints(vals)
+	if len(vals) != 3 || vals[0] != 1 || vals[2] != 3 {
+		t.Fatalf("vals=%v", vals)
+	}
+}
+
+func TestSyncMap_Concurrent(t *testing.T) {
+	m := NewSyncMap[int, int]()
+	var wg sync.WaitGroup
+	const n = 200
+	wg.Add(n)
+	for i := 0; i < n; i++ {
+		go func(k int) {
+			defer wg.Done()
+			m.Set(k, k*2)
+		}(i)
+	}
+	wg.Wait()
+	if m.Count() != n {
+		t.Fatalf("count=%d want %d", m.Count(), n)
+	}
+}

dataext/syncRingSet_test.go

@@ -0,0 +1,84 @@
+package dataext
+
+import (
+	"sort"
+	"testing"
+)
+
+func TestSyncRingSet_AddAndContains(t *testing.T) {
+	s := NewSyncRingSet[int](3)
+	if !s.Add(1) {
+		t.Fatal("first Add(1) should be true")
+	}
+	if s.Add(1) {
+		t.Fatal("duplicate Add(1) should be false")
+	}
+	if !s.Contains(1) {
+		t.Fatal("expected Contains(1)")
+	}
+}
+
+func TestSyncRingSet_CapacityEvicts(t *testing.T) {
+	s := NewSyncRingSet[int](3)
+	s.Add(1)
+	s.Add(2)
+	s.Add(3)
+	s.Add(4) // should evict the oldest (1)
+	if s.Contains(1) {
+		t.Fatal("1 should have been evicted")
+	}
+	for _, v := range []int{2, 3, 4} {
+		if !s.Contains(v) {
+			t.Fatalf("expected %d", v)
+		}
+	}
+}
+
+func TestSyncRingSet_Remove(t *testing.T) {
+	s := NewSyncRingSet[string](3)
+	s.Add("a")
+	s.Add("b")
+	if !s.Remove("a") {
+		t.Fatal("remove existing failed")
+	}
+	if s.Remove("a") {
+		t.Fatal("remove missing returned true")
+	}
+	if s.Contains("a") {
+		t.Fatal("a should be gone")
+	}
+}
+
+func TestSyncRingSet_AddAllRemoveAll(t *testing.T) {
+	s := NewSyncRingSet[int](10)
+	s.AddAll([]int{1, 2, 3, 2})
+	out := s.Get()
+	sort.Ints(out)
+	if len(out) != 3 {
+		t.Fatalf("got %v", out)
+	}
+
+	s.RemoveAll([]int{1, 99})
+	if s.Contains(1) {
+		t.Fatal("1 should be removed")
+	}
+	if !s.Contains(2) || !s.Contains(3) {
+		t.Fatal("2/3 should remain")
+	}
+}
+
+func TestSyncRingSet_AddIfNotContainsRemoveIfContains(t *testing.T) {
+	s := NewSyncRingSet[string](5)
+	if !s.AddIfNotContains("x") {
+		t.Fatal("first should succeed")
+	}
+	if s.AddIfNotContains("x") {
+		t.Fatal("second should fail")
+	}
+	if !s.RemoveIfContains("x") {
+		t.Fatal("remove existing failed")
+	}
+	if s.RemoveIfContains("x") {
+		t.Fatal("remove missing returned true")
+	}
+}

dataext/syncSet_test.go

@@ -0,0 +1,82 @@
+package dataext
+
+import (
+	"sort"
+	"testing"
+)
+
+func TestSyncSet_Add(t *testing.T) {
+	s := NewSyncSet[string]()
+	if !s.Add("a") {
+		t.Fatal("first add should be true")
+	}
+	if s.Add("a") {
+		t.Fatal("duplicate add should be false")
+	}
+	if !s.Contains("a") {
+		t.Fatal("Contains a should be true")
+	}
+}
+
+func TestSyncSet_AddAll(t *testing.T) {
+	s := NewSyncSet[int]()
+	s.AddAll([]int{1, 2, 3, 2})
+	if !s.Contains(1) || !s.Contains(2) || !s.Contains(3) {
+		t.Fatal("missing items")
+	}
+	if len(s.Get()) != 3 {
+		t.Fatalf("got len %d", len(s.Get()))
+	}
+}
+
+func TestSyncSet_Remove(t *testing.T) {
+	s := NewSyncSet[string]()
+	s.Add("a")
+	if !s.Remove("a") {
+		t.Fatal("remove existing failed")
+	}
+	if s.Remove("a") {
+		t.Fatal("remove missing returned true")
+	}
+	if s.Contains("a") {
+		t.Fatal("still contains after remove")
+	}
+}
+
+func TestSyncSet_RemoveAll(t *testing.T) {
+	s := NewSyncSet[int]()
+	s.AddAll([]int{1, 2, 3})
+	s.RemoveAll([]int{1, 2, 99})
+	if s.Contains(1) || s.Contains(2) {
+		t.Fatal("should be removed")
+	}
+	if !s.Contains(3) {
+		t.Fatal("3 should remain")
+	}
+}
+
+func TestSyncSet_Get(t *testing.T) {
+	s := NewSyncSet[int]()
+	s.AddAll([]int{3, 1, 2})
+	out := s.Get()
+	sort.Ints(out)
+	if len(out) != 3 || out[0] != 1 || out[2] != 3 {
+		t.Fatalf("out=%v", out)
+	}
+}
+
+func TestSyncSet_AddIfNotContainsRemoveIfContains(t *testing.T) {
+	s := NewSyncSet[string]()
+	if !s.AddIfNotContains("x") {
+		t.Fatal("first AddIfNotContains failed")
+	}
+	if s.AddIfNotContains("x") {
+		t.Fatal("second AddIfNotContains succeeded")
+	}
+	if !s.RemoveIfContains("x") {
+		t.Fatal("RemoveIfContains failed")
+	}
+	if s.RemoveIfContains("x") {
+		t.Fatal("RemoveIfContains on missing succeeded")
+	}
+}

dataext/tuple_test.go

@@ -0,0 +1,136 @@
+package dataext
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestSingle(t *testing.T) {
+	s := NewSingle[int](7)
+	if s.V1 != 7 {
+		t.Fatalf("V1=%d", s.V1)
+	}
+	if s.TupleLength() != 1 {
+		t.Fatalf("len=%d", s.TupleLength())
+	}
+	if !reflect.DeepEqual(s.TupleValues(), []any{7}) {
+		t.Fatalf("values=%v", s.TupleValues())
+	}
+	if NewTuple1[int](7).V1 != 7 {
+		t.Fatal("NewTuple1 mismatch")
+	}
+}
+
+func TestTuple(t *testing.T) {
+	tp := NewTuple[int, string](1, "two")
+	if tp.V1 != 1 || tp.V2 != "two" {
+		t.Fatal("values wrong")
+	}
+	if tp.TupleLength() != 2 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(tp.TupleValues(), []any{1, "two"}) {
+		t.Fatalf("values=%v", tp.TupleValues())
+	}
+	if NewTuple2[int, string](1, "two") != tp {
+		t.Fatal("NewTuple2 mismatch")
+	}
+}
+
+func TestTriple(t *testing.T) {
+	tr := NewTriple[int, string, bool](1, "x", true)
+	if tr.TupleLength() != 3 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(tr.TupleValues(), []any{1, "x", true}) {
+		t.Fatalf("values=%v", tr.TupleValues())
+	}
+	if NewTuple3[int, string, bool](1, "x", true) != tr {
+		t.Fatal("NewTuple3 mismatch")
+	}
+}
+
+func TestQuadruple(t *testing.T) {
+	q := NewQuadruple[int, int, int, int](1, 2, 3, 4)
+	if q.TupleLength() != 4 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(q.TupleValues(), []any{1, 2, 3, 4}) {
+		t.Fatalf("values=%v", q.TupleValues())
+	}
+	if NewTuple4[int, int, int, int](1, 2, 3, 4) != q {
+		t.Fatal("NewTuple4 mismatch")
+	}
+}
+
+func TestQuintuple(t *testing.T) {
+	q := NewQuintuple[int, int, int, int, int](1, 2, 3, 4, 5)
+	if q.TupleLength() != 5 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(q.TupleValues(), []any{1, 2, 3, 4, 5}) {
+		t.Fatalf("values=%v", q.TupleValues())
+	}
+	if NewTuple5[int, int, int, int, int](1, 2, 3, 4, 5) != q {
+		t.Fatal("NewTuple5 mismatch")
+	}
+}
+
+func TestSextuple(t *testing.T) {
+	s := NewSextuple[int, int, int, int, int, int](1, 2, 3, 4, 5, 6)
+	if s.TupleLength() != 6 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(s.TupleValues(), []any{1, 2, 3, 4, 5, 6}) {
+		t.Fatalf("values=%v", s.TupleValues())
+	}
+	if NewTuple6[int, int, int, int, int, int](1, 2, 3, 4, 5, 6) != s {
+		t.Fatal("NewTuple6 mismatch")
+	}
+}
+
+func TestSeptuple(t *testing.T) {
+	s := NewSeptuple[int, int, int, int, int, int, int](1, 2, 3, 4, 5, 6, 7)
+	if s.TupleLength() != 7 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(s.TupleValues(), []any{1, 2, 3, 4, 5, 6, 7}) {
+		t.Fatalf("values=%v", s.TupleValues())
+	}
+	if NewTuple7[int, int, int, int, int, int, int](1, 2, 3, 4, 5, 6, 7) != s {
+		t.Fatal("NewTuple7 mismatch")
+	}
+}
+
+func TestOctuple(t *testing.T) {
+	o := NewOctuple[int, int, int, int, int, int, int, int](1, 2, 3, 4, 5, 6, 7, 8)
+	if o.TupleLength() != 8 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(o.TupleValues(), []any{1, 2, 3, 4, 5, 6, 7, 8}) {
+		t.Fatalf("values=%v", o.TupleValues())
+	}
+	if NewTuple8[int, int, int, int, int, int, int, int](1, 2, 3, 4, 5, 6, 7, 8) != o {
+		t.Fatal("NewTuple8 mismatch")
+	}
+}
+
+func TestNonuple(t *testing.T) {
+	n := NewNonuple[int, int, int, int, int, int, int, int, int](1, 2, 3, 4, 5, 6, 7, 8, 9)
+	if n.TupleLength() != 9 {
+		t.Fatal("len wrong")
+	}
+	if !reflect.DeepEqual(n.TupleValues(), []any{1, 2, 3, 4, 5, 6, 7, 8, 9}) {
+		t.Fatalf("values=%v", n.TupleValues())
+	}
+	if NewTuple9[int, int, int, int, int, int, int, int, int](1, 2, 3, 4, 5, 6, 7, 8, 9) != n {
+		t.Fatal("NewTuple9 mismatch")
+	}
+}
+
+func TestValueGroupInterface(t *testing.T) {
+	var vg ValueGroup = NewTuple[int, string](1, "a")
+	if vg.TupleLength() != 2 {
+		t.Fatal("interface length wrong")
+	}
+}

enums/enum.go

@@ -1,5 +1,7 @@
 package enums
 
+import "maps"
+
 import "encoding/json"
 
 type Enum interface {
@@ -45,9 +47,7 @@ type EnumDataMetaValue struct {
 func (v EnumDataMetaValue) MarshalJSON() ([]byte, error) {
 	m := make(map[string]any, 8)
 
-	for k, dv := range v.Data {
-		m[k] = dv
-	}
+	maps.Copy(m, v.Data)
 
 	m["varName"] = v.VarName
 	m["value"] = v.Value

enums/enum_test.go

@@ -0,0 +1,258 @@
+package enums
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+)
+
+type mockEnum struct {
+	name string
+}
+
+func (m mockEnum) Valid() bool                  { return m.name != "" }
+func (m mockEnum) ValuesAny() []any              { return []any{mockEnum{name: "a"}, mockEnum{name: "b"}} }
+func (m mockEnum) ValuesMeta() []EnumMetaValue   { return nil }
+func (m mockEnum) VarName() string               { return m.name }
+func (m mockEnum) TypeName() string              { return "mockEnum" }
+func (m mockEnum) PackageName() string           { return "enums_test" }
+func (m mockEnum) String() string                { return "str:" + m.name }
+func (m mockEnum) Description() string           { return "desc:" + m.name }
+func (m mockEnum) DescriptionMeta() EnumDescriptionMetaValue {
+	return EnumDescriptionMetaValue{VarName: m.name, Value: m, Description: "desc:" + m.name}
+}
+
+func (m mockEnum) MarshalJSON() ([]byte, error) {
+	return json.Marshal(m.name)
+}
+
+func TestMockEnumImplementsInterfaces(t *testing.T) {
+	var _ Enum = mockEnum{}
+	var _ StringEnum = mockEnum{}
+	var _ DescriptionEnum = mockEnum{}
+}
+
+func TestEnumValid(t *testing.T) {
+	if !(mockEnum{name: "x"}).Valid() {
+		t.Errorf("expected Valid() == true")
+	}
+	if (mockEnum{}).Valid() {
+		t.Errorf("expected Valid() == false for zero value")
+	}
+}
+
+func TestEnumMetaValueJSON(t *testing.T) {
+	desc := "the-description"
+	mv := EnumMetaValue{
+		VarName:     "Foo",
+		Value:       mockEnum{name: "foo"},
+		Description: &desc,
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	if got["varName"] != "Foo" {
+		t.Errorf("varName == %v, want Foo", got["varName"])
+	}
+	if got["value"] != "foo" {
+		t.Errorf("value == %v, want foo", got["value"])
+	}
+	if got["description"] != "the-description" {
+		t.Errorf("description == %v, want the-description", got["description"])
+	}
+}
+
+func TestEnumMetaValueJSONNilDescription(t *testing.T) {
+	mv := EnumMetaValue{
+		VarName:     "Foo",
+		Value:       mockEnum{name: "foo"},
+		Description: nil,
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	if got["description"] != nil {
+		t.Errorf("description == %v, want nil", got["description"])
+	}
+}
+
+func TestEnumDescriptionMetaValueJSON(t *testing.T) {
+	mv := EnumDescriptionMetaValue{
+		VarName:     "Bar",
+		Value:       mockEnum{name: "bar"},
+		Description: "bar-desc",
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	expected := map[string]any{
+		"varName":     "Bar",
+		"value":       "bar",
+		"description": "bar-desc",
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Errorf("json output == %v, want %v", got, expected)
+	}
+}
+
+func TestEnumDataMetaValueMarshalJSON(t *testing.T) {
+	desc := "data-desc"
+	mv := EnumDataMetaValue{
+		VarName:     "Baz",
+		Value:       mockEnum{name: "baz"},
+		Description: &desc,
+		Data: map[string]any{
+			"extra1": "hello",
+			"extra2": float64(42),
+		},
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	if got["varName"] != "Baz" {
+		t.Errorf("varName == %v, want Baz", got["varName"])
+	}
+	if got["value"] != "baz" {
+		t.Errorf("value == %v, want baz", got["value"])
+	}
+	if got["description"] != "data-desc" {
+		t.Errorf("description == %v, want data-desc", got["description"])
+	}
+	if got["extra1"] != "hello" {
+		t.Errorf("extra1 == %v, want hello", got["extra1"])
+	}
+	if got["extra2"] != float64(42) {
+		t.Errorf("extra2 == %v, want 42", got["extra2"])
+	}
+}
+
+func TestEnumDataMetaValueMarshalJSONNilData(t *testing.T) {
+	mv := EnumDataMetaValue{
+		VarName:     "Baz",
+		Value:       mockEnum{name: "baz"},
+		Description: nil,
+		Data:        nil,
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	if got["varName"] != "Baz" {
+		t.Errorf("varName == %v, want Baz", got["varName"])
+	}
+	if got["value"] != "baz" {
+		t.Errorf("value == %v, want baz", got["value"])
+	}
+	if _, ok := got["description"]; !ok {
+		t.Errorf("description key missing in JSON output")
+	}
+	if got["description"] != nil {
+		t.Errorf("description == %v, want nil", got["description"])
+	}
+	if len(got) != 3 {
+		t.Errorf("expected 3 keys with nil Data, got %d: %v", len(got), got)
+	}
+}
+
+func TestEnumDataMetaValueMarshalJSONDataDoesNotOverrideStandardFields(t *testing.T) {
+	desc := "real-desc"
+	mv := EnumDataMetaValue{
+		VarName:     "Real",
+		Value:       mockEnum{name: "real"},
+		Description: &desc,
+		Data: map[string]any{
+			"varName":     "ShouldBeOverwritten",
+			"value":       "ShouldBeOverwritten",
+			"description": "ShouldBeOverwritten",
+			"keep":        "kept",
+		},
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	if got["varName"] != "Real" {
+		t.Errorf("varName == %v, want Real (standard field must override Data)", got["varName"])
+	}
+	if got["value"] != "real" {
+		t.Errorf("value == %v, want real (standard field must override Data)", got["value"])
+	}
+	if got["description"] != "real-desc" {
+		t.Errorf("description == %v, want real-desc (standard field must override Data)", got["description"])
+	}
+	if got["keep"] != "kept" {
+		t.Errorf("keep == %v, want kept", got["keep"])
+	}
+}
+
+func TestEnumDataMetaValueMarshalJSONEmptyData(t *testing.T) {
+	mv := EnumDataMetaValue{
+		VarName:     "E",
+		Value:       mockEnum{name: "e"},
+		Description: nil,
+		Data:        map[string]any{},
+	}
+
+	data, err := json.Marshal(mv)
+	if err != nil {
+		t.Fatalf("json.Marshal failed: %v", err)
+	}
+
+	var got map[string]any
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("json.Unmarshal failed: %v", err)
+	}
+
+	if got["varName"] != "E" {
+		t.Errorf("varName == %v, want E", got["varName"])
+	}
+	if got["value"] != "e" {
+		t.Errorf("value == %v, want e", got["value"])
+	}
+}

excelext/mapper.go

@@ -0,0 +1,300 @@
+package excelext
+
+import (
+	"reflect"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	excelize360 "github.com/360EntSecGroup-Skylar/excelize"
+	"github.com/xuri/excelize/v2"
+)
+
+type excelMapperColDefinition[T any] struct {
+	style  *int
+	header string
+	width  *float64
+	fn     func(T) (any, error)
+}
+
+type ExcelMapper[T any] struct {
+	StyleDate       *int
+	StyleDatetime   *int
+	StyleEUR        *int
+	StylePercentage *int
+	StyleHeader     *int
+	StyleWSHeader   *int
+
+	SkipColumnHeader bool
+
+	sheetName      string
+	wsHeader       []dataext.Tuple[string, *int]
+	colDefinitions []excelMapperColDefinition[T]
+	colFilter      []func(v T) bool
+}
+
+func NewExcelMapper[T any]() (*ExcelMapper[T], error) {
+
+	em := &ExcelMapper[T]{
+		StyleDate:       nil,
+		StyleDatetime:   nil,
+		StyleEUR:        nil,
+		StylePercentage: nil,
+		StyleHeader:     nil,
+		StyleWSHeader:   nil,
+		sheetName:       "",
+
+		SkipColumnHeader: false,
+
+		wsHeader:       make([]dataext.Tuple[string, *int], 0),
+		colDefinitions: make([]excelMapperColDefinition[T], 0),
+	}
+
+	return em, nil
+}
+
+func (em *ExcelMapper[T]) InitNewFile(sheetName string) (*excelize.File, error) {
+	f := excelize.NewFile()
+
+	defSheet := f.GetSheetList()[0]
+
+	sheet1 := sheetName
+
+	sheetIdx, err := f.NewSheet(sheet1)
+	if err != nil {
+		return nil, err
+	}
+
+	f.SetActiveSheet(sheetIdx)
+	err = f.DeleteSheet(defSheet)
+
+	err = em.InitStyles(f)
+	if err != nil {
+		return nil, err
+	}
+
+	return f, nil
+}
+
+func (em *ExcelMapper[T]) InitStyles(f *excelize.File) error {
+	styleDate, err := f.NewStyle(&excelize.Style{
+		CustomNumFmt: new("dd.mm.yyyy"),
+	})
+	if err != nil {
+		return err
+	}
+
+	styleDatetime, err := f.NewStyle(&excelize.Style{
+		NumFmt: 22,
+	})
+	if err != nil {
+		return err
+	}
+
+	styleEUR, err := f.NewStyle(&excelize.Style{
+		NumFmt: 218,
+	})
+	if err != nil {
+		return err
+	}
+
+	stylePercentage, err := f.NewStyle(&excelize.Style{
+		NumFmt: 10,
+	})
+	if err != nil {
+		return err
+	}
+
+	styleHeader, err := f.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Bold: true, Size: 11},
+	})
+	if err != nil {
+		return err
+	}
+
+	styleWSHeader, err := f.NewStyle(&excelize.Style{
+		Font: &excelize.Font{Bold: true, Size: 24},
+	})
+	if err != nil {
+		return err
+	}
+
+	em.StyleDate = &styleDate
+	em.StyleDatetime = &styleDatetime
+	em.StyleEUR = &styleEUR
+	em.StylePercentage = &stylePercentage
+	em.StyleHeader = &styleHeader
+	em.StyleWSHeader = &styleWSHeader
+
+	return nil
+}
+
+func (em *ExcelMapper[T]) AddWorksheetHeader(header string, style *int) {
+	em.wsHeader = append(em.wsHeader, dataext.NewTuple(header, style))
+}
+
+func (em *ExcelMapper[T]) AddColumn(header string, style *int, width *float64, fn func(T) any) {
+	em.colDefinitions = append(em.colDefinitions, excelMapperColDefinition[T]{
+		style:  style,
+		header: header,
+		width:  width,
+		fn:     func(t T) (any, error) { return fn(t), nil },
+	})
+}
+
+func (em *ExcelMapper[T]) AddColumnErr(header string, style *int, width *float64, fn func(T) (any, error)) {
+	em.colDefinitions = append(em.colDefinitions, excelMapperColDefinition[T]{
+		style:  style,
+		header: header,
+		width:  width,
+		fn:     fn,
+	})
+}
+
+func (em *ExcelMapper[T]) Build(sheetName string, data []T) ([]byte, error) {
+	f, err := em.InitNewFile(sheetName)
+	if err != nil {
+		return nil, exerr.Wrap(err, "failed to init new file").Build()
+	}
+
+	err = em.BuildSingleSheet(f, sheetName, data)
+	if err != nil {
+		return nil, exerr.Wrap(err, "").Build()
+	}
+
+	buffer, err := f.WriteToBuffer()
+	if err != nil {
+		return nil, exerr.Wrap(err, "failed to build xls").Build()
+	}
+
+	return buffer.Bytes(), nil
+}
+
+func (em *ExcelMapper[T]) BuildSingleSheet(f *excelize.File, sheetName string, data []T) error {
+	if em.StyleHeader == nil || em.StyleDate == nil || em.StyleDatetime == nil || em.StyleEUR == nil || em.StylePercentage == nil || em.StyleWSHeader == nil {
+		err := em.InitStyles(f)
+		if err != nil {
+			return exerr.Wrap(err, "failed to init styles").Build()
+		}
+	}
+
+	rowOffset := 0
+
+	if len(em.wsHeader) > 0 {
+		for range em.wsHeader {
+			rowOffset += 1
+		}
+		rowOffset += 1
+	}
+
+	if !em.SkipColumnHeader {
+		for i, col := range em.colDefinitions {
+			err := f.SetCellValue(sheetName, c(rowOffset+1, i), col.header)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	for i, col := range em.colDefinitions {
+		if col.style != nil {
+			err := f.SetColStyle(sheetName, excelize360.ToAlphaString(i), *col.style)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	for i, col := range em.colDefinitions {
+		if col.width != nil {
+			err := f.SetColWidth(sheetName, excelize360.ToAlphaString(i), excelize360.ToAlphaString(i), *col.width)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	err := f.SetRowStyle(sheetName, rowOffset+1, rowOffset+1, *em.StyleHeader)
+	if err != nil {
+		return err
+	}
+
+	if len(em.wsHeader) > 0 {
+		for i, hdr := range em.wsHeader {
+			style := *langext.CoalesceOpt(hdr.V2, em.StyleWSHeader)
+
+			err = f.SetCellValue(sheetName, c(i+1, 0), hdr.V1)
+			if err != nil {
+				return err
+			}
+
+			err = f.MergeCell(sheetName, c(i+1, 0), c(i+1, len(em.colDefinitions)-1))
+			if err != nil {
+				return err
+			}
+
+			err = f.SetRowStyle(sheetName, 1, 1, style)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	iRow := rowOffset + 1
+	if !em.SkipColumnHeader {
+		iRow += 1
+	}
+
+	for _, dat := range data {
+
+		skip := false
+		for _, filter := range em.colFilter {
+			if !filter(dat) {
+				skip = true
+				break
+			}
+		}
+		if skip {
+			continue
+		}
+
+		for iCol, col := range em.colDefinitions {
+
+			cellVal, err := col.fn(dat)
+			if err != nil {
+				return err
+			}
+
+			for reflect.ValueOf(cellVal).Kind() == reflect.Pointer && !reflect.ValueOf(cellVal).IsNil() {
+				cellVal = reflect.ValueOf(cellVal).Elem().Interface()
+			}
+
+			if langext.IsNil(cellVal) {
+				err = f.SetCellValue(sheetName, c(iRow, iCol), "")
+				if err != nil {
+					return err
+				}
+			} else {
+				err = f.SetCellValue(sheetName, c(iRow, iCol), cellVal)
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+
+		iRow++
+	}
+
+	//for i, col := range em.colDefinitions {
+	//	if col.width == nil {
+	//		//TODO https://github.com/qax-os/excelize/pull/1386
+	//	}
+	//}
+
+	return nil
+}
+
+func (em *ExcelMapper[T]) AddFilter(f func(v T) bool) {
+	em.colFilter = append(em.colFilter, f)
+}

excelext/mapper_test.go

@@ -0,0 +1,303 @@
+package excelext
+
+import (
+	"bytes"
+	"errors"
+	"testing"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"github.com/xuri/excelize/v2"
+)
+
+type testRow struct {
+	Name  string
+	Age   int
+	Score float64
+}
+
+func openBytes(t *testing.T, data []byte) *excelize.File {
+	t.Helper()
+	f, err := excelize.OpenReader(bytes.NewReader(data))
+	if err != nil {
+		t.Fatalf("failed to open xlsx bytes: %v", err)
+	}
+	return f
+}
+
+func cellValue(t *testing.T, f *excelize.File, sheet, axis string) string {
+	t.Helper()
+	v, err := f.GetCellValue(sheet, axis)
+	if err != nil {
+		t.Fatalf("GetCellValue(%s, %s) failed: %v", sheet, axis, err)
+	}
+	return v
+}
+
+func TestNewExcelMapper(t *testing.T) {
+	em, err := NewExcelMapper[testRow]()
+	tst.AssertNoErr(t, err)
+	if em == nil {
+		t.Fatal("expected non-nil mapper")
+	}
+	tst.AssertEqual(t, em.SkipColumnHeader, false)
+	tst.AssertEqual(t, len(em.colDefinitions), 0)
+	tst.AssertEqual(t, len(em.wsHeader), 0)
+	tst.AssertEqual(t, len(em.colFilter), 0)
+	if em.StyleDate != nil || em.StyleHeader != nil {
+		t.Errorf("expected styles to be nil before init")
+	}
+}
+
+func TestInitNewFileAndStyles(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	f, err := em.InitNewFile("Sheet-Foo")
+	tst.AssertNoErr(t, err)
+	if f == nil {
+		t.Fatal("expected non-nil file")
+	}
+
+	sheets := f.GetSheetList()
+	tst.AssertEqual(t, len(sheets), 1)
+	tst.AssertEqual(t, sheets[0], "Sheet-Foo")
+
+	if em.StyleDate == nil || em.StyleDatetime == nil || em.StyleEUR == nil ||
+		em.StylePercentage == nil || em.StyleHeader == nil || em.StyleWSHeader == nil {
+		t.Errorf("expected all styles to be initialized")
+	}
+}
+
+func TestAddColumn(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+	em.AddColumn("Age", nil, new(12.0), func(r testRow) any { return r.Age })
+
+	tst.AssertEqual(t, len(em.colDefinitions), 2)
+	tst.AssertEqual(t, em.colDefinitions[0].header, "Name")
+	tst.AssertEqual(t, em.colDefinitions[1].header, "Age")
+	if em.colDefinitions[1].width == nil || *em.colDefinitions[1].width != 12.0 {
+		t.Errorf("expected width 12.0")
+	}
+
+	val, err := em.colDefinitions[0].fn(testRow{Name: "Alice"})
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, val.(string), "Alice")
+}
+
+func TestAddColumnErr(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	sentinel := errors.New("boom")
+	em.AddColumnErr("X", nil, nil, func(r testRow) (any, error) {
+		if r.Age < 0 {
+			return nil, sentinel
+		}
+		return r.Age, nil
+	})
+
+	tst.AssertEqual(t, len(em.colDefinitions), 1)
+
+	v, err := em.colDefinitions[0].fn(testRow{Age: 5})
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, v.(int), 5)
+
+	_, err = em.colDefinitions[0].fn(testRow{Age: -1})
+	if !errors.Is(err, sentinel) {
+		t.Errorf("expected sentinel error, got %v", err)
+	}
+}
+
+func TestAddWorksheetHeader(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddWorksheetHeader("Title 1", nil)
+	em.AddWorksheetHeader("Title 2", new(7))
+
+	tst.AssertEqual(t, len(em.wsHeader), 2)
+	tst.AssertEqual(t, em.wsHeader[0].V1, "Title 1")
+	tst.AssertEqual(t, em.wsHeader[1].V1, "Title 2")
+	if em.wsHeader[1].V2 == nil || *em.wsHeader[1].V2 != 7 {
+		t.Errorf("expected style ptr 7")
+	}
+	if em.wsHeader[0].V2 != nil {
+		t.Errorf("expected nil style for first header")
+	}
+}
+
+func TestAddFilter(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddFilter(func(v testRow) bool { return v.Age >= 18 })
+	em.AddFilter(func(v testRow) bool { return v.Score > 0 })
+	tst.AssertEqual(t, len(em.colFilter), 2)
+}
+
+func TestBuildBasic(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+	em.AddColumn("Age", nil, nil, func(r testRow) any { return r.Age })
+
+	rows := []testRow{
+		{Name: "Alice", Age: 30},
+		{Name: "Bob", Age: 25},
+	}
+
+	data, err := em.Build("Sheet1", rows)
+	tst.AssertNoErr(t, err)
+	if len(data) == 0 {
+		t.Fatal("expected non-empty xlsx output")
+	}
+
+	f := openBytes(t, data)
+	defer f.Close()
+
+	tst.AssertEqual(t, cellValue(t, f, "Sheet1", "A1"), "Name")
+	tst.AssertEqual(t, cellValue(t, f, "Sheet1", "B1"), "Age")
+	tst.AssertEqual(t, cellValue(t, f, "Sheet1", "A2"), "Alice")
+	tst.AssertEqual(t, cellValue(t, f, "Sheet1", "B2"), "30")
+	tst.AssertEqual(t, cellValue(t, f, "Sheet1", "A3"), "Bob")
+	tst.AssertEqual(t, cellValue(t, f, "Sheet1", "B3"), "25")
+}
+
+func TestBuildSkipColumnHeader(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.SkipColumnHeader = true
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+
+	rows := []testRow{{Name: "Alice"}, {Name: "Bob"}}
+
+	data, err := em.Build("Data", rows)
+	tst.AssertNoErr(t, err)
+
+	f := openBytes(t, data)
+	defer f.Close()
+
+	tst.AssertEqual(t, cellValue(t, f, "Data", "A1"), "Alice")
+	tst.AssertEqual(t, cellValue(t, f, "Data", "A2"), "Bob")
+}
+
+func TestBuildWithFilter(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+	em.AddFilter(func(v testRow) bool { return v.Age >= 18 })
+
+	rows := []testRow{
+		{Name: "Alice", Age: 30},
+		{Name: "Charlie", Age: 12},
+		{Name: "Bob", Age: 25},
+	}
+
+	data, err := em.Build("S", rows)
+	tst.AssertNoErr(t, err)
+
+	f := openBytes(t, data)
+	defer f.Close()
+
+	tst.AssertEqual(t, cellValue(t, f, "S", "A1"), "Name")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A2"), "Alice")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A3"), "Bob")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A4"), "")
+}
+
+func TestBuildWithWorksheetHeader(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddWorksheetHeader("My Big Title", nil)
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+	em.AddColumn("Age", nil, nil, func(r testRow) any { return r.Age })
+
+	rows := []testRow{{Name: "Alice", Age: 30}}
+
+	data, err := em.Build("S", rows)
+	tst.AssertNoErr(t, err)
+
+	f := openBytes(t, data)
+	defer f.Close()
+
+	tst.AssertEqual(t, cellValue(t, f, "S", "A1"), "My Big Title")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A3"), "Name")
+	tst.AssertEqual(t, cellValue(t, f, "S", "B3"), "Age")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A4"), "Alice")
+	tst.AssertEqual(t, cellValue(t, f, "S", "B4"), "30")
+}
+
+func TestBuildHandlesNilPointer(t *testing.T) {
+	type ptrRow struct {
+		Name *string
+	}
+
+	em, _ := NewExcelMapper[ptrRow]()
+	em.AddColumn("Name", nil, nil, func(r ptrRow) any { return r.Name })
+
+	name := "Alice"
+	rows := []ptrRow{
+		{Name: &name},
+		{Name: nil},
+	}
+
+	data, err := em.Build("S", rows)
+	tst.AssertNoErr(t, err)
+
+	f := openBytes(t, data)
+	defer f.Close()
+
+	tst.AssertEqual(t, cellValue(t, f, "S", "A2"), "Alice")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A3"), "")
+}
+
+func TestBuildPropagatesColumnError(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	sentinel := errors.New("col fail")
+	em.AddColumnErr("Bad", nil, nil, func(r testRow) (any, error) {
+		return nil, sentinel
+	})
+
+	_, err := em.Build("S", []testRow{{Name: "X"}})
+	if err == nil {
+		t.Fatal("expected error from column fn to propagate")
+	}
+}
+
+func TestBuildEmptyData(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+
+	data, err := em.Build("S", []testRow{})
+	tst.AssertNoErr(t, err)
+
+	f := openBytes(t, data)
+	defer f.Close()
+
+	tst.AssertEqual(t, cellValue(t, f, "S", "A1"), "Name")
+	tst.AssertEqual(t, cellValue(t, f, "S", "A2"), "")
+}
+
+func TestBuildSingleSheetWithExistingFile(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+	em.AddColumn("Name", nil, nil, func(r testRow) any { return r.Name })
+
+	f, err := em.InitNewFile("S1")
+	tst.AssertNoErr(t, err)
+
+	_, err = f.NewSheet("S2")
+	tst.AssertNoErr(t, err)
+
+	err = em.BuildSingleSheet(f, "S2", []testRow{{Name: "Bob"}})
+	tst.AssertNoErr(t, err)
+
+	tst.AssertEqual(t, cellValue(t, f, "S2", "A1"), "Name")
+	tst.AssertEqual(t, cellValue(t, f, "S2", "A2"), "Bob")
+}
+
+func TestBuildWithColumnWidthAndStyle(t *testing.T) {
+	em, _ := NewExcelMapper[testRow]()
+
+	f, err := em.InitNewFile("S")
+	tst.AssertNoErr(t, err)
+
+	em.AddColumn("Name", em.StyleHeader, new(20.5), func(r testRow) any { return r.Name })
+
+	err = em.BuildSingleSheet(f, "S", []testRow{{Name: "Alice"}})
+	tst.AssertNoErr(t, err)
+
+	w, err := f.GetColWidth("S", "A")
+	tst.AssertNoErr(t, err)
+	if w < 20.0 || w > 21.0 {
+		t.Errorf("expected column width near 20.5, got %v", w)
+	}
+}

excelext/utils.go

@@ -0,0 +1,26 @@
+package excelext
+
+import (
+	"strconv"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/rfctime"
+	"github.com/360EntSecGroup-Skylar/excelize"
+)
+
+func c(row int, col int) string {
+	return excelize.ToAlphaString(col) + strconv.Itoa(row)
+}
+
+func excelizeOptTime(t *rfctime.RFC3339NanoTime) any {
+	if t == nil {
+		return ""
+	}
+	return t.Time()
+}
+
+func excelizeOptDate(t *rfctime.Date) any {
+	if t == nil {
+		return ""
+	}
+	return t.TimeUTC()
+}

excelext/utils_test.go

@@ -0,0 +1,61 @@
+package excelext
+
+import (
+	"testing"
+	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/rfctime"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+)
+
+func TestCellAddress(t *testing.T) {
+	tst.AssertEqual(t, c(1, 0), "A1")
+	tst.AssertEqual(t, c(1, 1), "B1")
+	tst.AssertEqual(t, c(2, 0), "A2")
+	tst.AssertEqual(t, c(10, 25), "Z10")
+	tst.AssertEqual(t, c(1, 26), "AA1")
+	tst.AssertEqual(t, c(99, 27), "AB99")
+	tst.AssertEqual(t, c(100, 51), "AZ100")
+	tst.AssertEqual(t, c(1, 52), "BA1")
+}
+
+func TestExcelizeOptTimeNil(t *testing.T) {
+	got := excelizeOptTime(nil)
+	if got != "" {
+		t.Errorf("expected empty string for nil time, got %v", got)
+	}
+}
+
+func TestExcelizeOptTimeValue(t *testing.T) {
+	now := time.Date(2024, 5, 17, 13, 45, 30, 0, time.UTC)
+	rt := rfctime.RFC3339NanoTime(now)
+	got := excelizeOptTime(&rt)
+
+	gt, ok := got.(time.Time)
+	if !ok {
+		t.Fatalf("expected time.Time, got %T", got)
+	}
+	if !gt.Equal(now) {
+		t.Errorf("expected %v, got %v", now, gt)
+	}
+}
+
+func TestExcelizeOptDateNil(t *testing.T) {
+	got := excelizeOptDate(nil)
+	if got != "" {
+		t.Errorf("expected empty string for nil date, got %v", got)
+	}
+}
+
+func TestExcelizeOptDateValue(t *testing.T) {
+	d := rfctime.NewDate(time.Date(2025, 11, 3, 0, 0, 0, 0, time.UTC))
+	got := excelizeOptDate(&d)
+
+	gt, ok := got.(time.Time)
+	if !ok {
+		t.Fatalf("expected time.Time, got %T", got)
+	}
+	if gt.Year() != 2025 || gt.Month() != 11 || gt.Day() != 3 {
+		t.Errorf("unexpected date returned: %v", gt)
+	}
+}

exerr/builder.go

@@ -16,7 +16,7 @@ import (
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 //
@@ -253,7 +253,7 @@ func (b *Builder) Bytes(key string, val []byte) *Builder {
 	return b.addMeta(key, MDTBytes, val)
 }
 
-func (b *Builder) ObjectID(key string, val primitive.ObjectID) *Builder {
+func (b *Builder) ObjectID(key string, val bson.ObjectID) *Builder {
 	return b.addMeta(key, MDTObjectID, val)
 }
 
@@ -277,11 +277,11 @@ func (b *Builder) Ints32(key string, val []int32) *Builder {
 	return b.addMeta(key, MDTInt32Array, val)
 }
 
-func (b *Builder) Type(key string, cls interface{}) *Builder {
+func (b *Builder) Type(key string, cls any) *Builder {
 	return b.addMeta(key, MDTString, fmt.Sprintf("%T", cls))
 }
 
-func (b *Builder) Interface(key string, val interface{}) *Builder {
+func (b *Builder) Interface(key string, val any) *Builder {
 	return b.addMeta(key, MDTAny, newAnyWrap(val))
 }
 
@@ -566,7 +566,7 @@ func (b *Builder) doLogFatal() {
 
 // ----------------------------------------------------------------------------
 
-func (b *Builder) addMeta(key string, mdtype metaDataType, val interface{}) *Builder {
+func (b *Builder) addMeta(key string, mdtype metaDataType, val any) *Builder {
 	b.errorData.Meta.add(key, mdtype, val)
 	return b
 }

exerr/constructor.go

@@ -3,13 +3,15 @@ package exerr
 import (
 	"encoding/json"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"maps"
 	"reflect"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
-var reflectTypeStr = reflect.TypeOf("")
+var reflectTypeStr = reflect.TypeFor[string]()
 
 func FromError(err error) *ExErr {
 
@@ -152,20 +154,18 @@ func getForeignMeta(err error) (mm MetaMap) {
 	}()
 
 	rval := reflect.ValueOf(err)
-	if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Ptr {
+	if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Pointer {
 		rval = reflect.ValueOf(err).Elem()
 	}
 
 	mm.add("foreign.errortype", MDTString, rval.Type().String())
 
-	for k, v := range addMetaPrefix("foreign", getReflectedMetaValues(err, 8)) {
-		mm[k] = v
-	}
+	maps.Copy(mm, addMetaPrefix("foreign", getReflectedMetaValues(err, 8)))
 
 	return mm
 }
 
-func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]MetaValue {
+func getReflectedMetaValues(value any, remainingDepth int) map[string]MetaValue {
 
 	if remainingDepth <= 0 {
 		return map[string]MetaValue{}
@@ -177,7 +177,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
 
 	rval := reflect.ValueOf(value)
 
-	if rval.Type().Kind() == reflect.Ptr {
+	if rval.Type().Kind() == reflect.Pointer {
 
 		if rval.IsNil() {
 			return map[string]MetaValue{"*": {DataType: MDTNil, Value: nil}}
@@ -223,7 +223,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
 		return map[string]MetaValue{"": {DataType: MDTIntArray, Value: ifraw}}
 	case []int32:
 		return map[string]MetaValue{"": {DataType: MDTInt32Array, Value: ifraw}}
-	case primitive.ObjectID:
+	case bson.ObjectID:
 		return map[string]MetaValue{"": {DataType: MDTObjectID, Value: ifraw}}
 	case []string:
 		return map[string]MetaValue{"": {DataType: MDTStringArray, Value: ifraw}}
@@ -237,9 +237,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
 			fieldname := fieldtype.Name
 
 			if fieldtype.IsExported() {
-				for k, v := range addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)) {
-					m[k] = v
-				}
+				maps.Copy(m, addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)))
 			}
 		}
 		return m

exerr/dataCategory.go

@@ -4,11 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"reflect"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type ErrorCategory struct{ Category string }
@@ -28,8 +25,8 @@ func (e ErrorCategory) MarshalJSON() ([]byte, error) {
 	return json.Marshal(e.Category)
 }
 
-func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
-	if bt == bson.TypeNull {
+func (e *ErrorCategory) UnmarshalBSONValue(bt byte, data []byte) error {
+	if bson.Type(bt) == bson.TypeNull {
 		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
 		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
 		// https://stackoverflow.com/questions/75167597
@@ -37,11 +34,11 @@ func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error
 		*e = ErrorCategory{}
 		return nil
 	}
-	if bt != bson.TypeString {
-		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt))
+	if bson.Type(bt) != bson.TypeString {
+		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bson.Type(bt)))
 	}
 	var tt string
-	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt)
+	err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt)
 	if err != nil {
 		return err
 	}
@@ -49,40 +46,9 @@ func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error
 	return nil
 }
 
-func (e ErrorCategory) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	return bson.MarshalValue(e.Category)
-}
-
-func (e ErrorCategory) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		if !val.CanSet() {
-			return errors.New("ValueUnmarshalerDecodeValue")
-		}
-		val.Set(reflect.New(val.Type().Elem()))
-	}
-
-	tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr && len(src) == 0 {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	err = e.UnmarshalBSONValue(tp, src)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr {
-		val.Set(reflect.ValueOf(&e))
-	} else {
-		val.Set(reflect.ValueOf(e))
-	}
-
-	return nil
+func (e ErrorCategory) MarshalBSONValue() (byte, []byte, error) {
+	tp, data, err := bson.MarshalValue(e.Category)
+	return byte(tp), data, err
 }
 
 //goland:noinspection GoUnusedGlobalVariable

exerr/dataSeverity.go

@@ -4,11 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"reflect"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type ErrorSeverity struct{ Severity string }
@@ -30,8 +27,8 @@ func (e ErrorSeverity) MarshalJSON() ([]byte, error) {
 	return json.Marshal(e.Severity)
 }
 
-func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
-	if bt == bson.TypeNull {
+func (e *ErrorSeverity) UnmarshalBSONValue(bt byte, data []byte) error {
+	if bson.Type(bt) == bson.TypeNull {
 		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
 		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
 		// https://stackoverflow.com/questions/75167597
@@ -39,11 +36,11 @@ func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error
 		*e = ErrorSeverity{}
 		return nil
 	}
-	if bt != bson.TypeString {
-		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt))
+	if bson.Type(bt) != bson.TypeString {
+		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bson.Type(bt)))
 	}
 	var tt string
-	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt)
+	err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt)
 	if err != nil {
 		return err
 	}
@@ -51,40 +48,9 @@ func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error
 	return nil
 }
 
-func (e ErrorSeverity) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	return bson.MarshalValue(e.Severity)
-}
-
-func (e ErrorSeverity) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		if !val.CanSet() {
-			return errors.New("ValueUnmarshalerDecodeValue")
-		}
-		val.Set(reflect.New(val.Type().Elem()))
-	}
-
-	tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr && len(src) == 0 {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	err = e.UnmarshalBSONValue(tp, src)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr {
-		val.Set(reflect.ValueOf(&e))
-	} else {
-		val.Set(reflect.ValueOf(e))
-	}
-
-	return nil
+func (e ErrorSeverity) MarshalBSONValue() (byte, []byte, error) {
+	tp, data, err := bson.MarshalValue(e.Severity)
+	return byte(tp), data, err
 }
 
 //goland:noinspection GoUnusedGlobalVariable

exerr/dataType.go

@@ -4,13 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
+
 	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"reflect"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type ErrorType struct {
@@ -20,40 +16,42 @@ type ErrorType struct {
 
 //goland:noinspection GoUnusedGlobalVariable
 var (
-	TypeInternal       = NewType("INTERNAL_ERROR", langext.Ptr(500))
-	TypePanic          = NewType("PANIC", langext.Ptr(500))
-	TypeNotImplemented = NewType("NOT_IMPLEMENTED", langext.Ptr(500))
-	TypeAssert         = NewType("ASSERT", langext.Ptr(500))
+	TypeInternal       = NewType("INTERNAL_ERROR", new(500))
+	TypePanic          = NewType("PANIC", new(500))
+	TypeNotImplemented = NewType("NOT_IMPLEMENTED", new(500))
+	TypeAssert         = NewType("ASSERT", new(500))
 
-	TypeMongoQuery        = NewType("MONGO_QUERY", langext.Ptr(500))
-	TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", langext.Ptr(500))
-	TypeMongoFilter       = NewType("MONGO_FILTER", langext.Ptr(500))
-	TypeMongoReflection   = NewType("MONGO_REFLECTION", langext.Ptr(500))
-	TypeMongoInvalidOpt   = NewType("MONGO_INVALIDOPT", langext.Ptr(500))
+	TypeMongoQuery        = NewType("MONGO_QUERY", new(500))
+	TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", new(500))
+	TypeMongoFilter       = NewType("MONGO_FILTER", new(500))
+	TypeMongoReflection   = NewType("MONGO_REFLECTION", new(500))
+	TypeMongoInvalidOpt   = NewType("MONGO_INVALIDOPT", new(500))
 
-	TypeSQLQuery  = NewType("SQL_QUERY", langext.Ptr(500))
-	TypeSQLBuild  = NewType("SQL_BUILD", langext.Ptr(500))
-	TypeSQLDecode = NewType("SQL_DECODE", langext.Ptr(500))
+	TypeSQLQuery  = NewType("SQL_QUERY", new(500))
+	TypeSQLBuild  = NewType("SQL_BUILD", new(500))
+	TypeSQLDecode = NewType("SQL_DECODE", new(500))
 
 	TypeWrap = NewType("Wrap", nil)
 
-	TypeBindFailURI      = NewType("BINDFAIL_URI", langext.Ptr(400))
-	TypeBindFailQuery    = NewType("BINDFAIL_QUERY", langext.Ptr(400))
-	TypeBindFailJSON     = NewType("BINDFAIL_JSON", langext.Ptr(400))
-	TypeBindFailFormData = NewType("BINDFAIL_FORMDATA", langext.Ptr(400))
-	TypeBindFailHeader   = NewType("BINDFAIL_HEADER", langext.Ptr(400))
+	TypeBindFailURI      = NewType("BINDFAIL_URI", new(400))
+	TypeBindFailQuery    = NewType("BINDFAIL_QUERY", new(400))
+	TypeBindFailJSON     = NewType("BINDFAIL_JSON", new(400))
+	TypeBindFailFormData = NewType("BINDFAIL_FORMDATA", new(400))
+	TypeBindFailHeader   = NewType("BINDFAIL_HEADER", new(400))
 
-	TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", langext.Ptr(400))
-	TypeInvalidCSID     = NewType("INVALID_CSID", langext.Ptr(400))
+	TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", new(400))
+	TypeInvalidCSID     = NewType("INVALID_CSID", new(400))
 
-	TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", langext.Ptr(400))
-	TypeGoogleResponse   = NewType("GOOGLE_RESPONSE", langext.Ptr(400))
+	TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", new(400))
+	TypeGoogleResponse   = NewType("GOOGLE_RESPONSE", new(400))
 
-	TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401))
-	TypeAuthFailed   = NewType("AUTH_FAILED", langext.Ptr(401))
+	TypeUnauthorized = NewType("UNAUTHORIZED", new(401))
+	TypeAuthFailed   = NewType("AUTH_FAILED", new(401))
 
-	TypeInvalidImage    = NewType("IMAGEEXT_INVALID_IMAGE", langext.Ptr(400))
-	TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", langext.Ptr(400))
+	TypeInvalidImage    = NewType("IMAGEEXT_INVALID_IMAGE", new(400))
+	TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", new(400))
+
+	TypeWebsocket = NewType("WEBSOCKET", new(500))
 
 	// other values come from the downstream application that uses goext
 )
@@ -78,8 +76,8 @@ func (e ErrorType) MarshalJSON() ([]byte, error) {
 	return json.Marshal(e.Key)
 }
 
-func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
-	if bt == bson.TypeNull {
+func (e *ErrorType) UnmarshalBSONValue(bt byte, data []byte) error {
+	if bson.Type(bt) == bson.TypeNull {
 		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
 		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
 		// https://stackoverflow.com/questions/75167597
@@ -87,11 +85,11 @@ func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
 		*e = ErrorType{}
 		return nil
 	}
-	if bt != bson.TypeString {
-		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt))
+	if bson.Type(bt) != bson.TypeString {
+		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bson.Type(bt)))
 	}
 	var tt string
-	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt)
+	err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt)
 	if err != nil {
 		return err
 	}
@@ -105,40 +103,9 @@ func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
 	}
 }
 
-func (e ErrorType) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	return bson.MarshalValue(e.Key)
-}
-
-func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		if !val.CanSet() {
-			return errors.New("ValueUnmarshalerDecodeValue")
-		}
-		val.Set(reflect.New(val.Type().Elem()))
-	}
-
-	tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr && len(src) == 0 {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	err = e.UnmarshalBSONValue(tp, src)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr {
-		val.Set(reflect.ValueOf(&e))
-	} else {
-		val.Set(reflect.ValueOf(e))
-	}
-
-	return nil
+func (e ErrorType) MarshalBSONValue() (byte, []byte, error) {
+	tp, data, err := bson.MarshalValue(e.Key)
+	return byte(tp), data, err
 }
 
 var registeredTypes = dataext.SyncMap[string, ErrorType]{}

exerr/data_test.go

@@ -3,12 +3,12 @@ package exerr
 import (
 	"context"
 	"encoding/json"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
 	"testing"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
 func TestJSONMarshalErrorCategory(t *testing.T) {
@@ -57,7 +57,7 @@ func TestBSONMarshalErrorCategory(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond)
 	defer cancel()
 
-	client, err := mongo.Connect(ctx)
+	client, err := mongo.Connect()
 	if err != nil {
 		t.Skip("Skip test - no local mongo found")
 		return
@@ -68,7 +68,7 @@ func TestBSONMarshalErrorCategory(t *testing.T) {
 		return
 	}
 
-	primimd := primitive.NewObjectID()
+	primimd := bson.NewObjectID()
 
 	_, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": CatSystem})
 	tst.AssertNoErr(t, err)
@@ -76,8 +76,8 @@ func TestBSONMarshalErrorCategory(t *testing.T) {
 	cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}})
 
 	var c1 struct {
-		ID  primitive.ObjectID `bson:"_id"`
-		Val ErrorCategory      `bson:"val"`
+		ID  bson.ObjectID `bson:"_id"`
+		Val ErrorCategory `bson:"val"`
 	}
 
 	err = cursor.Decode(&c1)
@@ -90,7 +90,7 @@ func TestBSONMarshalErrorSeverity(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond)
 	defer cancel()
 
-	client, err := mongo.Connect(ctx)
+	client, err := mongo.Connect()
 	if err != nil {
 		t.Skip("Skip test - no local mongo found")
 		return
@@ -101,7 +101,7 @@ func TestBSONMarshalErrorSeverity(t *testing.T) {
 		return
 	}
 
-	primimd := primitive.NewObjectID()
+	primimd := bson.NewObjectID()
 
 	_, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": SevErr})
 	tst.AssertNoErr(t, err)
@@ -109,8 +109,8 @@ func TestBSONMarshalErrorSeverity(t *testing.T) {
 	cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}})
 
 	var c1 struct {
-		ID  primitive.ObjectID `bson:"_id"`
-		Val ErrorSeverity      `bson:"val"`
+		ID  bson.ObjectID `bson:"_id"`
+		Val ErrorSeverity `bson:"val"`
 	}
 
 	err = cursor.Decode(&c1)
@@ -123,7 +123,7 @@ func TestBSONMarshalErrorType(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond)
 	defer cancel()
 
-	client, err := mongo.Connect(ctx)
+	client, err := mongo.Connect()
 	if err != nil {
 		t.Skip("Skip test - no local mongo found")
 		return
@@ -134,7 +134,7 @@ func TestBSONMarshalErrorType(t *testing.T) {
 		return
 	}
 
-	primimd := primitive.NewObjectID()
+	primimd := bson.NewObjectID()
 
 	_, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": TypeNotImplemented})
 	tst.AssertNoErr(t, err)
@@ -142,8 +142,8 @@ func TestBSONMarshalErrorType(t *testing.T) {
 	cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}})
 
 	var c1 struct {
-		ID  primitive.ObjectID `bson:"_id"`
-		Val ErrorType          `bson:"val"`
+		ID  bson.ObjectID `bson:"_id"`
+		Val ErrorType     `bson:"val"`
 	}
 
 	err = cursor.Decode(&c1)

exerr/exerr.go

@@ -2,12 +2,13 @@ package exerr
 
 import (
 	"fmt"
-	"github.com/rs/xid"
-	"github.com/rs/zerolog"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"reflect"
 	"strings"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/rs/xid"
+	"github.com/rs/zerolog"
 )
 
 type ExErr struct {
@@ -125,35 +126,37 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
 
 	} else if lvl == LogPrintOverview {
 
-		str := "[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n"
+		var str strings.Builder
+		str.WriteString("[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n")
 
 		for exk, exv := range ee.Extra {
-			str += fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv)
+			str.WriteString(fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv))
 		}
 
-		indent := ""
+		var indent strings.Builder
 		for curr := ee; curr != nil; curr = curr.OriginalError {
-			indent += "  "
+			indent.WriteString("  ")
 
-			str += indent
-			str += "-> "
+			str.WriteString(indent.String())
+			str.WriteString("-> ")
 			strmsg := strings.Trim(curr.Message, " \r\n\t")
 			if lbidx := strings.Index(curr.Message, "\n"); lbidx >= 0 {
 				strmsg = strmsg[0:lbidx]
 			}
 			strmsg = langext.StrLimit(strmsg, 61, "...")
-			str += strmsg
-			str += "\n"
+			str.WriteString(strmsg)
+			str.WriteString("\n")
 
 		}
-		return str
+		return str.String()
 
 	} else if lvl == LogPrintFull {
 
-		str := "[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n"
+		var str strings.Builder
+		str.WriteString("[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n")
 
 		for exk, exv := range ee.Extra {
-			str += fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv)
+			str.WriteString(fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv))
 		}
 
 		indent := ""
@@ -165,33 +168,33 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
 				etype = "~"
 			}
 
-			str += indent
-			str += "-> ["
-			str += etype
+			str.WriteString(indent)
+			str.WriteString("-> [")
+			str.WriteString(etype)
 			if curr.Category == CatForeign {
-				str += "|Foreign"
+				str.WriteString("|Foreign")
 			}
-			str += "] "
-			str += strings.ReplaceAll(curr.Message, "\n", " ")
+			str.WriteString("] ")
+			str.WriteString(strings.ReplaceAll(curr.Message, "\n", " "))
 			if curr.Caller != "" {
-				str += " (@ "
-				str += curr.Caller
-				str += ")"
+				str.WriteString(" (@ ")
+				str.WriteString(curr.Caller)
+				str.WriteString(")")
 			}
-			str += "\n"
+			str.WriteString("\n")
 
 			if curr.Meta.Any() {
 				meta := indent + "   {" + curr.Meta.FormatOneLine(240) + "}"
 				if len(meta) < 200 {
-					str += meta
-					str += "\n"
+					str.WriteString(meta)
+					str.WriteString("\n")
 				} else {
-					str += curr.Meta.FormatMultiLine(indent+"   ", "  ", 1024)
-					str += "\n"
+					str.WriteString(curr.Meta.FormatMultiLine(indent+"   ", "  ", 1024))
+					str.WriteString("\n")
 				}
 			}
 		}
-		return str
+		return str.String()
 
 	} else {
 
@@ -201,7 +204,7 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
 }
 
 func (ee *ExErr) ShortLog(evt *zerolog.Event) {
-	ee.Meta.Apply(evt, langext.Ptr(240)).Msg(ee.FormatLog(LogPrintShort))
+	ee.Meta.Apply(evt, new(240)).Msg(ee.FormatLog(LogPrintShort))
 }
 
 // RecursiveMessage returns the message to show
@@ -254,7 +257,7 @@ func (ee *ExErr) RecursiveType() ErrorType {
 func (ee *ExErr) RecursiveStatuscode() *int {
 	for curr := ee; curr != nil; curr = curr.OriginalError {
 		if curr.StatusCode != nil {
-			return langext.Ptr(*curr.StatusCode)
+			return new(*curr.StatusCode)
 		}
 	}
 
@@ -279,7 +282,7 @@ func (ee *ExErr) RecursiveCategory() ErrorCategory {
 func (ee *ExErr) RecursiveMeta(key string) *MetaValue {
 	for curr := ee; curr != nil; curr = curr.OriginalError {
 		if metaval, ok := curr.Meta[key]; ok {
-			return langext.Ptr(metaval)
+			return new(metaval)
 		}
 	}
 

exerr/gin.go

@@ -1,6 +1,8 @@
 package exerr
 
 import (
+	"maps"
+
 	json "git.blackforestbytes.com/BlackForestBytes/goext/gojson"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 	"github.com/gin-gonic/gin"
@@ -50,9 +52,7 @@ func (ee *ExErr) toJson(depth int, applyExtendListener bool, outputMeta bool) la
 		ginJson["meta"] = metaJson
 
 		extraJson := langext.H{}
-		for extraKey, extraVal := range ee.Extra {
-			extraJson[extraKey] = extraVal
-		}
+		maps.Copy(extraJson, ee.Extra)
 		ginJson["extra"] = extraJson
 	}
 

exerr/listener.go

@@ -2,8 +2,15 @@ package exerr
 
 import (
 	"sync"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
 )
 
+type ListenerKey struct {
+	_k string
+}
+
 type ListenerOpt struct {
 	NoLog bool
 }
@@ -11,20 +18,30 @@ type ListenerOpt struct {
 type Listener = func(method Method, v *ExErr, opt ListenerOpt)
 
 var listenerLock = sync.Mutex{}
-var listener = make([]Listener, 0)
+var listener = dataext.NewOrderedMap[ListenerKey, Listener]()
 
-func RegisterListener(l Listener) {
+func RegisterListener(l Listener) ListenerKey {
 	listenerLock.Lock()
 	defer listenerLock.Unlock()
 
-	listener = append(listener, l)
+	k := ListenerKey{_k: langext.MustHexUUID()}
+
+	listener.Add(k, l)
+	return k
+}
+
+func DeregisterListener(key ListenerKey) {
+	listenerLock.Lock()
+	defer listenerLock.Unlock()
+
+	listener.Remove(key)
 }
 
 func (ee *ExErr) CallListener(m Method, opt ListenerOpt) {
 	listenerLock.Lock()
 	defer listenerLock.Unlock()
 
-	for _, v := range listener {
+	for _, v := range listener.Iterate() {
 		v(m, ee, opt)
 	}
 }

exerr/meta.go

@@ -5,14 +5,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/rs/zerolog"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"math"
 	"strconv"
 	"strings"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/rs/zerolog"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 // This is a buffed up map[string]any
@@ -49,13 +49,13 @@ const (
 
 type MetaValue struct {
 	DataType metaDataType `json:"dataType"`
-	Value    interface{}  `json:"value"`
+	Value    any          `json:"value"`
 }
 
 type metaValueSerialization struct {
 	DataType metaDataType `bson:"dataType"`
 	Value    string       `bson:"value"`
-	Raw      interface{}  `bson:"raw"`
+	Raw      any          `bson:"raw"`
 }
 
 func (v MetaValue) SerializeValue() (string, error) {
@@ -99,7 +99,7 @@ func (v MetaValue) SerializeValue() (string, error) {
 	case MDTBytes:
 		return hex.EncodeToString(v.Value.([]byte)), nil
 	case MDTObjectID:
-		return v.Value.(primitive.ObjectID).Hex(), nil
+		return v.Value.(bson.ObjectID).Hex(), nil
 	case MDTTime:
 		return strconv.FormatInt(v.Value.(time.Time).Unix(), 10) + "|" + strconv.FormatInt(int64(v.Value.(time.Time).Nanosecond()), 10), nil
 	case MDTDuration:
@@ -178,7 +178,7 @@ func (v MetaValue) ShortString(lim int) string {
 	case MDTBytes:
 		return langext.StrLimit(hex.EncodeToString(v.Value.([]byte)), lim, "...")
 	case MDTObjectID:
-		return v.Value.(primitive.ObjectID).Hex()
+		return v.Value.(bson.ObjectID).Hex()
 	case MDTTime:
 		return v.Value.(time.Time).Format(time.RFC3339)
 	case MDTDuration:
@@ -266,7 +266,7 @@ func (v MetaValue) Apply(key string, evt *zerolog.Event, limitLen *int) *zerolog
 	case MDTBytes:
 		return evt.Bytes(key, v.Value.([]byte))
 	case MDTObjectID:
-		return evt.Str(key, v.Value.(primitive.ObjectID).Hex())
+		return evt.Str(key, v.Value.(bson.ObjectID).Hex())
 	case MDTTime:
 		return evt.Time(key, v.Value.(time.Time))
 	case MDTDuration:
@@ -379,7 +379,7 @@ func (v *MetaValue) Deserialize(value string, datatype metaDataType) error {
 			v.DataType = datatype
 			return nil
 		} else {
-			v.Value = langext.Ptr(value[1:])
+			v.Value = new(value[1:])
 			v.DataType = datatype
 			return nil
 		}
@@ -460,7 +460,7 @@ func (v *MetaValue) Deserialize(value string, datatype metaDataType) error {
 		v.DataType = datatype
 		return nil
 	case MDTObjectID:
-		r, err := primitive.ObjectIDFromHex(value)
+		r, err := bson.ObjectIDFromHex(value)
 		if err != nil {
 			return err
 		}
@@ -577,7 +577,7 @@ func (v MetaValue) ValueString() string {
 	case MDTBytes:
 		return hex.EncodeToString(v.Value.([]byte))
 	case MDTObjectID:
-		return v.Value.(primitive.ObjectID).Hex()
+		return v.Value.(bson.ObjectID).Hex()
 	case MDTTime:
 		return v.Value.(time.Time).Format(time.RFC3339Nano)
 	case MDTDuration:
@@ -628,8 +628,8 @@ func (v MetaValue) rawValueForJson() any {
 		if v.Value.(AnyWrap).IsError {
 			return bson.M{"@error": true}
 		}
-		jsonobj := primitive.M{}
-		jsonarr := primitive.A{}
+		jsonobj := bson.M{}
+		jsonarr := bson.A{}
 		if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonobj); err == nil {
 			return jsonobj
 		} else if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonarr); err == nil {
@@ -654,7 +654,7 @@ func (v MetaValue) rawValueForJson() any {
 		return v.Value.(time.Time).Format(time.RFC3339Nano)
 	}
 	if v.DataType == MDTObjectID {
-		return v.Value.(primitive.ObjectID).Hex()
+		return v.Value.(bson.ObjectID).Hex()
 	}
 	if v.DataType == MDTNil {
 		return nil
@@ -694,28 +694,28 @@ func (v MetaValue) rawValueForJson() any {
 }
 
 func (mm MetaMap) FormatOneLine(singleMaxLen int) string {
-	r := ""
+	var r strings.Builder
 
 	i := 0
 	for key, val := range mm {
 		if i > 0 {
-			r += ", "
+			r.WriteString(", ")
 		}
 
-		r += "\"" + key + "\""
-		r += ": "
-		r += "\"" + val.ShortString(singleMaxLen) + "\""
+		r.WriteString("\"" + key + "\"")
+		r.WriteString(": ")
+		r.WriteString("\"" + val.ShortString(singleMaxLen) + "\"")
 
 		i++
 	}
 
-	return r
+	return r.String()
 }
 
 func (mm MetaMap) FormatMultiLine(indentFront string, indentKeys string, maxLenValue int) string {
-	r := ""
+	var r strings.Builder
 
-	r += indentFront + "{" + "\n"
+	r.WriteString(indentFront + "{" + "\n")
 	for key, val := range mm {
 		if key == "gin.body" {
 			continue
@@ -724,16 +724,16 @@ func (mm MetaMap) FormatMultiLine(indentFront string, indentKeys string, maxLenV
 			continue
 		}
 
-		r += indentFront
-		r += indentKeys
-		r += "\"" + key + "\""
-		r += ": "
-		r += "\"" + val.ShortString(maxLenValue) + "\""
-		r += ",\n"
+		r.WriteString(indentFront)
+		r.WriteString(indentKeys)
+		r.WriteString("\"" + key + "\"")
+		r.WriteString(": ")
+		r.WriteString("\"" + val.ShortString(maxLenValue) + "\"")
+		r.WriteString(",\n")
 	}
-	r += indentFront + "}"
+	r.WriteString(indentFront + "}")
 
-	return r
+	return r.String()
 }
 
 func (mm MetaMap) Any() bool {
@@ -747,7 +747,7 @@ func (mm MetaMap) Apply(evt *zerolog.Event, limitLen *int) *zerolog.Event {
 	return evt
 }
 
-func (mm MetaMap) add(key string, mdtype metaDataType, val interface{}) {
+func (mm MetaMap) add(key string, mdtype metaDataType, val any) {
 	if _, ok := mm[key]; !ok {
 		mm[key] = MetaValue{DataType: mdtype, Value: val}
 		return

exerr/unit_test.go

@@ -0,0 +1,836 @@
+package exerr
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strings"
+	"testing"
+	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"go.mongodb.org/mongo-driver/v2/bson"
+)
+
+// ============================================================================
+// Builder / Constructor tests
+// ============================================================================
+
+func TestNewBuildsExErr(t *testing.T) {
+	err := New(TypeInternal, "boom").Build()
+	tst.AssertTrue(t, err != nil)
+
+	ee, ok := err.(*ExErr)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, ee.Message, "boom")
+	tst.AssertEqual(t, ee.Type, TypeInternal)
+	tst.AssertEqual(t, ee.Category, CatSystem)
+	tst.AssertEqual(t, ee.Severity, SevErr)
+	tst.AssertTrue(t, ee.UniqueID != "")
+}
+
+func TestWrapNilProducesInternalError(t *testing.T) {
+	err := Wrap(nil, "msg").Build()
+	tst.AssertTrue(t, err != nil)
+
+	ee, _ := err.(*ExErr)
+	tst.AssertEqual(t, ee.Message, "msg")
+	tst.AssertEqual(t, ee.Type, TypeInternal)
+}
+
+func TestWrapForeignError(t *testing.T) {
+	plain := errors.New("plain go error")
+	err := Wrap(plain, "wrapped").Build()
+	ee, _ := err.(*ExErr)
+
+	// outer is a wrap (TypeWrap), inner is the foreign error
+	tst.AssertEqual(t, ee.Type, TypeWrap)
+	tst.AssertEqual(t, ee.Category, CatWrap)
+	tst.AssertEqual(t, ee.Message, "wrapped")
+	tst.AssertTrue(t, ee.OriginalError != nil)
+	tst.AssertEqual(t, ee.OriginalError.Category, CatForeign)
+	tst.AssertEqual(t, ee.OriginalError.Message, "plain go error")
+}
+
+func TestWrapExErrChainsDepth(t *testing.T) {
+	e1 := New(TypeInternal, "level-1").Build()
+	e2 := Wrap(e1, "level-2").Build()
+	e3 := Wrap(e2, "level-3").Build()
+	ee3 := e3.(*ExErr)
+
+	tst.AssertEqual(t, ee3.Depth(), 3)
+}
+
+func TestGetReturnsExErr(t *testing.T) {
+	plain := errors.New("foreign")
+	b := Get(plain)
+	tst.AssertTrue(t, b != nil)
+	tst.AssertEqual(t, b.errorData.Category, CatForeign)
+	tst.AssertEqual(t, b.errorData.Message, "foreign")
+}
+
+func TestBuilderWithModifiers(t *testing.T) {
+	err := New(TypeInternal, "msg").
+		WithType(TypeAssert).
+		WithStatuscode(418).
+		WithMessage("teapot").
+		WithSeverity(SevWarn).
+		WithCategory(CatUser).
+		Build()
+	ee := err.(*ExErr)
+
+	tst.AssertEqual(t, ee.Type, TypeAssert)
+	tst.AssertDeRefEqual(t, ee.StatusCode, 418)
+	tst.AssertEqual(t, ee.Message, "teapot")
+	tst.AssertEqual(t, ee.Severity, SevWarn)
+	tst.AssertEqual(t, ee.Category, CatUser)
+}
+
+func TestBuilderSeverityShortcuts(t *testing.T) {
+	tst.AssertEqual(t, New(TypeInternal, "x").Err().Build().(*ExErr).Severity, SevErr)
+	tst.AssertEqual(t, New(TypeInternal, "x").Warn().Build().(*ExErr).Severity, SevWarn)
+	tst.AssertEqual(t, New(TypeInternal, "x").Info().Build().(*ExErr).Severity, SevInfo)
+}
+
+func TestBuilderCategoryShortcuts(t *testing.T) {
+	tst.AssertEqual(t, New(TypeInternal, "x").User().Build().(*ExErr).Category, CatUser)
+	tst.AssertEqual(t, New(TypeInternal, "x").System().Build().(*ExErr).Category, CatSystem)
+}
+
+func TestBuilderNoLog(t *testing.T) {
+	b := New(TypeInternal, "x").NoLog()
+	tst.AssertTrue(t, b.noLog)
+}
+
+func TestBuilderExtra(t *testing.T) {
+	err := New(TypeInternal, "x").Extra("k", 42).Build()
+	ee := err.(*ExErr)
+	v, ok := ee.GetExtra("k")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v.(int), 42)
+}
+
+func TestBuilderMetaTypes(t *testing.T) {
+	now := time.Date(2024, 1, 2, 3, 4, 5, 0, time.UTC)
+	err := New(TypeInternal, "msg").
+		Str("s", "value").
+		Int("i", 7).
+		Int8("i8", 8).
+		Int16("i16", 16).
+		Int32("i32", 32).
+		Int64("i64", 64).
+		Float32("f32", 1.5).
+		Float64("f64", 2.5).
+		Bool("b", true).
+		Bytes("by", []byte{0xAA, 0xBB}).
+		Time("t", now).
+		Dur("d", 5*time.Second).
+		Strs("strs", []string{"a", "b"}).
+		Ints("ints", []int{1, 2, 3}).
+		Ints32("ints32", []int32{4, 5}).
+		Type("typ", "hello").
+		Build()
+
+	ee := err.(*ExErr)
+
+	gotS, _ := ee.GetMetaString("s")
+	tst.AssertEqual(t, gotS, "value")
+
+	gotI, _ := ee.GetMetaInt("i")
+	tst.AssertEqual(t, gotI, 7)
+
+	gotB, _ := ee.GetMetaBool("b")
+	tst.AssertEqual(t, gotB, true)
+
+	gotF32, _ := ee.GetMetaFloat32("f32")
+	tst.AssertEqual(t, gotF32, float32(1.5))
+
+	gotF64, _ := ee.GetMetaFloat64("f64")
+	tst.AssertEqual(t, gotF64, 2.5)
+
+	gotT, _ := ee.GetMetaTime("t")
+	tst.AssertEqual(t, gotT.Equal(now), true)
+}
+
+func TestBuilderInterfaceAndAny(t *testing.T) {
+	type payload struct {
+		A int    `json:"a"`
+		B string `json:"b"`
+	}
+	err := New(TypeInternal, "msg").Interface("p", payload{A: 1, B: "x"}).Any("p2", payload{A: 2, B: "y"}).Build()
+	ee := err.(*ExErr)
+	v1, ok := ee.GetMeta("p")
+	tst.AssertTrue(t, ok)
+	mv := v1.(AnyWrap)
+	tst.AssertTrue(t, strings.Contains(mv.Json, "\"a\":1"))
+	_, ok = ee.GetMeta("p2")
+	tst.AssertTrue(t, ok)
+}
+
+func TestBuilderStack(t *testing.T) {
+	err := New(TypeInternal, "msg").Stack().Build()
+	ee := err.(*ExErr)
+	v, ok := ee.GetMetaString("@Stack")
+	tst.AssertTrue(t, ok)
+	tst.AssertTrue(t, len(v) > 0)
+}
+
+func TestBuilderErrs(t *testing.T) {
+	in := []error{errors.New("first"), errors.New("second")}
+	err := New(TypeInternal, "msg").Errs("errs", in).Build()
+	ee := err.(*ExErr)
+
+	v0, ok := ee.GetMetaString("errs[0]")
+	tst.AssertTrue(t, ok)
+	tst.AssertTrue(t, strings.Contains(v0, "first"))
+	v1, ok := ee.GetMetaString("errs[1]")
+	tst.AssertTrue(t, ok)
+	tst.AssertTrue(t, strings.Contains(v1, "second"))
+}
+
+type stringerImpl struct{ s string }
+
+func (s stringerImpl) String() string { return s.s }
+
+func TestBuilderStringerAndId(t *testing.T) {
+	err := New(TypeInternal, "msg").
+		Stringer("s", stringerImpl{s: "hello"}).
+		Id("id", stringerImpl{s: "abc-123"}).
+		Build()
+	ee := err.(*ExErr)
+
+	v, _ := ee.GetMetaString("s")
+	tst.AssertEqual(t, v, "hello")
+
+	idv, ok := ee.GetMeta("id")
+	tst.AssertTrue(t, ok)
+	w := idv.(IDWrap)
+	tst.AssertEqual(t, w.Value, "abc-123")
+}
+
+func TestBuilderObjectID(t *testing.T) {
+	oid := bson.NewObjectID()
+	err := New(TypeInternal, "msg").ObjectID("oid", oid).Build()
+	ee := err.(*ExErr)
+	mv, ok := ee.Meta["oid"]
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, mv.DataType, MDTObjectID)
+	tst.AssertEqual(t, mv.Value.(bson.ObjectID), oid)
+}
+
+func TestBuilderStrPtr(t *testing.T) {
+	s := "hello"
+	err := New(TypeInternal, "msg").StrPtr("p", &s).StrPtr("n", nil).Build()
+	ee := err.(*ExErr)
+	_, ok := ee.Meta["p"]
+	tst.AssertTrue(t, ok)
+	_, ok = ee.Meta["n"]
+	tst.AssertTrue(t, ok)
+}
+
+func TestBuilderMetaCollision(t *testing.T) {
+	err := New(TypeInternal, "msg").Str("k", "v1").Str("k", "v2").Str("k", "v3").Build()
+	ee := err.(*ExErr)
+
+	v1, _ := ee.GetMetaString("k")
+	tst.AssertEqual(t, v1, "v1")
+
+	v2, ok := ee.GetMetaString("k-2")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v2, "v2")
+
+	v3, ok := ee.GetMetaString("k-3")
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, v3, "v3")
+}
+
+// ============================================================================
+// FromError tests
+// ============================================================================
+
+func TestFromErrorNil(t *testing.T) {
+	ee := FromError(nil)
+	tst.AssertTrue(t, ee != nil)
+	tst.AssertEqual(t, ee.Category, CatForeign)
+	tst.AssertEqual(t, ee.WrappedErrType, "nil")
+}
+
+func TestFromErrorPassThrough(t *testing.T) {
+	orig := New(TypeInternal, "msg").Build().(*ExErr)
+	got := FromError(orig)
+	tst.AssertTrue(t, orig == got)
+}
+
+func TestFromErrorForeign(t *testing.T) {
+	in := errors.New("standard")
+	ee := FromError(in)
+	tst.AssertEqual(t, ee.Category, CatForeign)
+	tst.AssertEqual(t, ee.Message, "standard")
+}
+
+// ============================================================================
+// ExErr method tests
+// ============================================================================
+
+func TestErrorReturnsRecursiveMessage(t *testing.T) {
+	in := errors.New("orig")
+	err := Wrap(in, "outer").Build()
+	tst.AssertTrue(t, strings.Contains(err.Error(), "outer") || strings.Contains(err.Error(), "orig"))
+}
+
+func TestUnwrapReturnsOriginalError(t *testing.T) {
+	e1 := New(TypeInternal, "inner").Build().(*ExErr)
+	e2 := Wrap(e1, "outer").Build().(*ExErr)
+	tst.AssertEqual(t, e2.Unwrap().(*ExErr) == e1, true)
+}
+
+func TestUnwrapForeign(t *testing.T) {
+	in := errors.New("std")
+	ee := FromError(in)
+	u := ee.Unwrap()
+	tst.AssertEqual(t, u.Error(), "std")
+}
+
+func TestUnwrapNilWhenNoneAvailable(t *testing.T) {
+	ee := New(TypeInternal, "msg").Build().(*ExErr)
+	tst.AssertTrue(t, ee.Unwrap() == nil)
+}
+
+func TestRecursiveMessageSkipsForeign(t *testing.T) {
+	in := errors.New("foreign-msg")
+	err := Wrap(in, "wrapped-msg").Build().(*ExErr)
+	tst.AssertEqual(t, err.RecursiveMessage(), "wrapped-msg")
+}
+
+func TestRecursiveMessageFallback(t *testing.T) {
+	ee := &ExErr{Message: "self"}
+	tst.AssertEqual(t, ee.RecursiveMessage(), "self")
+}
+
+func TestRecursiveType(t *testing.T) {
+	e1 := New(TypeAssert, "inner").Build().(*ExErr)
+	e2 := Wrap(e1, "outer").Build().(*ExErr)
+	tst.AssertEqual(t, e2.RecursiveType(), TypeAssert)
+}
+
+func TestRecursiveStatuscode(t *testing.T) {
+	e1 := New(TypeInternal, "inner").WithStatuscode(404).Build().(*ExErr)
+	e2 := Wrap(e1, "outer").Build().(*ExErr)
+
+	got := e2.RecursiveStatuscode()
+	tst.AssertDeRefEqual(t, got, 404)
+}
+
+func TestRecursiveStatuscodeNil(t *testing.T) {
+	e1 := New(TypeWrap, "x").Build().(*ExErr)
+	tst.AssertTrue(t, e1.RecursiveStatuscode() == nil)
+}
+
+func TestRecursiveCategory(t *testing.T) {
+	e1 := New(TypeInternal, "inner").User().Build().(*ExErr)
+	e2 := Wrap(e1, "outer").Build().(*ExErr)
+	tst.AssertEqual(t, e2.RecursiveCategory(), CatUser)
+}
+
+func TestRecursiveMeta(t *testing.T) {
+	e1 := New(TypeInternal, "inner").Str("xkey", "xval").Build().(*ExErr)
+	e2 := Wrap(e1, "outer").Build().(*ExErr)
+
+	mv := e2.RecursiveMeta("xkey")
+	tst.AssertTrue(t, mv != nil)
+	tst.AssertEqual(t, mv.Value.(string), "xval")
+	tst.AssertTrue(t, e2.RecursiveMeta("nope") == nil)
+}
+
+func TestDepth(t *testing.T) {
+	e1 := New(TypeInternal, "1").Build().(*ExErr)
+	tst.AssertEqual(t, e1.Depth(), 1)
+	e2 := Wrap(e1, "2").Build().(*ExErr)
+	tst.AssertEqual(t, e2.Depth(), 2)
+	e3 := Wrap(e2, "3").Build().(*ExErr)
+	tst.AssertEqual(t, e3.Depth(), 3)
+}
+
+func TestGetMetaStringTypeMismatch(t *testing.T) {
+	err := New(TypeInternal, "msg").Int("k", 1).Build().(*ExErr)
+	_, ok := err.GetMetaString("k")
+	tst.AssertFalse(t, ok)
+}
+
+func TestGetMetaMissing(t *testing.T) {
+	err := New(TypeInternal, "msg").Build().(*ExErr)
+	_, ok := err.GetMeta("missing")
+	tst.AssertFalse(t, ok)
+}
+
+func TestGetExtraMissing(t *testing.T) {
+	err := New(TypeInternal, "msg").Build().(*ExErr)
+	_, ok := err.GetExtra("missing")
+	tst.AssertFalse(t, ok)
+}
+
+func TestUniqueIDsCollects(t *testing.T) {
+	e1 := New(TypeInternal, "1").Build().(*ExErr)
+	e2 := Wrap(e1, "2").Build().(*ExErr)
+	e3 := Wrap(e2, "3").Build().(*ExErr)
+	ids := e3.UniqueIDs()
+	tst.AssertEqual(t, len(ids), 3)
+}
+
+// ============================================================================
+// Format / Log
+// ============================================================================
+
+func TestFormatLogShort(t *testing.T) {
+	err := New(TypeAssert, "boom").Build().(*ExErr)
+	out := err.FormatLog(LogPrintShort)
+	tst.AssertTrue(t, strings.Contains(out, "boom"))
+	tst.AssertTrue(t, strings.Contains(out, TypeAssert.Key))
+}
+
+func TestFormatLogOverview(t *testing.T) {
+	e1 := New(TypeAssert, "inner").Build().(*ExErr)
+	e2 := Wrap(e1, "outer").Build().(*ExErr)
+	out := e2.FormatLog(LogPrintOverview)
+	tst.AssertTrue(t, strings.Contains(out, "outer"))
+	tst.AssertTrue(t, strings.Contains(out, "inner"))
+}
+
+func TestFormatLogFull(t *testing.T) {
+	err := New(TypeInternal, "boom").Str("k", "v").Build().(*ExErr)
+	out := err.FormatLog(LogPrintFull)
+	tst.AssertTrue(t, strings.Contains(out, "boom"))
+	tst.AssertTrue(t, strings.Contains(out, "k"))
+}
+
+func TestFormatLogUnknownLevel(t *testing.T) {
+	err := New(TypeInternal, "boom").Build().(*ExErr)
+	out := err.FormatLog(LogPrintLevel("__nope__"))
+	tst.AssertTrue(t, strings.HasPrefix(out, "[?["))
+}
+
+func TestBuilderFormat(t *testing.T) {
+	b := New(TypeInternal, "boom")
+	out := b.Format(LogPrintShort)
+	tst.AssertTrue(t, strings.Contains(out, "boom"))
+}
+
+// ============================================================================
+// helper.go
+// ============================================================================
+
+func TestIsTypeMatching(t *testing.T) {
+	err := New(TypeAssert, "x").Build()
+	tst.AssertTrue(t, IsType(err, TypeAssert))
+	tst.AssertFalse(t, IsType(err, TypeNotImplemented))
+	tst.AssertFalse(t, IsType(nil, TypeAssert))
+}
+
+func TestIsTypeRecursive(t *testing.T) {
+	e1 := New(TypeAssert, "inner").Build()
+	e2 := Wrap(e1, "outer").Build()
+	tst.AssertTrue(t, IsType(e2, TypeAssert))
+}
+
+func TestIsFromIdentity(t *testing.T) {
+	e := errors.New("x")
+	tst.AssertTrue(t, IsFrom(e, e))
+	tst.AssertFalse(t, IsFrom(nil, e))
+}
+
+func TestIsFromForeign(t *testing.T) {
+	src := errors.New("origmsg")
+	wrap := Wrap(src, "outer").Build()
+	tst.AssertTrue(t, IsFrom(wrap, src))
+
+	other := errors.New("other")
+	tst.AssertFalse(t, IsFrom(wrap, other))
+}
+
+func TestHasSourceMessage(t *testing.T) {
+	src := errors.New("origmsg")
+	wrap := Wrap(src, "outer").Build()
+	tst.AssertTrue(t, HasSourceMessage(wrap, "origmsg"))
+	tst.AssertFalse(t, HasSourceMessage(wrap, "other"))
+	tst.AssertFalse(t, HasSourceMessage(nil, "x"))
+}
+
+func TestMessageMatch(t *testing.T) {
+	e := New(TypeInternal, "alpha-beta").Build()
+	tst.AssertTrue(t, MessageMatch(e, func(s string) bool { return strings.Contains(s, "alpha") }))
+	tst.AssertFalse(t, MessageMatch(e, func(s string) bool { return strings.Contains(s, "missing") }))
+	tst.AssertFalse(t, MessageMatch(nil, func(s string) bool { return true }))
+}
+
+func TestOriginalError(t *testing.T) {
+	src := errors.New("the-source")
+	wrap := Wrap(src, "outer").Build()
+	got := OriginalError(wrap)
+	tst.AssertEqual(t, got.Error(), "the-source")
+	tst.AssertTrue(t, OriginalError(nil) == nil)
+}
+
+func TestUniqueIDHelper(t *testing.T) {
+	err := New(TypeInternal, "x").Build()
+	id := UniqueID(err)
+	tst.AssertTrue(t, id != nil)
+	tst.AssertTrue(t, *id != "")
+
+	tst.AssertTrue(t, UniqueID(nil) == nil)
+
+	plain := errors.New("plain")
+	tst.AssertTrue(t, UniqueID(plain) == nil)
+}
+
+// ============================================================================
+// errors.Is / errors.As
+// ============================================================================
+
+type customErr struct{ msg string }
+
+func (c customErr) Error() string { return c.msg }
+
+func TestErrorsAsForeign(t *testing.T) {
+	src := customErr{msg: "x"}
+	wrap := Wrap(src, "outer").Build()
+
+	var got customErr
+	ok := errors.As(wrap, &got)
+	tst.AssertTrue(t, ok)
+	tst.AssertEqual(t, got.msg, "x")
+}
+
+func TestErrorsIsForeign(t *testing.T) {
+	src := customErr{msg: "x"}
+	wrap := Wrap(src, "outer").Build()
+
+	tst.AssertTrue(t, errors.Is(wrap, customErr{msg: "x"}))
+	tst.AssertFalse(t, errors.Is(wrap, customErr{msg: "y"}))
+}
+
+// ============================================================================
+// MetaValue serialize / deserialize roundtrip
+// ============================================================================
+
+func TestMetaValueRoundtripPrimitives(t *testing.T) {
+	cases := []MetaValue{
+		{DataType: MDTString, Value: "hello"},
+		{DataType: MDTInt, Value: 42},
+		{DataType: MDTInt8, Value: int8(8)},
+		{DataType: MDTInt16, Value: int16(16)},
+		{DataType: MDTInt32, Value: int32(32)},
+		{DataType: MDTInt64, Value: int64(64)},
+		{DataType: MDTFloat32, Value: float32(1.5)},
+		{DataType: MDTFloat64, Value: float64(2.5)},
+		{DataType: MDTBool, Value: true},
+		{DataType: MDTBool, Value: false},
+		{DataType: MDTBytes, Value: []byte{0x01, 0x02, 0xAB}},
+		{DataType: MDTStringArray, Value: []string{"a", "b"}},
+		{DataType: MDTIntArray, Value: []int{1, 2, 3}},
+		{DataType: MDTInt32Array, Value: []int32{4, 5}},
+		{DataType: MDTNil, Value: nil},
+	}
+
+	for _, c := range cases {
+		s, err := c.SerializeValue()
+		tst.AssertNoErr(t, err)
+
+		var dec MetaValue
+		tst.AssertNoErr(t, dec.Deserialize(s, c.DataType))
+		tst.AssertStrRepEqual(t, dec.Value, c.Value)
+	}
+}
+
+func TestMetaValueRoundtripStringPtr(t *testing.T) {
+	v := "hello"
+	mv := MetaValue{DataType: MDTStringPtr, Value: &v}
+	s, err := mv.SerializeValue()
+	tst.AssertNoErr(t, err)
+	var dec MetaValue
+	tst.AssertNoErr(t, dec.Deserialize(s, MDTStringPtr))
+	tst.AssertEqual(t, *(dec.Value.(*string)), v)
+
+	mv2 := MetaValue{DataType: MDTStringPtr, Value: (*string)(nil)}
+	s, err = mv2.SerializeValue()
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, s, "#")
+}
+
+func TestMetaValueRoundtripTime(t *testing.T) {
+	tm := time.Date(2025, 4, 27, 12, 34, 56, 12345, time.UTC)
+	mv := MetaValue{DataType: MDTTime, Value: tm}
+	s, err := mv.SerializeValue()
+	tst.AssertNoErr(t, err)
+	var dec MetaValue
+	tst.AssertNoErr(t, dec.Deserialize(s, MDTTime))
+	got := dec.Value.(time.Time)
+	tst.AssertEqual(t, got.Unix(), tm.Unix())
+	tst.AssertEqual(t, got.Nanosecond(), tm.Nanosecond())
+}
+
+func TestMetaValueRoundtripDuration(t *testing.T) {
+	d := 3*time.Second + 250*time.Millisecond
+	mv := MetaValue{DataType: MDTDuration, Value: d}
+	s, err := mv.SerializeValue()
+	tst.AssertNoErr(t, err)
+	var dec MetaValue
+	tst.AssertNoErr(t, dec.Deserialize(s, MDTDuration))
+	tst.AssertEqual(t, dec.Value.(time.Duration), d)
+}
+
+func TestMetaValueRoundtripObjectID(t *testing.T) {
+	oid := bson.NewObjectID()
+	mv := MetaValue{DataType: MDTObjectID, Value: oid}
+	s, err := mv.SerializeValue()
+	tst.AssertNoErr(t, err)
+	var dec MetaValue
+	tst.AssertNoErr(t, dec.Deserialize(s, MDTObjectID))
+	tst.AssertEqual(t, dec.Value.(bson.ObjectID), oid)
+}
+
+func TestMetaValueDeserializeUnknownType(t *testing.T) {
+	var mv MetaValue
+	err := mv.Deserialize("x", metaDataType("unknown"))
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestMetaValueDeserializeBadBool(t *testing.T) {
+	var mv MetaValue
+	err := mv.Deserialize("nope", MDTBool)
+	tst.AssertTrue(t, err != nil)
+}
+
+func TestMetaValueShortString(t *testing.T) {
+	cases := []struct {
+		mv  MetaValue
+		out string
+	}{
+		{MetaValue{DataType: MDTString, Value: "hello"}, "hello"},
+		{MetaValue{DataType: MDTInt, Value: 42}, "42"},
+		{MetaValue{DataType: MDTBool, Value: true}, "true"},
+		{MetaValue{DataType: MDTNil, Value: nil}, "<<null>>"},
+	}
+	for _, c := range cases {
+		tst.AssertEqual(t, c.mv.ShortString(100), c.out)
+	}
+}
+
+func TestMetaValueValueString(t *testing.T) {
+	mv := MetaValue{DataType: MDTInt, Value: 42}
+	tst.AssertEqual(t, mv.ValueString(), "42")
+
+	mv = MetaValue{DataType: MDTString, Value: "ok"}
+	tst.AssertEqual(t, mv.ValueString(), "ok")
+}
+
+func TestMetaValueJSONMarshal(t *testing.T) {
+	mv := MetaValue{DataType: MDTString, Value: "abc"}
+	bin, err := json.Marshal(mv)
+	tst.AssertNoErr(t, err)
+
+	var dec MetaValue
+	tst.AssertNoErr(t, json.Unmarshal(bin, &dec))
+	tst.AssertEqual(t, dec.DataType, MDTString)
+	tst.AssertEqual(t, dec.Value.(string), "abc")
+}
+
+func TestMetaValueJSONMarshalInvalidString(t *testing.T) {
+	var mv MetaValue
+	err := json.Unmarshal([]byte("\"badformat\""), &mv)
+	tst.AssertTrue(t, err != nil)
+}
+
+// ============================================================================
+// MetaMap
+// ============================================================================
+
+func TestMetaMapAny(t *testing.T) {
+	mm := MetaMap{}
+	tst.AssertFalse(t, mm.Any())
+	mm.add("k", MDTString, "v")
+	tst.AssertTrue(t, mm.Any())
+}
+
+func TestMetaMapFormatOneLine(t *testing.T) {
+	mm := MetaMap{}
+	mm.add("k", MDTString, "v")
+	out := mm.FormatOneLine(100)
+	tst.AssertTrue(t, strings.Contains(out, "k"))
+	tst.AssertTrue(t, strings.Contains(out, "v"))
+}
+
+func TestMetaMapFormatMultiLine(t *testing.T) {
+	mm := MetaMap{}
+	mm.add("k1", MDTString, "v1")
+	mm.add("gin_body", MDTString, "should-be-skipped")
+	out := mm.FormatMultiLine("", "  ", 100)
+	tst.AssertTrue(t, strings.Contains(out, "k1"))
+	tst.AssertFalse(t, strings.Contains(out, "should-be-skipped"))
+}
+
+// ============================================================================
+// typeWrapper.go
+// ============================================================================
+
+func TestIDWrap(t *testing.T) {
+	w := newIDWrap(stringerImpl{s: "id-1"})
+	tst.AssertEqual(t, w.Value, "id-1")
+	tst.AssertFalse(t, w.IsNil)
+
+	s := w.Serialize()
+	got := deserializeIDWrap(s)
+	tst.AssertEqual(t, got.Value, "id-1")
+	tst.AssertEqual(t, got.Type, w.Type)
+}
+
+func TestIDWrapNil(t *testing.T) {
+	var nilStringer fmt.Stringer = (*stringerImpl)(nil)
+	w := newIDWrap(nilStringer)
+	tst.AssertTrue(t, w.IsNil)
+
+	s := w.Serialize()
+	got := deserializeIDWrap(s)
+	tst.AssertTrue(t, got.IsNil)
+}
+
+func TestAnyWrap(t *testing.T) {
+	type p struct {
+		X int `json:"x"`
+	}
+	w := newAnyWrap(p{X: 7})
+	tst.AssertFalse(t, w.IsError)
+	tst.AssertFalse(t, w.IsNil)
+	tst.AssertTrue(t, strings.Contains(w.Json, "\"x\":7"))
+
+	s := w.Serialize()
+	got := deserializeAnyWrap(s)
+	tst.AssertEqual(t, got.IsError, false)
+	tst.AssertTrue(t, strings.Contains(got.Json, "\"x\":7"))
+}
+
+func TestAnyWrapNil(t *testing.T) {
+	w := newAnyWrap(nil)
+	tst.AssertTrue(t, w.IsNil)
+
+	s := w.Serialize()
+	got := deserializeAnyWrap(s)
+	tst.AssertTrue(t, got.IsNil)
+}
+
+func TestAnyWrapDeserializeBad(t *testing.T) {
+	got := deserializeAnyWrap("xx")
+	tst.AssertTrue(t, got.IsError)
+}
+
+// ============================================================================
+// dataType.go
+// ============================================================================
+
+func TestNewTypeRegisters(t *testing.T) {
+	custom := NewType("UNIT_TEST_CUSTOM_TYPE", new(503))
+	tst.AssertEqual(t, custom.Key, "UNIT_TEST_CUSTOM_TYPE")
+	tst.AssertDeRefEqual(t, custom.DefaultStatusCode, 503)
+
+	all := ListRegisteredTypes()
+	found := false
+	for _, et := range all {
+		if et.Key == "UNIT_TEST_CUSTOM_TYPE" {
+			found = true
+			break
+		}
+	}
+	tst.AssertTrue(t, found)
+}
+
+func TestErrorTypeJSONUnmarshalKnown(t *testing.T) {
+	var et ErrorType
+	tst.AssertNoErr(t, json.Unmarshal([]byte("\"NOT_IMPLEMENTED\""), &et))
+	tst.AssertEqual(t, et.Key, TypeNotImplemented.Key)
+}
+
+func TestErrorTypeJSONUnmarshalUnknown(t *testing.T) {
+	var et ErrorType
+	tst.AssertNoErr(t, json.Unmarshal([]byte("\"COMPLETELY_UNKNOWN_TYPE_QQQ\""), &et))
+	tst.AssertEqual(t, et.Key, "COMPLETELY_UNKNOWN_TYPE_QQQ")
+	tst.AssertTrue(t, et.DefaultStatusCode == nil)
+}
+
+func TestCategoryAndSeverityJSONMarshal(t *testing.T) {
+	bin, err := json.Marshal(CatUser)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(bin), "\"User\"")
+
+	var c ErrorCategory
+	tst.AssertNoErr(t, json.Unmarshal(bin, &c))
+	tst.AssertEqual(t, c, CatUser)
+
+	bin, err = json.Marshal(SevWarn)
+	tst.AssertNoErr(t, err)
+	tst.AssertEqual(t, string(bin), "\"Warn\"")
+}
+
+// ============================================================================
+// proxy.go
+// ============================================================================
+
+func TestProxy(t *testing.T) {
+	ee := New(TypeInternal, "x").Build().(*ExErr)
+	p := Proxy{v: *ee}
+	tst.AssertEqual(t, p.UniqueID(), ee.UniqueID)
+	tst.AssertEqual(t, p.Get().Message, ee.Message)
+}
+
+// ============================================================================
+// listener.go
+// ============================================================================
+
+func TestRegisterListenerInvokedOnBuild(t *testing.T) {
+	var gotMethod Method
+	var gotErr *ExErr
+	RegisterListener(func(method Method, v *ExErr, opt ListenerOpt) {
+		if v != nil && strings.Contains(v.Message, "listener-marker-1") {
+			gotMethod = method
+			gotErr = v
+		}
+	})
+
+	_ = New(TypeInternal, "listener-marker-1").Build()
+
+	tst.AssertEqual(t, gotMethod, MethodBuild)
+	tst.AssertTrue(t, gotErr != nil)
+}
+
+// ============================================================================
+// Initialized
+// ============================================================================
+
+func TestInitialized(t *testing.T) {
+	tst.AssertTrue(t, Initialized())
+}
+
+// ============================================================================
+// JSON output (toJson / ToAPIJson)
+// ============================================================================
+
+func TestToAPIJsonContainsCoreFields(t *testing.T) {
+	err := New(TypeInternal, "boom").Str("k", "v").Extra("ex", 1).Build().(*ExErr)
+	out := err.ToAPIJson(false, true, true)
+
+	tst.AssertEqual(t, out["errorid"].(string), err.UniqueID)
+	tst.AssertEqual(t, out["errorcode"].(string), TypeInternal.Key)
+	tst.AssertEqual(t, out["category"].(string), CatSystem.Category)
+	tst.AssertEqual(t, out["message"].(string), "boom")
+
+	_, hasData := out["__data"]
+	tst.AssertTrue(t, hasData)
+
+	tst.AssertEqual(t, out["ex"].(int), 1)
+}
+
+func TestToDefaultAPIJson(t *testing.T) {
+	err := New(TypeInternal, "boom").Build().(*ExErr)
+	out, jerr := err.ToDefaultAPIJson()
+	tst.AssertNoErr(t, jerr)
+	tst.AssertTrue(t, strings.Contains(out, "boom"))
+	tst.AssertTrue(t, strings.Contains(out, err.UniqueID))
+}

fsext/exists_test.go

@@ -0,0 +1,264 @@
+package fsext
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing"
+)
+
+func TestPathExistsFile(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "file.txt")
+	if err := os.WriteFile(fp, []byte("hello"), 0644); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := PathExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("PathExists(%q) = false, want true", fp)
+	}
+}
+
+func TestPathExistsDirectory(t *testing.T) {
+	dir := t.TempDir()
+
+	ok, err := PathExists(dir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("PathExists(%q) = false, want true", dir)
+	}
+}
+
+func TestPathExistsMissing(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "does_not_exist")
+
+	ok, err := PathExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("PathExists(%q) = true, want false", fp)
+	}
+}
+
+func TestPathExistsMissingNested(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "nope", "still_nope", "file.txt")
+
+	ok, err := PathExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("PathExists(%q) = true, want false", fp)
+	}
+}
+
+func TestFileExistsFile(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "file.txt")
+	if err := os.WriteFile(fp, []byte("data"), 0644); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := FileExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("FileExists(%q) = false, want true", fp)
+	}
+}
+
+func TestFileExistsEmptyFile(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "empty.txt")
+	if err := os.WriteFile(fp, []byte{}, 0644); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := FileExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("FileExists(%q) = false, want true", fp)
+	}
+}
+
+func TestFileExistsDirectoryReturnsFalse(t *testing.T) {
+	dir := t.TempDir()
+
+	ok, err := FileExists(dir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("FileExists(%q) = true, want false (it's a directory)", dir)
+	}
+}
+
+func TestFileExistsMissing(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "missing.txt")
+
+	ok, err := FileExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("FileExists(%q) = true, want false", fp)
+	}
+}
+
+func TestDirectoryExistsDirectory(t *testing.T) {
+	dir := t.TempDir()
+
+	ok, err := DirectoryExists(dir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("DirectoryExists(%q) = false, want true", dir)
+	}
+}
+
+func TestDirectoryExistsNestedDirectory(t *testing.T) {
+	dir := t.TempDir()
+	nested := filepath.Join(dir, "a", "b", "c")
+	if err := os.MkdirAll(nested, 0755); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := DirectoryExists(nested)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("DirectoryExists(%q) = false, want true", nested)
+	}
+}
+
+func TestDirectoryExistsFileReturnsFalse(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "file.txt")
+	if err := os.WriteFile(fp, []byte("data"), 0644); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := DirectoryExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("DirectoryExists(%q) = true, want false (it's a file)", fp)
+	}
+}
+
+func TestDirectoryExistsMissing(t *testing.T) {
+	dir := t.TempDir()
+	fp := filepath.Join(dir, "missing")
+
+	ok, err := DirectoryExists(fp)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("DirectoryExists(%q) = true, want false", fp)
+	}
+}
+
+func TestPathExistsEmptyString(t *testing.T) {
+	ok, err := PathExists("")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("PathExists(\"\") = true, want false")
+	}
+}
+
+func TestFileExistsEmptyString(t *testing.T) {
+	ok, err := FileExists("")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("FileExists(\"\") = true, want false")
+	}
+}
+
+func TestDirectoryExistsEmptyString(t *testing.T) {
+	ok, err := DirectoryExists("")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("DirectoryExists(\"\") = true, want false")
+	}
+}
+
+func TestPathExistsSymlinkToFile(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("symlinks require admin privileges on windows")
+	}
+	dir := t.TempDir()
+	target := filepath.Join(dir, "target.txt")
+	if err := os.WriteFile(target, []byte("data"), 0644); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+	link := filepath.Join(dir, "link.txt")
+	if err := os.Symlink(target, link); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := PathExists(link)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("PathExists(symlink) = false, want true")
+	}
+
+	ok, err = FileExists(link)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Errorf("FileExists(symlink-to-file) = false, want true")
+	}
+
+	ok, err = DirectoryExists(link)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("DirectoryExists(symlink-to-file) = true, want false")
+	}
+}
+
+func TestPathExistsBrokenSymlink(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("symlinks require admin privileges on windows")
+	}
+	dir := t.TempDir()
+	link := filepath.Join(dir, "broken")
+	if err := os.Symlink(filepath.Join(dir, "nonexistent_target"), link); err != nil {
+		t.Fatalf("setup: %v", err)
+	}
+
+	ok, err := PathExists(link)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Errorf("PathExists(broken-symlink) = true, want false")
+	}
+}

ginext/appContext_test.go

@@ -0,0 +1,121 @@
+package ginext
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestCreateBackgroundAppContext(t *testing.T) {
+	ac := CreateBackgroundAppContext()
+	if ac == nil {
+		t.Fatalf("expected non-nil context")
+	}
+	if ac.GinContext != nil {
+		t.Fatalf("background context should have no gin context")
+	}
+	if ac.Err() != nil {
+		t.Fatalf("expected no error")
+	}
+	if _, ok := ac.Deadline(); ok {
+		t.Fatalf("background context should have no deadline")
+	}
+}
+
+func TestCreateAppContext_CopiesGinKeys(t *testing.T) {
+	rec := httptest.NewRecorder()
+	g, _ := gin.CreateTestContext(rec)
+	g.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+	g.Set("foo", "bar")
+	g.Set("num", 42)
+
+	inner, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	ac := CreateAppContext(g, inner, cancel)
+
+	if ac.Value("foo") != "bar" {
+		t.Fatalf("expected key foo to be copied")
+	}
+	if ac.Value("num") != 42 {
+		t.Fatalf("expected key num to be copied")
+	}
+	if ac.GinContext != g {
+		t.Fatalf("expected GinContext to be set")
+	}
+}
+
+func TestAppContext_Set(t *testing.T) {
+	ac := CreateBackgroundAppContext()
+	ac.Set("k", "v")
+	if ac.Value("k") != "v" {
+		t.Fatalf("expected Set to store value")
+	}
+}
+
+func TestAppContext_Cancel(t *testing.T) {
+	called := false
+	cancel := func() { called = true }
+	ac := &AppContext{
+		inner:      context.Background(),
+		cancelFunc: cancel,
+	}
+	ac.Cancel()
+	if !called {
+		t.Fatalf("expected cancel function to be invoked")
+	}
+	if !ac.cancelled {
+		t.Fatalf("expected cancelled flag set")
+	}
+}
+
+func TestAppContext_DeadlineDoneErr(t *testing.T) {
+	deadline := time.Now().Add(1 * time.Hour)
+	inner, cancel := context.WithDeadline(context.Background(), deadline)
+	defer cancel()
+
+	ac := &AppContext{inner: inner, cancelFunc: cancel}
+	d, ok := ac.Deadline()
+	if !ok {
+		t.Fatalf("expected deadline ok")
+	}
+	if !d.Equal(deadline) {
+		t.Fatalf("deadline mismatch")
+	}
+	if ac.Done() == nil {
+		t.Fatalf("expected non-nil Done channel")
+	}
+	if ac.Err() != nil {
+		t.Fatalf("expected no err yet")
+	}
+
+	cancel()
+	// After cancel, Err should return Canceled
+	if !errors.Is(ac.Err(), context.Canceled) {
+		t.Fatalf("expected context.Canceled, got %v", ac.Err())
+	}
+}
+
+func TestAppContext_RequestURI(t *testing.T) {
+	bg := CreateBackgroundAppContext()
+	if bg.RequestURI() != "" {
+		t.Fatalf("expected empty for background context")
+	}
+
+	rec := httptest.NewRecorder()
+	g, _ := gin.CreateTestContext(rec)
+	g.Request = httptest.NewRequest(http.MethodPost, "/foo/bar", nil)
+
+	inner, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	ac := CreateAppContext(g, inner, cancel)
+
+	uri := ac.RequestURI()
+	if uri != "POST :: /foo/bar" {
+		t.Fatalf("expected POST :: /foo/bar, got %q", uri)
+	}
+}

ginext/commonHandler_test.go

@@ -0,0 +1,33 @@
+package ginext
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestRedirectFound(t *testing.T) {
+	hf := RedirectFound("/x")
+	resp := hf(PreContext{})
+	if resp == nil {
+		t.Fatalf("expected response")
+	}
+	if resp.(InspectableHTTPResponse).Statuscode() != http.StatusFound {
+		t.Fatalf("expected 302")
+	}
+}
+
+func TestRedirectTemporary(t *testing.T) {
+	hf := RedirectTemporary("/x")
+	resp := hf(PreContext{})
+	if resp.(InspectableHTTPResponse).Statuscode() != http.StatusTemporaryRedirect {
+		t.Fatalf("expected 307")
+	}
+}
+
+func TestRedirectPermanent(t *testing.T) {
+	hf := RedirectPermanent("/x")
+	resp := hf(PreContext{})
+	if resp.(InspectableHTTPResponse).Statuscode() != http.StatusPermanentRedirect {
+		t.Fatalf("expected 308")
+	}
+}

ginext/commonMiddlewares_test.go

@@ -0,0 +1,45 @@
+package ginext
+
+import (
+	"bytes"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestBodyBuffer_WrapsBody(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodPost, "/", strings.NewReader("payload"))
+
+	original := c.Request.Body
+	BodyBuffer(c)
+	if c.Request.Body == original {
+		t.Fatalf("expected body to be replaced with buffered reader")
+	}
+
+	data, err := io.ReadAll(c.Request.Body)
+	if err != nil {
+		t.Fatalf("read err: %v", err)
+	}
+	if !bytes.Equal(data, []byte("payload")) {
+		t.Fatalf("body mismatch: %q", data)
+	}
+}
+
+func TestBodyBuffer_NilBody(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+	c.Request.Body = nil
+
+	// Should not panic
+	BodyBuffer(c)
+	if c.Request.Body != nil {
+		t.Fatalf("expected nil body to remain nil")
+	}
+}

ginext/cors_test.go

@@ -0,0 +1,81 @@
+package ginext
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestCorsMiddleware_SetsHeaders(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+
+	mw := CorsMiddleware([]string{"X-Foo", "X-Bar"}, []string{"X-Exposed"})
+	mw(c)
+
+	h := rec.Header()
+	if h.Get("Access-Control-Allow-Origin") != "*" {
+		t.Fatalf("expected Allow-Origin *")
+	}
+	if h.Get("Access-Control-Allow-Credentials") != "true" {
+		t.Fatalf("expected Allow-Credentials true")
+	}
+	if h.Get("Access-Control-Allow-Headers") != "X-Foo, X-Bar" {
+		t.Fatalf("expected Allow-Headers X-Foo, X-Bar got %q", h.Get("Access-Control-Allow-Headers"))
+	}
+	if h.Get("Access-Control-Expose-Headers") != "X-Exposed" {
+		t.Fatalf("expected Expose-Headers X-Exposed got %q", h.Get("Access-Control-Expose-Headers"))
+	}
+	allowMethods := h.Get("Access-Control-Allow-Methods")
+	for _, want := range []string{"OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE", "COUNT"} {
+		if !strings.Contains(allowMethods, want) {
+			t.Errorf("expected Allow-Methods to contain %q, got %q", want, allowMethods)
+		}
+	}
+}
+
+func TestCorsMiddleware_NoExposeHeader(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+
+	mw := CorsMiddleware([]string{"X-Foo"}, []string{})
+	mw(c)
+
+	if _, ok := rec.Header()["Access-Control-Expose-Headers"]; ok {
+		t.Fatalf("expected Expose-Headers to be unset when empty")
+	}
+}
+
+func TestCorsMiddleware_OptionsAborts(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodOptions, "/", nil)
+
+	mw := CorsMiddleware([]string{"X-Foo"}, nil)
+	mw(c)
+
+	if !c.IsAborted() {
+		t.Fatalf("expected context aborted on OPTIONS")
+	}
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected 200 on OPTIONS, got %d", rec.Code)
+	}
+}
+
+func TestCorsMiddleware_NonOptionsContinues(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+
+	mw := CorsMiddleware([]string{"X-Foo"}, nil)
+	mw(c)
+
+	if c.IsAborted() {
+		t.Fatalf("non-OPTIONS request should not be aborted")
+	}
+}

ginext/engine.go

@@ -2,17 +2,19 @@ package ginext
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/rs/zerolog/log"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/mathext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
 	"net"
 	"net/http"
 	"net/http/httptest"
 	"regexp"
 	"strings"
 	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/mathext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
+	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
 )
 
 type GinWrapper struct {
@@ -103,7 +105,10 @@ func NewEngine(opt Options) *GinWrapper {
 	return wrapper
 }
 
-func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string)) (chan error, *http.Server) {
+// ListenAndServeHTTP
+// returns nil, nil, err if something went wrong during init
+// returns $chan, $server, nil if init was successful ( later errors come through chan )
+func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string)) (chan error, *http.Server, error) {
 
 	w.DebugPrintRoutes()
 
@@ -114,30 +119,25 @@ func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string))
 
 	errChan := make(chan error)
 
-	go func() {
+	ln, err := net.Listen("tcp", httpserver.Addr)
+	if err != nil {
+		return nil, nil, exerr.Wrap(err, "").Build()
+	}
 
-		ln, err := net.Listen("tcp", httpserver.Addr)
-		if err != nil {
-			errChan <- err
-			return
-		}
+	_, port, err := net.SplitHostPort(ln.Addr().String())
+	if err != nil {
+		return nil, nil, exerr.Wrap(err, "").Build()
+	}
 
-		_, port, err := net.SplitHostPort(ln.Addr().String())
-		if err != nil {
-			errChan <- err
-			return
-		}
+	log.Info().Str("address", httpserver.Addr).Msg("HTTP-Server started on http://localhost:" + port)
 
-		log.Info().Str("address", httpserver.Addr).Msg("HTTP-Server started on http://localhost:" + port)
+	if postInit != nil {
+		postInit(port) // the net.Listener a few lines above is at this point actually already buffering requests
+	}
 
-		if postInit != nil {
-			postInit(port) // the net.Listener a few lines above is at this point actually already buffering requests
-		}
+	go func() { errChan <- httpserver.Serve(ln) }()
 
-		errChan <- httpserver.Serve(ln)
-	}()
-
-	return errChan, httpserver
+	return errChan, httpserver, nil
 }
 
 func (w *GinWrapper) DebugPrintRoutes() {

ginext/engine_test.go

@@ -0,0 +1,174 @@
+package ginext
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
+)
+
+func TestNewEngine_DefaultsApplied(t *testing.T) {
+	w := NewEngine(Options{})
+	if w == nil {
+		t.Fatalf("expected non-nil wrapper")
+	}
+	if w.engine == nil {
+		t.Fatalf("expected gin engine")
+	}
+	if w.allowCors {
+		t.Fatalf("expected allowCors default false")
+	}
+	if w.bufferBody {
+		t.Fatalf("expected bufferBody default false")
+	}
+	if !w.ginDebug {
+		t.Fatalf("expected ginDebug default true")
+	}
+	if w.requestTimeout != 24*time.Hour {
+		t.Fatalf("expected default 24h timeout, got %s", w.requestTimeout)
+	}
+}
+
+func TestNewEngine_OptionsHonored(t *testing.T) {
+	allowCors := true
+	bufferBody := true
+	suppress := true
+	debug := false
+	timeout := 5 * time.Second
+
+	w := NewEngine(Options{
+		AllowCors:       &allowCors,
+		BufferBody:      &bufferBody,
+		SuppressGinLogs: &suppress,
+		GinDebug:        &debug,
+		Timeout:         &timeout,
+		CorsAllowHeader: &[]string{"X-Custom"},
+	})
+
+	if !w.allowCors {
+		t.Fatalf("allowCors")
+	}
+	if !w.bufferBody {
+		t.Fatalf("bufferBody")
+	}
+	if !w.suppressGinLogs {
+		t.Fatalf("suppressGinLogs")
+	}
+	if w.ginDebug {
+		t.Fatalf("ginDebug should be false")
+	}
+	if w.requestTimeout != timeout {
+		t.Fatalf("timeout mismatch")
+	}
+	if !langext.ArrEqualsExact(w.corsAllowHeader, []string{"X-Custom"}) {
+		t.Fatalf("expected custom allow header")
+	}
+}
+
+func TestNewEngine_BuildRequestBindError_DefaultIsErrorWrapper(t *testing.T) {
+	w := NewEngine(Options{})
+	if w.buildRequestBindError == nil {
+		t.Fatalf("expected default builder")
+	}
+	resp := w.buildRequestBindError(nil, "URI", http.ErrAbortHandler)
+	if resp == nil {
+		t.Fatalf("expected response")
+	}
+	if resp.IsSuccess() {
+		t.Fatalf("expected error response, not success")
+	}
+}
+
+func TestNewEngine_BuildRequestBindError_Custom(t *testing.T) {
+	called := false
+	custom := func(c *gin.Context, fieldtype string, err error) HTTPResponse {
+		called = true
+		return Status(http.StatusTeapot)
+	}
+	_ = custom // referenced below to avoid unused warning if signature mismatch
+	w := NewEngine(Options{BuildRequestBindError: custom})
+	resp := w.buildRequestBindError(nil, "URI", http.ErrAbortHandler)
+	if !called {
+		t.Fatalf("expected custom builder to be invoked")
+	}
+	if resp.(InspectableHTTPResponse).Statuscode() != http.StatusTeapot {
+		t.Fatalf("expected 418 from custom builder")
+	}
+}
+
+func TestServeHTTP_RoundTrip(t *testing.T) {
+	w := NewEngine(Options{})
+	w.Routes().GET("/hello").Handle(func(p PreContext) HTTPResponse {
+		return Text(http.StatusOK, "world")
+	})
+
+	req := httptest.NewRequest(http.MethodGet, "/hello", nil)
+	rec := w.ServeHTTP(req)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected 200, got %d", rec.Code)
+	}
+	if rec.Body.String() != "world" {
+		t.Fatalf("expected world, got %q", rec.Body.String())
+	}
+}
+
+func TestForwardRequest(t *testing.T) {
+	w := NewEngine(Options{})
+	w.Routes().GET("/fwd").Handle(func(p PreContext) HTTPResponse {
+		return Text(http.StatusOK, "ok")
+	})
+
+	req := httptest.NewRequest(http.MethodGet, "/fwd", nil)
+	rec := httptest.NewRecorder()
+	w.ForwardRequest(rec, req)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected 200, got %d", rec.Code)
+	}
+}
+
+func TestListRoutes(t *testing.T) {
+	w := NewEngine(Options{})
+	w.Routes().GET("/a").Handle(func(p PreContext) HTTPResponse { return Status(200) })
+	w.Routes().POST("/b").Handle(func(p PreContext) HTTPResponse { return Status(200) })
+
+	rs := w.ListRoutes()
+	if len(rs) < 2 {
+		t.Fatalf("expected at least 2 routes, got %d", len(rs))
+	}
+}
+
+func TestDebugPrintRoutes_NoPanic(t *testing.T) {
+	w := NewEngine(Options{})
+	w.Routes().GET("/x").Handle(func(p PreContext) HTTPResponse { return Status(200) })
+	// just verify it doesn't panic
+	w.DebugPrintRoutes()
+}
+
+func TestCleanMiddlewareName(t *testing.T) {
+	w := NewEngine(Options{
+		DebugTrimHandlerPrefixes: []string{"customprefix."},
+		DebugReplaceHandlerNames: map[string]string{"BadName": "GoodName"},
+	})
+
+	cases := []struct {
+		in, want string
+	}{
+		{"ginext.BodyBuffer", "[BodyBuffer]"},
+		{"foo.(*GinRoutesWrapper).WithJSONFilter", "[JSONFilter]"},
+		{"ginext.someThing", "someThing"},
+		{"api.someThing", "someThing"},
+		{"customprefix.thing", "thing"},
+		{"BadName", "GoodName"},
+		{"badname", "GoodName"},
+		{"some.pkg.Func.func1", "some.pkg.Func"},
+		{"some.pkg.Func.func1.2", "some.pkg.Func"},
+	}
+	for _, tc := range cases {
+		if got := w.cleanMiddlewareName(tc.in); got != tc.want {
+			t.Errorf("cleanMiddlewareName(%q) = %q, want %q", tc.in, got, tc.want)
+		}
+	}
+}

ginext/funcWrapper.go

@@ -2,9 +2,10 @@ package ginext
 
 import (
 	"fmt"
+	"net/http"
+
 	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 type WHandlerFunc func(PreContext) HTTPResponse
@@ -40,6 +41,8 @@ func Wrap(w *GinWrapper, fn WHandlerFunc) gin.HandlerFunc {
 		}
 
 		if g.Writer.Written() {
+			// (!) This panic is not preoperly cached - it will kill the whole process
+			//     but that only means you should NOT write in WrapperFunc...
 			panic("Writing in WrapperFunc is not supported")
 		}
 
@@ -54,8 +57,22 @@ func Wrap(w *GinWrapper, fn WHandlerFunc) gin.HandlerFunc {
 			lstr(g, wrap)
 		}
 
+		if g.IsAborted() {
+			return
+		}
+
 		if reqctx.Err() == nil {
 			wrap.Write(g)
+			if g.IsAborted() {
+				// can happen if we try to marshal an invalid json object (e.g. containing Inf)
+				exerr.
+					New(exerr.TypePanic, "Failed to write response to renderer").
+					Strs("errors", g.Errors.Errors()).
+					Stack().
+					Print(g)
+
+				g.Status(500)
+			}
 		}
 	}
 }
@@ -87,3 +104,17 @@ func WrapHTTPHandlerFunc(w *GinWrapper, fn http.HandlerFunc) gin.HandlerFunc {
 		}
 	}
 }
+
+func WrapExtHTTPHandlerFunc(w *GinWrapper, fn func(*gin.Context, http.ResponseWriter, *http.Request)) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		for _, lstr := range w.listenerBeforeRequest {
+			lstr(g)
+		}
+
+		fn(g, g.Writer, g.Request)
+
+		for _, lstr := range w.listenerAfterRequest {
+			lstr(g, nil)
+		}
+	}
+}

ginext/jsonFilter_test.go

@@ -0,0 +1,35 @@
+package ginext
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestSetJSONFilter_StoresInContext(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+
+	SetJSONFilter(c, "myfilter")
+
+	v := c.GetString(jsonFilterKey)
+	if v != "myfilter" {
+		t.Fatalf("expected filter to be stored, got %q", v)
+	}
+}
+
+func TestSetJSONFilter_Empty(t *testing.T) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+
+	SetJSONFilter(c, "")
+
+	v := c.GetString(jsonFilterKey)
+	if v != "" {
+		t.Fatalf("expected empty filter")
+	}
+}

ginext/preContext.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
 	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
 	"io"
 	"runtime/debug"
 	"time"
@@ -84,7 +84,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailURI).
 				Str("struct_type", fmt.Sprintf("%T", pctx.uri)).
 				Build()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "URI", err))
+			return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "URI", err))
 		}
 	}
 
@@ -94,7 +94,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailQuery).
 				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
 				Build()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "QUERY", err))
+			return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "QUERY", err))
 		}
 	}
 
@@ -108,7 +108,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 						WithType(exerr.TypeBindFailJSON).
 						Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 						Build()
-					return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
+					return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
 				}
 			}
 			if err := pctx.ginCtx.ShouldBindJSON(pctx.body); err != nil {
@@ -116,14 +116,14 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailJSON).
 					Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
 			}
 		} else {
 			if !pctx.ignoreWrongContentType {
 				err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body").
 					Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
 			}
 		}
 	}
@@ -132,14 +132,14 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 		if brc, ok := pctx.ginCtx.Request.Body.(dataext.BufferedReadCloser); ok {
 			v, err := brc.BufferedAll()
 			if err != nil {
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
 			}
 			*pctx.rawbody = v
 		} else {
 			buf := &bytes.Buffer{}
 			_, err := io.Copy(buf, pctx.ginCtx.Request.Body)
 			if err != nil {
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
 			}
 			*pctx.rawbody = buf.Bytes()
 		}
@@ -152,7 +152,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailFormData).
 					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
 			}
 		} else if pctx.ginCtx.ContentType() == "application/x-www-form-urlencoded" {
 			if err := pctx.ginCtx.ShouldBindWith(pctx.form, binding.Form); err != nil {
@@ -160,14 +160,14 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailFormData).
 					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
 			}
 		} else {
 			if !pctx.ignoreWrongContentType {
 				err := exerr.New(exerr.TypeBindFailFormData, "missing form body").
 					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
+				return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
 			}
 		}
 	}
@@ -178,7 +178,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailHeader).
 				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
 				Build()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "HEADER", err))
+			return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "HEADER", err))
 		}
 	}
 
@@ -190,7 +190,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 		err := pctx.persistantData.sessionObj.Init(pctx.ginCtx, actx)
 		if err != nil {
 			actx.Cancel()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "INIT", err))
+			return CreateBackgroundAppContext(), nil, new(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "INIT", err))
 		}
 	}
 

ginext/responseData.go

@@ -1,8 +1,8 @@
 package ginext
 
 import (
-	"github.com/gin-gonic/gin"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
 )
 
 type dataHTTPResponse struct {
@@ -42,7 +42,7 @@ func (j dataHTTPResponse) Statuscode() int {
 }
 
 func (j dataHTTPResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr(string(j.data))
+	return new(string(j.data))
 }
 
 func (j dataHTTPResponse) ContentType() string {

ginext/responseDownload.go

@@ -2,8 +2,8 @@ package ginext
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
 )
 
 type downloadDataHTTPResponse struct {
@@ -48,7 +48,7 @@ func (j downloadDataHTTPResponse) Statuscode() int {
 }
 
 func (j downloadDataHTTPResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr(string(j.data))
+	return new(string(j.data))
 }
 
 func (j downloadDataHTTPResponse) ContentType() string {

ginext/responseFile.go

@@ -2,8 +2,8 @@ package ginext
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
 	"os"
 )
 
@@ -53,7 +53,7 @@ func (j fileHTTPResponse) BodyString(*gin.Context) *string {
 	if err != nil {
 		return nil
 	}
-	return langext.Ptr(string(data))
+	return new(string(data))
 }
 
 func (j fileHTTPResponse) ContentType() string {

ginext/responseSeekable.go

@@ -1,9 +1,9 @@
 package ginext
 
 import (
-	"github.com/gin-gonic/gin"
 	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
 	"io"
 	"net/http"
 	"time"
@@ -56,7 +56,7 @@ func (j seekableResponse) Statuscode() int {
 }
 
 func (j seekableResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr("(seekable)")
+	return new("(seekable)")
 }
 
 func (j seekableResponse) ContentType() string {

ginext/responseText.go

@@ -1,8 +1,8 @@
 package ginext
 
 import (
-	"github.com/gin-gonic/gin"
 	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
 )
 
 type textHTTPResponse struct {
@@ -41,7 +41,7 @@ func (j textHTTPResponse) Statuscode() int {
 }
 
 func (j textHTTPResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr(j.data)
+	return new(j.data)
 }
 
 func (j textHTTPResponse) ContentType() string {

ginext/response_test.go

@@ -0,0 +1,320 @@
+package ginext
+
+import (
+	"bytes"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func init() {
+	gin.SetMode(gin.TestMode)
+}
+
+func newTestCtx() (*gin.Context, *httptest.ResponseRecorder) {
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+	return c, rec
+}
+
+func TestJSONResponse_Basics(t *testing.T) {
+	r := JSON(http.StatusOK, map[string]any{"a": 1})
+	if !r.IsSuccess() {
+		t.Fatalf("expected IsSuccess true for 200")
+	}
+	ir, ok := r.(InspectableHTTPResponse)
+	if !ok {
+		t.Fatalf("expected InspectableHTTPResponse")
+	}
+	if ir.Statuscode() != http.StatusOK {
+		t.Fatalf("statuscode mismatch: %d", ir.Statuscode())
+	}
+	if ir.ContentType() != "application/json" {
+		t.Fatalf("expected content-type application/json, got %q", ir.ContentType())
+	}
+}
+
+func TestJSONResponse_Write(t *testing.T) {
+	c, rec := newTestCtx()
+	r := JSON(http.StatusCreated, map[string]any{"hello": "world"})
+	r.Write(c)
+	if rec.Code != http.StatusCreated {
+		t.Fatalf("expected 201, got %d", rec.Code)
+	}
+	if !bytes.Contains(rec.Body.Bytes(), []byte("\"hello\":\"world\"")) {
+		t.Fatalf("unexpected body: %s", rec.Body.String())
+	}
+}
+
+func TestJSONResponse_BodyString(t *testing.T) {
+	c, _ := newTestCtx()
+	r := JSON(http.StatusOK, map[string]any{"x": 42})
+	ir := r.(InspectableHTTPResponse)
+	body := ir.BodyString(c)
+	if body == nil {
+		t.Fatalf("expected body, got nil")
+	}
+	if !bytes.Contains([]byte(*body), []byte("\"x\":42")) {
+		t.Fatalf("unexpected body: %q", *body)
+	}
+}
+
+func TestJSONResponse_FilterFromContext(t *testing.T) {
+	c, _ := newTestCtx()
+	SetJSONFilter(c, "abc")
+	r := JSON(http.StatusOK, map[string]any{"x": 1})
+	body := r.(InspectableHTTPResponse).BodyString(c)
+	if body == nil {
+		t.Fatalf("expected body")
+	}
+}
+
+func TestJSONResponse_FilterOverride(t *testing.T) {
+	c, _ := newTestCtx()
+	SetJSONFilter(c, "abc")
+	r := JSONWithFilter(http.StatusOK, map[string]any{"x": 1}, "override")
+	if r == nil {
+		t.Fatalf("expected response")
+	}
+	if !r.IsSuccess() {
+		t.Fatalf("expected success")
+	}
+	body := r.(InspectableHTTPResponse).BodyString(c)
+	if body == nil {
+		t.Fatalf("expected body")
+	}
+}
+
+func TestResponse_IsSuccessRanges(t *testing.T) {
+	cases := []struct {
+		code int
+		ok   bool
+	}{
+		{100, false},
+		{199, false},
+		{200, true},
+		{201, true},
+		{299, true},
+		{300, true},
+		{399, true},
+		{400, false},
+		{500, false},
+	}
+	for _, tc := range cases {
+		r := JSON(tc.code, nil)
+		if r.IsSuccess() != tc.ok {
+			t.Errorf("status %d: expected IsSuccess=%v", tc.code, tc.ok)
+		}
+		r2 := Status(tc.code)
+		if r2.IsSuccess() != tc.ok {
+			t.Errorf("Status(%d): expected IsSuccess=%v", tc.code, tc.ok)
+		}
+		r3 := Text(tc.code, "x")
+		if r3.IsSuccess() != tc.ok {
+			t.Errorf("Text(%d): expected IsSuccess=%v", tc.code, tc.ok)
+		}
+		r4 := Data(tc.code, "text/plain", []byte("x"))
+		if r4.IsSuccess() != tc.ok {
+			t.Errorf("Data(%d): expected IsSuccess=%v", tc.code, tc.ok)
+		}
+	}
+}
+
+func TestResponse_WithHeader(t *testing.T) {
+	r := JSON(http.StatusOK, nil).
+		WithHeader("X-Foo", "bar").
+		WithHeader("X-Baz", "qux")
+	headers := r.(InspectableHTTPResponse).Headers()
+	if len(headers) != 2 {
+		t.Fatalf("expected 2 headers, got %d", len(headers))
+	}
+	if headers[0] != "X-Foo=bar" || headers[1] != "X-Baz=qux" {
+		t.Fatalf("headers wrong: %v", headers)
+	}
+}
+
+func TestResponse_WithCookie_DoesNotPanic(t *testing.T) {
+	r := JSON(http.StatusOK, nil).
+		WithCookie("session", "abc", 3600, "/", "example.com", true, true)
+	if r == nil {
+		t.Fatalf("expected response")
+	}
+	c, rec := newTestCtx()
+	r.Write(c)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected 200, got %d", rec.Code)
+	}
+	cookies := rec.Result().Cookies()
+	if len(cookies) != 1 {
+		t.Fatalf("expected 1 cookie, got %d", len(cookies))
+	}
+	if cookies[0].Name != "session" || cookies[0].Value != "abc" {
+		t.Fatalf("cookie wrong: %+v", cookies[0])
+	}
+}
+
+func TestTextResponse(t *testing.T) {
+	c, rec := newTestCtx()
+	r := Text(http.StatusOK, "hello")
+	if r.(InspectableHTTPResponse).ContentType() != "text/plain" {
+		t.Fatalf("expected text/plain")
+	}
+	body := r.(InspectableHTTPResponse).BodyString(c)
+	if body == nil || *body != "hello" {
+		t.Fatalf("body mismatch")
+	}
+	r.Write(c)
+	if rec.Body.String() != "hello" {
+		t.Fatalf("write body mismatch: %q", rec.Body.String())
+	}
+}
+
+func TestDataResponse(t *testing.T) {
+	c, rec := newTestCtx()
+	payload := []byte{0x01, 0x02, 0x03}
+	r := Data(http.StatusOK, "application/octet-stream", payload)
+	if r.(InspectableHTTPResponse).ContentType() != "application/octet-stream" {
+		t.Fatalf("contenttype mismatch")
+	}
+	r.Write(c)
+	if !bytes.Equal(rec.Body.Bytes(), payload) {
+		t.Fatalf("body mismatch")
+	}
+	body := r.(InspectableHTTPResponse).BodyString(c)
+	if body == nil || *body != string(payload) {
+		t.Fatalf("BodyString mismatch")
+	}
+}
+
+func TestStatusResponse(t *testing.T) {
+	c, rec := newTestCtx()
+	r := Status(http.StatusNoContent)
+	if r.(InspectableHTTPResponse).ContentType() != "" {
+		t.Fatalf("expected empty content type")
+	}
+	if r.(InspectableHTTPResponse).BodyString(c) != nil {
+		t.Fatalf("expected nil body")
+	}
+	r.Write(c)
+	if c.Writer.Status() != http.StatusNoContent {
+		t.Fatalf("expected 204, got %d", c.Writer.Status())
+	}
+	_ = rec
+}
+
+func TestRedirectResponse(t *testing.T) {
+	c, rec := newTestCtx()
+	r := Redirect(http.StatusFound, "/elsewhere")
+	if r.(InspectableHTTPResponse).Statuscode() != http.StatusFound {
+		t.Fatalf("status mismatch")
+	}
+	if r.(InspectableHTTPResponse).ContentType() != "" {
+		t.Fatalf("expected empty content type")
+	}
+	if r.(InspectableHTTPResponse).BodyString(c) != nil {
+		t.Fatalf("expected nil body")
+	}
+	r.Write(c)
+	if rec.Code != http.StatusFound {
+		t.Fatalf("expected 302, got %d", rec.Code)
+	}
+	if rec.Header().Get("Location") != "/elsewhere" {
+		t.Fatalf("expected Location header")
+	}
+}
+
+func TestNotImplemented(t *testing.T) {
+	r := NotImplemented()
+	if r == nil {
+		t.Fatalf("expected response")
+	}
+	if r.IsSuccess() {
+		t.Fatalf("NotImplemented must not be success")
+	}
+}
+
+func TestError_NotSuccess(t *testing.T) {
+	r := Error(http.ErrAbortHandler)
+	if r.IsSuccess() {
+		t.Fatalf("error response must not be success")
+	}
+	herr, ok := r.(HTTPErrorResponse)
+	if !ok {
+		t.Fatalf("expected HTTPErrorResponse")
+	}
+	if herr.Error() == nil {
+		t.Fatalf("expected non-nil err")
+	}
+}
+
+func TestError_ContentTypeJSON(t *testing.T) {
+	r := Error(http.ErrAbortHandler)
+	if r.(InspectableHTTPResponse).ContentType() != "application/json" {
+		t.Fatalf("expected application/json")
+	}
+}
+
+func TestDownloadData(t *testing.T) {
+	c, rec := newTestCtx()
+	payload := []byte("file content")
+	r := DownloadData(http.StatusOK, "text/plain", "f.txt", payload)
+	if r.(InspectableHTTPResponse).ContentType() != "text/plain" {
+		t.Fatalf("contenttype mismatch")
+	}
+	if r.(InspectableHTTPResponse).Statuscode() != http.StatusOK {
+		t.Fatalf("status mismatch")
+	}
+	body := r.(InspectableHTTPResponse).BodyString(c)
+	if body == nil || *body != string(payload) {
+		t.Fatalf("body mismatch")
+	}
+	r.Write(c)
+	if rec.Header().Get("Content-Disposition") == "" {
+		t.Fatalf("expected Content-Disposition header")
+	}
+	if !bytes.Contains([]byte(rec.Header().Get("Content-Disposition")), []byte("f.txt")) {
+		t.Fatalf("Content-Disposition does not contain filename: %q", rec.Header().Get("Content-Disposition"))
+	}
+}
+
+func TestSeekable(t *testing.T) {
+	r := Seekable("foo.bin", "application/octet-stream", bytes.NewReader([]byte("xyz")))
+	if !r.IsSuccess() {
+		t.Fatalf("seekable must be success")
+	}
+	ir := r.(InspectableHTTPResponse)
+	if ir.Statuscode() != 200 {
+		t.Fatalf("expected 200")
+	}
+	if ir.ContentType() != "application/octet-stream" {
+		t.Fatalf("contenttype mismatch")
+	}
+	body := ir.BodyString(nil)
+	if body == nil || *body != "(seekable)" {
+		t.Fatalf("BodyString mismatch")
+	}
+}
+
+func TestFile_Builders(t *testing.T) {
+	r := File("text/plain", "/tmp/this-file-should-not-exist-xyz")
+	if !r.IsSuccess() {
+		t.Fatalf("File must IsSuccess true")
+	}
+	if r.(InspectableHTTPResponse).Statuscode() != 200 {
+		t.Fatalf("expected 200")
+	}
+	if r.(InspectableHTTPResponse).ContentType() != "text/plain" {
+		t.Fatalf("contenttype mismatch")
+	}
+	r2 := Download("application/pdf", "/tmp/this-file-should-not-exist-xyz", "doc.pdf")
+	if r2.(InspectableHTTPResponse).ContentType() != "application/pdf" {
+		t.Fatalf("contenttype mismatch")
+	}
+	body := r.(InspectableHTTPResponse).BodyString(nil)
+	if body != nil {
+		t.Fatalf("expected nil body for nonexistent file")
+	}
+}

ginext/routes.go

@@ -1,13 +1,14 @@
 package ginext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"path"
 	"reflect"
 	"runtime"
 	"strings"
+
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"github.com/gin-gonic/gin"
 )
 
 var anyMethods = []string{
@@ -210,6 +211,37 @@ func (w *GinRouteBuilder) HandleRawHTTPHandlerFunc(f http.HandlerFunc) {
 	})
 }
 
+func (w *GinRouteBuilder) HandleExtHTTPHandlerFunc(f func(*gin.Context, http.ResponseWriter, *http.Request)) {
+	if w.routes.wrapper.bufferBody {
+		arr := make([]gin.HandlerFunc, 0, len(w.handlers)+1)
+		arr = append(arr, BodyBuffer)
+		arr = append(arr, w.handlers...)
+		w.handlers = arr
+	}
+
+	middlewareNames := langext.ArrMap(w.handlers, func(v gin.HandlerFunc) string { return nameOfFunction(v) })
+
+	w.handlers = append(w.handlers, WrapExtHTTPHandlerFunc(w.routes.wrapper, f))
+
+	methodName := w.method
+
+	if w.method == "*" {
+		methodName = "ANY"
+		for _, method := range anyMethods {
+			w.routes.routes.Handle(method, w.relPath, w.handlers...)
+		}
+	} else {
+		w.routes.routes.Handle(w.method, w.relPath, w.handlers...)
+	}
+
+	w.routes.wrapper.routeSpecs = append(w.routes.wrapper.routeSpecs, ginRouteSpec{
+		Method:      methodName,
+		URL:         w.absPath,
+		Middlewares: middlewareNames,
+		Handler:     "[HTTPHandlerFunc]",
+	})
+}
+
 func (w *GinWrapper) NoRoute(handler WHandlerFunc) {
 
 	handlers := make([]gin.HandlerFunc, 0)

ginext/routes_test.go

@@ -0,0 +1,278 @@
+package ginext
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestJoinPaths(t *testing.T) {
+	cases := []struct {
+		abs, rel, want string
+	}{
+		{"", "", ""},
+		{"/api", "", "/api"},
+		{"/api", "users", "/api/users"},
+		{"/api/", "users", "/api/users"},
+		{"/api", "/users", "/api/users"},
+		{"/api/", "/users/", "/api/users/"},
+		{"/api", "users/", "/api/users/"},
+		{"", "/users", "/users"},
+		{"/", "/", "/"},
+	}
+	for _, tc := range cases {
+		got := joinPaths(tc.abs, tc.rel)
+		if got != tc.want {
+			t.Errorf("joinPaths(%q,%q)=%q want %q", tc.abs, tc.rel, got, tc.want)
+		}
+	}
+}
+
+func TestLastChar(t *testing.T) {
+	if lastChar("hello") != 'o' {
+		t.Fatalf("expected 'o'")
+	}
+	if lastChar("/") != '/' {
+		t.Fatalf("expected '/'")
+	}
+}
+
+func TestLastChar_PanicsOnEmpty(t *testing.T) {
+	defer func() {
+		if r := recover(); r == nil {
+			t.Fatalf("expected panic on empty string")
+		}
+	}()
+	lastChar("")
+}
+
+func sampleHandler(_ *gin.Context) {}
+
+func TestNameOfFunction(t *testing.T) {
+	name := nameOfFunction(sampleHandler)
+	if name == "" {
+		t.Fatalf("expected non-empty name")
+	}
+	// nameOfFunction strips path prefix, expecting form "ginext.sampleHandler" or similar
+	if name != "ginext.sampleHandler" {
+		t.Errorf("expected ginext.sampleHandler, got %q", name)
+	}
+}
+
+type sampleStruct struct{}
+
+func (s sampleStruct) Method(_ *gin.Context) {}
+
+func TestNameOfFunction_StripsFmSuffix(t *testing.T) {
+	s := sampleStruct{}
+	// Method values get a "-fm" suffix that nameOfFunction should strip
+	name := nameOfFunction(s.Method)
+	if name == "" {
+		t.Fatalf("expected non-empty name")
+	}
+	if got := name; got[len(got)-3:] == "-fm" {
+		t.Errorf("expected -fm suffix to be stripped, got %q", name)
+	}
+}
+
+func TestRoutes_GroupAndAbsPath(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes()
+	if rw.absPath != "" {
+		t.Fatalf("expected empty absPath")
+	}
+	g1 := rw.Group("/api")
+	if g1.absPath != "/api" {
+		t.Fatalf("expected /api, got %q", g1.absPath)
+	}
+	g2 := g1.Group("/v1")
+	if g2.absPath != "/api/v1" {
+		t.Fatalf("expected /api/v1, got %q", g2.absPath)
+	}
+}
+
+func TestRoutes_UseAccumulatesMiddleware(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes()
+
+	mw1 := func(c *gin.Context) {}
+	mw2 := func(c *gin.Context) {}
+
+	r1 := rw.Use(mw1)
+	if len(r1.defaultHandler) != 1 {
+		t.Fatalf("expected 1 handler after Use, got %d", len(r1.defaultHandler))
+	}
+	r2 := r1.Use(mw2)
+	if len(r2.defaultHandler) != 2 {
+		t.Fatalf("expected 2 handlers, got %d", len(r2.defaultHandler))
+	}
+	// Original parent should be unchanged
+	if len(rw.defaultHandler) != 0 {
+		t.Fatalf("expected parent to remain unchanged, got %d", len(rw.defaultHandler))
+	}
+}
+
+func TestRoutes_GroupCopiesMiddleware(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes().Use(func(c *gin.Context) {})
+	g := rw.Group("/x")
+	if len(g.defaultHandler) != 1 {
+		t.Fatalf("expected group to inherit middleware")
+	}
+}
+
+func TestRoutes_MethodBuilders(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes()
+
+	cases := []struct {
+		name   string
+		build  func(string) *GinRouteBuilder
+		want   string
+	}{
+		{"GET", rw.GET, http.MethodGet},
+		{"POST", rw.POST, http.MethodPost},
+		{"PUT", rw.PUT, http.MethodPut},
+		{"PATCH", rw.PATCH, http.MethodPatch},
+		{"DELETE", rw.DELETE, http.MethodDelete},
+		{"HEAD", rw.HEAD, http.MethodHead},
+		{"OPTIONS", rw.OPTIONS, http.MethodOptions},
+		{"COUNT", rw.COUNT, "COUNT"},
+		{"Any", rw.Any, "*"},
+	}
+	for _, tc := range cases {
+		b := tc.build("/foo")
+		if b.method != tc.want {
+			t.Errorf("%s: expected method %q, got %q", tc.name, tc.want, b.method)
+		}
+		if b.relPath != "/foo" {
+			t.Errorf("%s: expected relPath /foo, got %q", tc.name, b.relPath)
+		}
+	}
+}
+
+func TestRoutes_RouteBuilderUseAppends(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes()
+	b := rw.GET("/x")
+	startCount := len(b.handlers)
+	b.Use(func(c *gin.Context) {})
+	if len(b.handlers) != startCount+1 {
+		t.Fatalf("expected handlers to grow by 1")
+	}
+}
+
+func TestRoutes_RouteBuilderInheritsDefaultHandlers(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes().Use(func(c *gin.Context) {})
+	b := rw.GET("/x")
+	if len(b.handlers) != 1 {
+		t.Fatalf("expected route to inherit default handler")
+	}
+}
+
+func TestRoutes_WithJSONFilter_AddsHandler(t *testing.T) {
+	w := NewEngine(Options{})
+	rw := w.Routes().WithJSONFilter("xyz")
+	if len(rw.defaultHandler) != 1 {
+		t.Fatalf("expected json filter middleware to be added")
+	}
+	// invoke it to verify it sets the key
+	rec := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(rec)
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+	rw.defaultHandler[0](c)
+	if c.GetString(jsonFilterKey) != "xyz" {
+		t.Fatalf("expected jsonFilterKey to be set to xyz")
+	}
+}
+
+func TestRoutes_RouteBuilderWithJSONFilter(t *testing.T) {
+	w := NewEngine(Options{})
+	b := w.Routes().GET("/x").WithJSONFilter("abc")
+	if len(b.handlers) != 1 {
+		t.Fatalf("expected handler to be added")
+	}
+}
+
+func TestRoutes_HandleRegistersAndStoresSpec(t *testing.T) {
+	w := NewEngine(Options{})
+	w.Routes().GET("/foo").Handle(func(p PreContext) HTTPResponse {
+		return Status(http.StatusOK)
+	})
+
+	if len(w.routeSpecs) != 1 {
+		t.Fatalf("expected 1 route spec, got %d", len(w.routeSpecs))
+	}
+	spec := w.routeSpecs[0]
+	if spec.Method != http.MethodGet {
+		t.Fatalf("expected GET, got %s", spec.Method)
+	}
+	if spec.URL != "/foo" {
+		t.Fatalf("expected /foo, got %s", spec.URL)
+	}
+
+	// Hitting the route should serve our handler
+	req := httptest.NewRequest(http.MethodGet, "/foo", nil)
+	rec := w.ServeHTTP(req)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected 200, got %d", rec.Code)
+	}
+}
+
+func TestRoutes_AnyRegistersAllMethods(t *testing.T) {
+	w := NewEngine(Options{})
+	w.Routes().Any("/wild").Handle(func(p PreContext) HTTPResponse {
+		return Status(http.StatusOK)
+	})
+
+	for _, m := range anyMethods {
+		req := httptest.NewRequest(m, "/wild", nil)
+		rec := w.ServeHTTP(req)
+		if rec.Code != http.StatusOK {
+			t.Errorf("method %s: expected 200, got %d", m, rec.Code)
+		}
+	}
+	if w.routeSpecs[0].Method != "ANY" {
+		t.Fatalf("expected method label ANY, got %s", w.routeSpecs[0].Method)
+	}
+}
+
+func TestRoutes_GroupedRoutes(t *testing.T) {
+	w := NewEngine(Options{})
+	api := w.Routes().Group("/api")
+	api.GET("/ping").Handle(func(p PreContext) HTTPResponse {
+		return Text(http.StatusOK, "pong")
+	})
+
+	req := httptest.NewRequest(http.MethodGet, "/api/ping", nil)
+	rec := w.ServeHTTP(req)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("expected 200, got %d", rec.Code)
+	}
+	if rec.Body.String() != "pong" {
+		t.Fatalf("expected pong, got %q", rec.Body.String())
+	}
+	if w.routeSpecs[0].URL != "/api/ping" {
+		t.Fatalf("expected absPath /api/ping in spec, got %s", w.routeSpecs[0].URL)
+	}
+}
+
+func TestRoutes_NoRoute(t *testing.T) {
+	w := NewEngine(Options{})
+	w.NoRoute(func(p PreContext) HTTPResponse {
+		return Status(http.StatusTeapot)
+	})
+
+	req := httptest.NewRequest(http.MethodGet, "/missing", nil)
+	rec := w.ServeHTTP(req)
+	if rec.Code != http.StatusTeapot {
+		t.Fatalf("expected 418, got %d", rec.Code)
+	}
+
+	if len(w.routeSpecs) != 1 || w.routeSpecs[0].URL != "[NO_ROUTE]" {
+		t.Fatalf("expected NO_ROUTE spec to be recorded")
+	}
+}

go.mod

@@ -1,71 +1,74 @@
 module git.blackforestbytes.com/BlackForestBytes/goext
 
-go 1.24.0
+go 1.26.0
 
 require (
-	github.com/gin-gonic/gin v1.11.0
+	github.com/gin-gonic/gin v1.12.0
 	github.com/glebarez/go-sqlite v1.22.0 // only needed for tests -.-
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/rs/xid v1.6.0
-	github.com/rs/zerolog v1.34.0
-	go.mongodb.org/mongo-driver v1.17.4
-	golang.org/x/crypto v0.42.0
-	golang.org/x/sys v0.36.0
-	golang.org/x/term v0.35.0
+	github.com/rs/zerolog v1.35.1
+	go.mongodb.org/mongo-driver/v2 v2.6.0
+	golang.org/x/crypto v0.52.0
+	golang.org/x/sys v0.45.0
+	golang.org/x/term v0.43.0
 )
 
 require (
+	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/disintegration/imaging v1.6.2
+	github.com/gorilla/websocket v1.5.3
 	github.com/jung-kurt/gofpdf v1.16.2
-	golang.org/x/net v0.44.0
-	golang.org/x/sync v0.17.0
+	github.com/xuri/excelize/v2 v2.10.1
+	golang.org/x/sync v0.20.0
 )
 
 require (
-	github.com/bytedance/gopkg v0.1.3 // indirect
-	github.com/bytedance/sonic v1.14.1 // indirect
-	github.com/bytedance/sonic/loader v0.3.0 // indirect
-	github.com/cloudwego/base64x v0.1.6 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/bytedance/gopkg v0.1.4 // indirect
+	github.com/bytedance/sonic v1.15.1 // indirect
+	github.com/bytedance/sonic/loader v0.5.1 // indirect
+	github.com/cloudwego/base64x v0.1.7 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.10 // indirect
-	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
+	github.com/gin-contrib/sse v1.1.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.27.0 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/goccy/go-yaml v1.18.0 // indirect
-	github.com/golang/snappy v1.0.0 // indirect
-	github.com/google/uuid v1.5.0 // indirect
+	github.com/go-playground/validator/v10 v10.30.2 // indirect
+	github.com/goccy/go-json v0.10.6 // indirect
+	github.com/goccy/go-yaml v1.19.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.18.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-colorable v0.1.15 // indirect
+	github.com/mattn/go-isatty v0.0.22 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.7.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
-	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/quic-go/quic-go v0.55.0 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/ncruces/go-strftime v1.0.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.3.1 // indirect
+	github.com/quic-go/qpack v0.6.0 // indirect
+	github.com/quic-go/quic-go v0.59.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/richardlehane/mscfb v1.0.6 // indirect
+	github.com/richardlehane/msoleps v1.0.6 // indirect
+	github.com/tiendc/go-deepcopy v1.7.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.3.0 // indirect
+	github.com/ugorji/go/codec v1.3.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/scram v1.2.0 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/xuri/efp v0.0.1 // indirect
+	github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	go.uber.org/mock v0.6.0 // indirect
-	golang.org/x/arch v0.21.0 // indirect
-	golang.org/x/image v0.31.0 // indirect
-	golang.org/x/mod v0.28.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
-	golang.org/x/tools v0.37.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.37.6 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.7.2 // indirect
-	modernc.org/sqlite v1.28.0 // indirect
+	golang.org/x/arch v0.27.0 // indirect
+	golang.org/x/image v0.41.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	modernc.org/libc v1.72.0 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.11.0 // indirect
+	modernc.org/sqlite v1.49.1 // indirect
 )

go.sum

@@ -1,56 +1,20 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=
+github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
-github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
-github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU=
-github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
-github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k=
-github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
-github.com/bytedance/sonic v1.12.5 h1:hoZxY8uW+mT+OpkcUWw4k0fDINtOcVavEsGfzwzFU/w=
-github.com/bytedance/sonic v1.12.5/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
-github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk=
-github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
-github.com/bytedance/sonic v1.12.7 h1:CQU8pxOy9HToxhndH0Kx/S1qU/CuS9GnKYrGioDcU1Q=
-github.com/bytedance/sonic v1.12.7/go.mod h1:tnbal4mxOMju17EGfknm2XyYcpyCnIROYOEYuemj13I=
-github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs=
-github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
-github.com/bytedance/sonic v1.12.9 h1:Od1BvK55NnewtGaJsTDeAOSnLVO2BTSLOe0+ooKokmQ=
-github.com/bytedance/sonic v1.12.9/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
-github.com/bytedance/sonic v1.12.10 h1:uVCQr6oS5669E9ZVW0HyksTLfNS7Q/9hV6IVS4nEMsI=
-github.com/bytedance/sonic v1.12.10/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
-github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g=
-github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
-github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
-github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
-github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0=
-github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
-github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
-github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
-github.com/bytedance/sonic v1.14.1 h1:FBMC0zVz5XUmE4z9wF4Jey0An5FueFvOsTKKKtwIl7w=
-github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc=
-github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
-github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E=
-github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.2 h1:jxAJuN9fOot/cyz5Q6dUuMJF5OqQ6+5GfA8FjjQ0R4o=
-github.com/bytedance/sonic/loader v0.2.2/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0=
-github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
-github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
-github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM=
+github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4=
+github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
+github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
+github.com/bytedance/sonic v1.15.1 h1:nJD5PmM0vY7J8CT6MxoqbVAAMhkSmV2HgRAUrrpLoOw=
+github.com/bytedance/sonic v1.15.1/go.mod h1:mT2NbXunuaEbnZ+mRIX/vYqKISmgEuHFDI4UzmKx2SA=
+github.com/bytedance/sonic/loader v0.5.1 h1:Ygpfa9zwRCCKSlrp5bBP/b/Xzc3VxsAW+5NIYXrOOpI=
+github.com/bytedance/sonic/loader v0.5.1/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
 github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
 github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
-github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cloudwego/base64x v0.1.7 h1:NppS+Fgzg5ovhn4NkUXaDT3x9jldgH5ToMCqzBSi2zI=
+github.com/cloudwego/base64x v0.1.7/go.mod h1:Cu1PV9zfrSf7ET2tIbWbbEy7jO7HHJ13q4X2SQ8aWYg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -58,30 +22,12 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
-github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
-github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
-github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
-github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
-github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
-github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
-github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
-github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
-github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
-github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
-github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
-github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
-github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
-github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
-github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
-github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
+github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=
+github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/gin-contrib/sse v1.1.1 h1:uGYpNwTacv5R68bSGMapo62iLTRa9l5zxGCps4hK6ko=
+github.com/gin-contrib/sse v1.1.1/go.mod h1:QXzuVkA0YO7o/gun03UI1Q+FTI8ZV/n5t03kIQAI89s=
+github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8=
+github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc=
 github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
 github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -90,40 +36,25 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
-github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
-github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
-github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
-github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8=
-github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
-github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
-github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
-github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
-github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-playground/validator/v10 v10.30.2 h1:JiFIMtSSHb2/XBUbWM4i/MpeQm9ZK2xqPNk8vgvu5JQ=
+github.com/go-playground/validator/v10 v10.30.2/go.mod h1:mAf2pIOVXjTEBrwUMGKkCWKKPs9NheYGabeB04txQSc=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
-github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
-github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
+github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
+github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -131,36 +62,24 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc=
 github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0=
-github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
-github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
-github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU=
-github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
+github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
+github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs=
+github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -168,330 +87,175 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
-github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
+github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/pelletier/go-toml/v2 v2.3.0 h1:k59bC/lIZREW0/iVaQR8nDHxVq8OVlIzYCOJf421CaM=
+github.com/pelletier/go-toml/v2 v2.3.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
+github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
-github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg=
-github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
-github.com/quic-go/quic-go v0.54.1 h1:4ZAWm0AhCb6+hE+l5Q1NAL0iRn/ZrMwqHRGQiFwj2eg=
-github.com/quic-go/quic-go v0.54.1/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
-github.com/quic-go/quic-go v0.55.0 h1:zccPQIqYCXDt5NmcEabyYvOnomjs8Tlwl7tISjJh9Mk=
-github.com/quic-go/quic-go v0.55.0/go.mod h1:DR51ilwU1uE164KuWXhinFcKWGlEjzys2l8zUl5Ss1U=
+github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
+github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic=
+github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/richardlehane/mscfb v1.0.6 h1:eN3bvvZCp00bs7Zf52bxNwAx5lJDBK1tCuH19qq5aC8=
+github.com/richardlehane/mscfb v1.0.6/go.mod h1:pe0+IUIc0AHh0+teNzBlJCtSyZdFOGgV4ZK9bsoV+Jo=
+github.com/richardlehane/msoleps v1.0.6 h1:9BvkpjvD+iUBalUY4esMwv6uBkfOip/Lzvd93jvR9gg=
+github.com/richardlehane/msoleps v1.0.6/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
-github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
-github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
+github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI=
+github.com/rs/zerolog v1.35.1/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
 github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44=
+github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
-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/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY=
+github.com/ugorji/go/codec v1.3.1/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=
-github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
+github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs=
+github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
+github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.10.1 h1:V62UlqopMqha3kOpnlHy2CcRVw1V8E63jFoWUmMzxN0=
+github.com/xuri/excelize/v2 v2.10.1/go.mod h1:iG5tARpgaEeIhTqt3/fgXCGoBRt4hNXgCp3tfXKoOIc=
+github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE=
+github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
-go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
-go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM=
-go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
-go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ=
-go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
-go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
-go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.mongodb.org/mongo-driver/v2 v2.5.1 h1:j2U/Qp+wvueSpqitLCSZPT/+ZpVc1xzuwdHWwl7d8ro=
+go.mongodb.org/mongo-driver/v2 v2.5.1/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
+go.mongodb.org/mongo-driver/v2 v2.6.0 h1:b9sJOYrkmt4l8bY43ZenFBcPlhYIjaOfYHLtbB/5qi8=
+go.mongodb.org/mongo-driver/v2 v2.6.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
 go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
 go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
-golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
-golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg=
-golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/arch v0.13.0 h1:KCkqVVV1kGg0X87TFysjCJ8MxtZEIU4Ja/yXGeoECdA=
-golang.org/x/arch v0.13.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4=
-golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
-golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
-golang.org/x/arch v0.16.0 h1:foMtLTdyOmIniqWCHjY6+JxuC54XP1fDwx4N0ASyW+U=
-golang.org/x/arch v0.16.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
-golang.org/x/arch v0.17.0 h1:4O3dfLzd+lQewptAHqjewQZQDyEdejz3VwgeYwkZneU=
-golang.org/x/arch v0.17.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
-golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/arch v0.19.0 h1:LmbDQUodHThXE+htjrnmVD73M//D9GTH6wFZjyDkjyU=
-golang.org/x/arch v0.19.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
-golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/arch v0.21.0 h1:iTC9o7+wP6cPWpDWkivCvQFGAHDQ59SrSxsLPcnkArw=
-golang.org/x/arch v0.21.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
+golang.org/x/arch v0.26.0 h1:jZ6dpec5haP/fUv1kLCbuJy6dnRrfX6iVK08lZBFpk4=
+golang.org/x/arch v0.26.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8=
+golang.org/x/arch v0.27.0 h1:0WNVcR8u9yFz8j5FvdHpgwNp3FS5U4guYdzHwEiGjoU=
+golang.org/x/arch v0.27.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
-golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
-golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
-golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
+golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
+golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
+golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
+golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
+golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
+golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
-golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g=
-golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
-golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
-golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
-golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
-golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
-golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
-golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
-golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
-golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
-golang.org/x/image v0.28.0 h1:gdem5JW1OLS4FbkWgLO+7ZeFzYtL3xClb97GaUzYMFE=
-golang.org/x/image v0.28.0/go.mod h1:GUJYXtnGKEUgggyzh+Vxt+AviiCcyiwpsl8iQ8MvwGY=
-golang.org/x/image v0.29.0 h1:HcdsyR4Gsuys/Axh0rDEmlBmB68rW1U9BUdB3UVHsas=
-golang.org/x/image v0.29.0/go.mod h1:RVJROnf3SLK8d26OW91j4FrIHGbsJ8QnbEocVTOWQDA=
-golang.org/x/image v0.30.0 h1:jD5RhkmVAnjqaCUXfbGBrn3lpxbknfN9w2UhHHU+5B4=
-golang.org/x/image v0.30.0/go.mod h1:SAEUTxCCMWSrJcCy/4HwavEsfZZJlYxeHLc6tTiAe/c=
-golang.org/x/image v0.31.0 h1:mLChjE2MV6g1S7oqbXC0/UcKijjm5fnJLUYKIYrLESA=
-golang.org/x/image v0.31.0/go.mod h1:R9ec5Lcp96v9FTF+ajwaH3uGxPH4fKfHHAVbUILxghA=
+golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww=
+golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA=
+golang.org/x/image v0.40.0 h1:Tw4GyDXMo+daZN1znreBRC3VayR1aLFUyUEOLUdW1a8=
+golang.org/x/image v0.40.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=
+golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo=
+golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
-golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
-golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
-golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
+golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
+golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
+golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
+golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
-golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
+golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
-golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
-golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
-golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
-golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
-golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
+golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
+golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
+golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
+golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
-golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
+golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
-google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
-google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
-google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
-google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/libc v1.37.6 h1:orZH3c5wmhIQFTXF+Nt+eeauyd+ZIt2BX6ARe+kD+aw=
-modernc.org/libc v1.37.6/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
-modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
-modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
+modernc.org/cc/v4 v4.27.3 h1:uNCgn37E5U09mTv1XgskEVUJ8ADKpmFMPxzGJ0TSo+U=
+modernc.org/cc/v4 v4.27.3/go.mod h1:3YjcbCqhoTTHPycJDRl2WZKKFj0nwcOIPBfEZK0Hdk8=
+modernc.org/ccgo/v4 v4.32.4 h1:L5OB8rpEX4ZsXEQwGozRfJyJSFHbbNVOoQ59DU9/KuU=
+modernc.org/ccgo/v4 v4.32.4/go.mod h1:lY7f+fiTDHfcv6YlRgSkxYfhs+UvOEEzj49jAn2TOx0=
+modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
+modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
+modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
+modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo=
+modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
+modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
+modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
+modernc.org/libc v1.72.0 h1:IEu559v9a0XWjw0DPoVKtXpO2qt5NVLAnFaBbjq+n8c=
+modernc.org/libc v1.72.0/go.mod h1:tTU8DL8A+XLVkEY3x5E/tO7s2Q/q42EtnNWda/L5QhQ=
+modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
+modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
+modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
+modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
+modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
+modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
+modernc.org/sqlite v1.49.1 h1:dYGHTKcX1sJ+EQDnUzvz4TJ5GbuvhNJa8Fg6ElGx73U=
+modernc.org/sqlite v1.49.1/go.mod h1:m0w8xhwYUVY3H6pSDwc3gkJ/irZT/0YEXwBlhaxQEew=
+modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
+modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
+modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
+modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.608"
+const GoextVersion = "0.0.644"
 
-const GoextVersionTimestamp = "2025-10-04T00:27:41+0200"
+const GoextVersionTimestamp = "2026-05-30T00:13:03+0200"

googleapi/README.md

@@ -1,4 +1,3 @@
-
 Google OAuth Setup (to send mails)
 ==================================
 
@@ -7,23 +6,23 @@ Google OAuth Setup (to send mails)
 
  - GMail API akivieren: https://console.cloud.google.com/apis/library/gmail.googleapis.com?
 
- - Create new Project (aka 'BackendMailAPI') @ https://console.cloud.google.com/projectcreate
-   User Type: Intern
-   Anwendungsname: 'BackendMailAPI'
-   Support-Email: ...
-   Authorisierte Domains: 'heydyno.de' (or project domain)
-   Kontakt-Email: ...
+ - Create new Project (aka 'BackendMailAPI') @ https://console.cloud.google.com/projectcreate  
+   User Type: Intern  
+   Anwendungsname: 'BackendMailAPI'  
+   Support-Email: ...  
+   Authorisierte Domains: 'heydyno.de' (or project domain)  
+   Kontakt-Email: ...  
    
 
- - Unter "Anmeldedaten" neuer OAuth Client erstellen @ https://console.cloud.google.com/apis/credentials
-   Anwendungstyp: Web
-   Name: 'BackendMailOAuth'
-   Redirect-Uri: 'http://localhost/oauth'
-   Client-ID und Client-Key merken
+ - Unter "API und Dienste" > "Anmeldedaten" neuer OAuth Client erstellen @ https://console.cloud.google.com/apis/credentials  
+   Anwendungstyp: Web  
+   Name: 'BackendMailOAuth'  
+   Redirect-Uri: 'http://localhost/oauth'  
+   Client-ID und Client-Key merken  
 
- - Open in Browser:
-   https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http://localhost/oauth&prompt=consent&response_type=code&client_id={...}&scope=https://www.googleapis.com/auth/gmail.send&access_type=offline
-   Code aus redirected URI merken
+ - Open in Browser:   
+   https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http://localhost/oauth&prompt=consent&response_type=code&client_id={...}&scope=https://www.googleapis.com/auth/gmail.send&access_type=offline  
+   Code aus redirected URI merken  
 
  - Code via request einlösen (und refresh_roken merken):
 

googleapi/attachment_test.go

@@ -0,0 +1,149 @@
+package googleapi
+
+import (
+	"encoding/base64"
+	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"strings"
+	"testing"
+)
+
+func TestAttachmentDumpNormalWithFilename(t *testing.T) {
+	a := MailAttachment{
+		IsInline:    false,
+		ContentType: "text/plain",
+		Filename:    "hello.txt",
+		Data:        []byte("HelloWorld"),
+	}
+
+	lines := a.dump()
+	joined := strings.Join(lines, "\n")
+
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: text/plain; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Transfer-Encoding: base64"))
+	tst.AssertTrue(t, strings.Contains(joined, `Content-Disposition: attachment;filename="hello.txt"`))
+	tst.AssertFalse(t, strings.Contains(joined, "Content-Disposition: inline"))
+
+	expectedB64 := base64.StdEncoding.EncodeToString([]byte("HelloWorld"))
+	tst.AssertTrue(t, strings.Contains(joined, expectedB64))
+}
+
+func TestAttachmentDumpInlineWithFilename(t *testing.T) {
+	a := MailAttachment{
+		IsInline:    true,
+		ContentType: "image/png",
+		Filename:    "img.png",
+		Data:        []byte{0x01, 0x02, 0x03, 0x04},
+	}
+
+	lines := a.dump()
+	joined := strings.Join(lines, "\n")
+
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: image/png; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Transfer-Encoding: base64"))
+	tst.AssertTrue(t, strings.Contains(joined, `Content-Disposition: inline;filename="img.png"`))
+}
+
+func TestAttachmentDumpNormalNoFilename(t *testing.T) {
+	a := MailAttachment{
+		IsInline:    false,
+		ContentType: "text/plain",
+		Filename:    "",
+		Data:        []byte("foo"),
+	}
+
+	lines := a.dump()
+	joined := strings.Join(lines, "\n")
+
+	tst.AssertTrue(t, langext.InArray("Content-Disposition: attachment", lines))
+	tst.AssertFalse(t, strings.Contains(joined, "filename="))
+}
+
+func TestAttachmentDumpInlineNoFilename(t *testing.T) {
+	a := MailAttachment{
+		IsInline:    true,
+		ContentType: "text/plain",
+		Filename:    "",
+		Data:        []byte("foo"),
+	}
+
+	lines := a.dump()
+
+	tst.AssertTrue(t, langext.InArray("Content-Disposition: inline", lines))
+}
+
+func TestAttachmentDumpNoContentType(t *testing.T) {
+	a := MailAttachment{
+		IsInline:    false,
+		ContentType: "",
+		Filename:    "x.bin",
+		Data:        []byte("x"),
+	}
+
+	lines := a.dump()
+
+	for _, l := range lines {
+		tst.AssertFalse(t, strings.HasPrefix(l, "Content-Type:"))
+	}
+	tst.AssertTrue(t, langext.InArray("Content-Transfer-Encoding: base64", lines))
+}
+
+func TestAttachmentDumpEmptyData(t *testing.T) {
+	a := MailAttachment{
+		IsInline:    false,
+		ContentType: "application/octet-stream",
+		Filename:    "empty.bin",
+		Data:        []byte{},
+	}
+
+	lines := a.dump()
+	joined := strings.Join(lines, "\n")
+
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: application/octet-stream; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Transfer-Encoding: base64"))
+}
+
+func TestAttachmentDumpLongDataLineWrapped(t *testing.T) {
+	// Data needs to result in > 80 base64 chars to test the wrapping.
+	// 100 bytes => 136 base64 chars => should wrap into 2 lines (80 + 56).
+	data := make([]byte, 100)
+	for i := range data {
+		data[i] = byte(i)
+	}
+
+	a := MailAttachment{
+		IsInline:    false,
+		ContentType: "application/octet-stream",
+		Filename:    "big.bin",
+		Data:        data,
+	}
+
+	lines := a.dump()
+
+	// Find the base64 lines (everything after the headers).
+	b64Lines := make([]string, 0)
+	foundFirstHeader := false
+	for _, l := range lines {
+		if !foundFirstHeader && (strings.HasPrefix(l, "Content-") || l == "") {
+			foundFirstHeader = true
+			continue
+		}
+		if strings.HasPrefix(l, "Content-") {
+			continue
+		}
+		b64Lines = append(b64Lines, l)
+	}
+
+	full := strings.Join(b64Lines, "")
+	expected := base64.StdEncoding.EncodeToString(data)
+	tst.AssertEqual(t, full, expected)
+
+	// Each line (except possibly last) should be 80 chars.
+	for i, l := range b64Lines {
+		if i < len(b64Lines)-1 {
+			tst.AssertEqual(t, len(l), 80)
+		} else {
+			tst.AssertTrue(t, len(l) <= 80)
+		}
+	}
+}

googleapi/mimeMessage.go

@@ -8,7 +8,7 @@ import (
 )
 
 // https://datatracker.ietf.org/doc/html/rfc2822
-func encodeMimeMail(from string, recipients []string, cc []string, bcc []string, subject string, body MailBody, attachments []MailAttachment) string {
+func encodeMimeMail(from string, recipients []string, cc []string, bcc []string, replyTo []string, subject string, body MailBody, attachments []MailAttachment) string {
 
 	data := make([]string, 0, 32)
 
@@ -22,6 +22,9 @@ func encodeMimeMail(from string, recipients []string, cc []string, bcc []string,
 	if len(bcc) > 0 {
 		data = append(data, "Bcc: "+strings.Join(langext.ArrMap(bcc, func(v string) string { return mime.QEncoding.Encode("UTF-8", v) }), ", "))
 	}
+	if len(replyTo) > 0 {
+		data = append(data, "Reply-To: "+strings.Join(langext.ArrMap(replyTo, func(v string) string { return mime.QEncoding.Encode("UTF-8", v) }), ", "))
+	}
 	data = append(data, "Subject: "+mime.QEncoding.Encode("UTF-8", subject))
 
 	hasInlineAttachments := langext.ArrAny(attachments, func(v MailAttachment) bool { return v.IsInline })

googleapi/mimeMessage_assert_test.go

@@ -0,0 +1,259 @@
+package googleapi
+
+import (
+	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"strings"
+	"testing"
+)
+
+func TestMimeMailPlainOnly(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"Test Subject",
+		MailBody{Plain: "Hello plain body"},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "From: from@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "To: to@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "Subject: Test Subject"))
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: text/plain; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Transfer-Encoding: 7bit"))
+	tst.AssertTrue(t, strings.Contains(mail, "Hello plain body"))
+	tst.AssertTrue(t, strings.Contains(mail, "MIME-Version: 1.0"))
+
+	// Each line must be terminated by CRLF.
+	tst.AssertTrue(t, strings.Contains(mail, "\r\n"))
+}
+
+func TestMimeMailHTMLOnly(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{HTML: "<p>Hi</p>"},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: text/html; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(mail, "<p>Hi</p>"))
+	tst.AssertFalse(t, strings.Contains(mail, "multipart/"))
+}
+
+func TestMimeMailAlternative(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{
+			Plain: "Plain Body",
+			HTML:  "<p>HTML Body</p>",
+		},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: multipart/alternative;"))
+	tst.AssertTrue(t, strings.Contains(mail, "Plain Body"))
+	tst.AssertTrue(t, strings.Contains(mail, "<p>HTML Body</p>"))
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: text/plain; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: text/html; charset=UTF-8"))
+}
+
+func TestMimeMailWithCC(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		[]string{"cc@example.com"},
+		nil, nil,
+		"S",
+		MailBody{Plain: "x"},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "cc@example.com"))
+}
+
+func TestMimeMailWithBCC(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil,
+		[]string{"bcc@example.com"},
+		nil,
+		"S",
+		MailBody{Plain: "x"},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "Bcc: bcc@example.com"))
+}
+
+func TestMimeMailWithReplyTo(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil,
+		[]string{"reply@example.com"},
+		"S",
+		MailBody{Plain: "x"},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "Reply-To: reply@example.com"))
+}
+
+func TestMimeMailMultipleRecipients(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"a@example.com", "b@example.com", "c@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{Plain: "x"},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "a@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "b@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "c@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "a@example.com, b@example.com, c@example.com"))
+}
+
+func TestMimeMailSubjectEncoding(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"Hällö Wörld",
+		MailBody{Plain: "x"},
+		nil)
+
+	// Non-ASCII subject must be quoted-printable encoded.
+	tst.AssertTrue(t, strings.Contains(mail, "Subject: =?UTF-8?q?"))
+}
+
+func TestMimeMailWithNormalAttachment(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{Plain: "Body"},
+		[]MailAttachment{
+			{Data: []byte("attached"), Filename: "f.txt", IsInline: false, ContentType: "text/plain"},
+		})
+
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: multipart/mixed;"))
+	tst.AssertTrue(t, strings.Contains(mail, `Content-Disposition: attachment;filename="f.txt"`))
+}
+
+func TestMimeMailWithInlineAttachment(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{HTML: "<p>x</p>"},
+		[]MailAttachment{
+			{Data: []byte{1, 2, 3}, Filename: "img.png", IsInline: true, ContentType: "image/png"},
+		})
+
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: multipart/related;"))
+	tst.AssertTrue(t, strings.Contains(mail, `Content-Disposition: inline;filename="img.png"`))
+}
+
+func TestMimeMailWithBothAttachmentTypes(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{HTML: "<p>x</p>"},
+		[]MailAttachment{
+			{Data: []byte{1}, Filename: "img.png", IsInline: true, ContentType: "image/png"},
+			{Data: []byte{2}, Filename: "f.txt", IsInline: false, ContentType: "text/plain"},
+		})
+
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: multipart/mixed;"))
+	tst.AssertTrue(t, strings.Contains(mail, "Content-Type: multipart/related;"))
+	tst.AssertTrue(t, strings.Contains(mail, `Content-Disposition: inline;filename="img.png"`))
+	tst.AssertTrue(t, strings.Contains(mail, `Content-Disposition: attachment;filename="f.txt"`))
+}
+
+func TestMimeMailEmptyBody(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{},
+		nil)
+
+	tst.AssertTrue(t, strings.Contains(mail, "From: from@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "To: to@example.com"))
+	tst.AssertTrue(t, strings.Contains(mail, "Subject: S"))
+	// No body type was set, so no Content-Type for body should be present.
+	tst.AssertFalse(t, strings.Contains(mail, "Content-Type: text/"))
+	tst.AssertFalse(t, strings.Contains(mail, "Content-Type: multipart/"))
+}
+
+func TestMimeMailHasDateHeader(t *testing.T) {
+	mail := encodeMimeMail(
+		"from@example.com",
+		[]string{"to@example.com"},
+		nil, nil, nil,
+		"S",
+		MailBody{Plain: "x"},
+		nil)
+
+	tst.AssertTrue(t, strings.HasPrefix(mail, "Date: "))
+}
+
+func TestDumpMailBodyPlainOnly(t *testing.T) {
+	lines := dumpMailBody(MailBody{Plain: "Plain"}, false, false, "BOUND", "BOUNDALT")
+	joined := strings.Join(lines, "\n")
+	tst.AssertTrue(t, strings.Contains(joined, "--BOUND"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: text/plain; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "Plain"))
+}
+
+func TestDumpMailBodyHTMLOnly(t *testing.T) {
+	lines := dumpMailBody(MailBody{HTML: "<p>x</p>"}, false, false, "BOUND", "BOUNDALT")
+	joined := strings.Join(lines, "\n")
+	tst.AssertTrue(t, strings.Contains(joined, "--BOUND"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: text/html; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "<p>x</p>"))
+}
+
+func TestDumpMailBodyEmpty(t *testing.T) {
+	lines := dumpMailBody(MailBody{}, false, false, "BOUND", "BOUNDALT")
+	joined := strings.Join(lines, "\n")
+	// Default empty case still emits the boundary and a default Content-Type header.
+	tst.AssertTrue(t, strings.Contains(joined, "--BOUND"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: text/plain; charset=UTF-8"))
+}
+
+func TestDumpMailBodyMixedAlternative(t *testing.T) {
+	// HTML+Plain with normal attachments and no inline → uses alternative sub-block.
+	lines := dumpMailBody(MailBody{Plain: "P", HTML: "<p>H</p>"}, false, true, "BOUND", "BOUNDALT")
+	joined := strings.Join(lines, "\n")
+	tst.AssertTrue(t, strings.Contains(joined, "--BOUND"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: multipart/alternative; boundary=BOUNDALT"))
+	tst.AssertTrue(t, strings.Contains(joined, "--BOUNDALT"))
+	tst.AssertTrue(t, strings.Contains(joined, "P"))
+	tst.AssertTrue(t, strings.Contains(joined, "<p>H</p>"))
+}
+
+func TestDumpMailBodyMixedInline(t *testing.T) {
+	// HTML+Plain with inline attachments → simplified to single HTML block.
+	lines := dumpMailBody(MailBody{Plain: "P", HTML: "<p>H</p>"}, true, false, "BOUND", "BOUNDALT")
+	tst.AssertEqual(t, len(lines), 2)
+	tst.AssertEqual(t, lines[0], "--BOUND")
+	tst.AssertEqual(t, lines[1], "<p>H</p>")
+}
+
+func TestDumpMailBodyBothNoAttachments(t *testing.T) {
+	lines := dumpMailBody(MailBody{Plain: "P", HTML: "<p>H</p>"}, false, false, "BOUND", "BOUNDALT")
+	joined := strings.Join(lines, "\n")
+	tst.AssertTrue(t, strings.Contains(joined, "--BOUND"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: text/plain; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "Content-Type: text/html; charset=UTF-8"))
+	tst.AssertTrue(t, strings.Contains(joined, "P"))
+	tst.AssertTrue(t, strings.Contains(joined, "<p>H</p>"))
+}