v0.0.512

bfcodegen/enum-generate.go

@@ -46,7 +46,7 @@ var rexEnumPackage = rext.W(regexp.MustCompile(`^package\s+(?P<name>[A-Za-z0-9_]
 
 var rexEnumDef = rext.W(regexp.MustCompile(`^\s*type\s+(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*//\s*(@enum:type).*$`))
 
-var rexEnumValueDef = rext.W(regexp.MustCompile(`^\s*(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*=\s*(?P<value>("[A-Za-z0-9_:\s\-.]+"|[0-9]+))\s*(//(?P<comm>.*))?.*$`))
+var rexEnumValueDef = rext.W(regexp.MustCompile(`^\s*(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*=\s*(?P<value>("[A-Za-z0-9_:\s\-.]*"|[0-9]+))\s*(//(?P<comm>.*))?.*$`))
 
 var rexEnumChecksumConst = rext.W(regexp.MustCompile(`const ChecksumEnumGenerator = "(?P<cs>[A-Za-z0-9_]*)"`))
 

exerr/constructor.go

@@ -12,6 +12,8 @@ import (
 var reflectTypeStr = reflect.TypeOf("")
 
 func FromError(err error) *ExErr {
+
+	//goland:noinspection GoTypeAssertionOnErrors
 	if verr, ok := err.(*ExErr); ok {
 		// A simple ExErr
 		return verr

exerr/helper.go

@@ -86,3 +86,28 @@ func MessageMatch(e error, matcher func(string) bool) bool {
 
 	return false
 }
+
+// OriginalError returns the lowest level error, probably the original/external error that was originally wrapped
+func OriginalError(e error) error {
+	if e == nil {
+		return nil
+	}
+
+	//goland:noinspection GoTypeAssertionOnErrors
+	bmerr, ok := e.(*ExErr)
+	for !ok {
+		return e
+	}
+
+	for bmerr.OriginalError != nil {
+		bmerr = bmerr.OriginalError
+	}
+
+	if bmerr.WrappedErr != nil {
+		if werr, ok := bmerr.WrappedErr.(error); ok {
+			return werr
+		}
+	}
+
+	return bmerr
+}

ginext/responseJson.go

@@ -7,10 +7,11 @@ import (
 )
 
 type jsonHTTPResponse struct {
-	statusCode int
-	data       any
-	headers    []headerval
-	cookies    []cookieval
+	statusCode     int
+	data           any
+	headers        []headerval
+	cookies        []cookieval
+	filterOverride *string
 }
 
 func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
@@ -18,6 +19,9 @@ func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
 	if jsonfilter := g.GetString(jsonFilterKey); jsonfilter != "" {
 		f = &jsonfilter
 	}
+	if j.filterOverride != nil {
+		f = j.filterOverride
+	}
 	return json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true, Filter: f}
 }
 
@@ -68,3 +72,7 @@ func (j jsonHTTPResponse) Headers() []string {
 func JSON(sc int, data any) HTTPResponse {
 	return &jsonHTTPResponse{statusCode: sc, data: data}
 }
+
+func JSONWithFilter(sc int, data any, f string) HTTPResponse {
+	return &jsonHTTPResponse{statusCode: sc, data: data, filterOverride: &f}
+}

go.mod

@@ -6,12 +6,12 @@ require (
 	github.com/gin-gonic/gin v1.10.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.5.0
+	github.com/rs/xid v1.6.0
 	github.com/rs/zerolog v1.33.0
-	go.mongodb.org/mongo-driver v1.16.0
-	golang.org/x/crypto v0.26.0
-	golang.org/x/sys v0.23.0
-	golang.org/x/term v0.23.0
+	go.mongodb.org/mongo-driver v1.16.1
+	golang.org/x/crypto v0.27.0
+	golang.org/x/sys v0.25.0
+	golang.org/x/term v0.24.0
 )
 
 require (
@@ -21,7 +21,7 @@ require (
 )
 
 require (
-	github.com/bytedance/sonic v1.12.1 // indirect
+	github.com/bytedance/sonic v1.12.2 // indirect
 	github.com/bytedance/sonic/loader v0.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
@@ -32,7 +32,7 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // 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.22.0 // indirect
+	github.com/go-playground/validator/v10 v10.22.1 // indirect
 	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.5.0 // indirect
@@ -45,7 +45,7 @@ require (
 	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.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
@@ -53,10 +53,10 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	golang.org/x/arch v0.9.0 // indirect
-	golang.org/x/image v0.19.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/arch v0.10.0 // indirect
+	golang.org/x/image v0.20.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.37.6 // indirect

go.sum

@@ -28,6 +28,8 @@ github.com/bytedance/sonic v1.12.0 h1:YGPgxF9xzaCNvd/ZKdQ28yRovhfMFZQjuk6fKBzZ3l
 github.com/bytedance/sonic v1.12.0/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic v1.12.1 h1:jWl5Qz1fy7X1ioY74WqO0KjAMtAGQs4sYnjiEBiyX24=
 github.com/bytedance/sonic v1.12.1/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
+github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg=
+github.com/bytedance/sonic v1.12.2/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -93,6 +95,8 @@ github.com/go-playground/validator/v10 v10.21.0 h1:4fZA11ovvtkdgaeev9RGWPgc1uj3H
 github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
 github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+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-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
@@ -175,6 +179,8 @@ github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtos
 github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+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/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=
@@ -184,6 +190,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+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.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
 github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
@@ -234,6 +242,8 @@ go.mongodb.org/mongo-driver v1.15.1 h1:l+RvoUOoMXFmADTLfYDm7On9dRm7p4T80/lEQM+r7
 go.mongodb.org/mongo-driver v1.15.1/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4=
 go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
+go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
+go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
 golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
@@ -241,6 +251,8 @@ golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
 golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/arch v0.9.0 h1:ub9TgUInamJ8mrZIGlBG6/4TqWeMszd4N8lNorbrr6k=
 golang.org/x/arch v0.9.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8=
+golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -265,6 +277,8 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -276,6 +290,8 @@ golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
 golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
 golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
 golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys=
+golang.org/x/image v0.20.0 h1:7cVCUjQwfL18gyBJOmYvptfSHS8Fb3YUDtfLIZ7Nbpw=
+golang.org/x/image v0.20.0/go.mod h1:0a88To4CYVBAHp5FXJm8o7QbUl37Vd85ply1vyD8auM=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -300,6 +316,8 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 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.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
@@ -335,6 +353,10 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
@@ -353,6 +375,8 @@ golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
 golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
 golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
 golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -367,6 +391,8 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 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=

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.495"
+const GoextVersion = "0.0.512"
 
-const GoextVersionTimestamp = "2024-08-07T14:00:02+0200"
+const GoextVersionTimestamp = "2024-09-15T21:25:21+0200"

gojson/encode.go

@@ -788,7 +788,7 @@ FieldLoop:
 
 		if f.omitEmpty && isEmptyValue(fv) {
 			continue
-		} else if opts.filter != nil && !matchesJSONFilter(f.jsonfilter, *opts.filter) {
+		} else if !matchesJSONFilter(f.jsonfilter, opts.filter) {
 			continue
 		}
 		e.WriteByte(next)
@@ -808,16 +808,20 @@ FieldLoop:
 	}
 }
 
-func matchesJSONFilter(filter jsonfilter, value string) bool {
+func matchesJSONFilter(filter jsonfilter, value *string) bool {
 	if len(filter) == 0 {
-		return true
+		return true // no filter in struct
+	}
+
+	if value == nil || *value == "" {
+		return false // no filter set, but struct has filter, return false
 	}
 
 	if len(filter) == 1 && filter[0] == "-" {
 		return false
 	}
 
-	if filter.Contains(value) {
+	if filter.Contains(*value) {
 		return true
 	}
 
@@ -1353,7 +1357,7 @@ func typeFields(t reflect.Type, tagkey string) structFields {
 
 				var jsonfilter []string
 				jsonfilterTag := sf.Tag.Get("jsonfilter")
-				if jsonfilterTag != "" && jsonfilterTag != "-" {
+				if jsonfilterTag != "" {
 					jsonfilter = strings.Split(jsonfilterTag, ",")
 				}
 

langext/array.go

@@ -323,6 +323,16 @@ func ArrMap[T1 any, T2 any](arr []T1, conv func(v T1) T2) []T2 {
 	return r
 }
 
+func ArrDeRef[T1 any](arr []*T1) []T1 {
+	r := make([]T1, 0, len(arr))
+	for _, v := range arr {
+		if v != nil {
+			r = append(r, *v)
+		}
+	}
+	return r
+}
+
 func MapMap[TK comparable, TV any, TR any](inmap map[TK]TV, conv func(k TK, v TV) TR) []TR {
 	r := make([]TR, 0, len(inmap))
 	for k, v := range inmap {

langext/io.go

@@ -0,0 +1,15 @@
+package langext
+
+import "io"
+
+type nopCloser struct {
+	io.Writer
+}
+
+func (n nopCloser) Close() error {
+	return nil // no op
+}
+
+func WriteNopCloser(w io.Writer) io.WriteCloser {
+	return nopCloser{w}
+}

timeext/diff.go

@@ -2,6 +2,9 @@ package timeext
 
 import "time"
 
+// YearDifference calculates the difference between two timestamps in years.
+// = t1 - t2
+// returns a float value
 func YearDifference(t1 time.Time, t2 time.Time, tz *time.Location) float64 {
 
 	yDelta := float64(t1.Year() - t2.Year())
@@ -11,3 +14,31 @@ func YearDifference(t1 time.Time, t2 time.Time, tz *time.Location) float64 {
 
 	return yDelta + (processT1 - processT2)
 }
+
+// MonthDifference calculates the difference between two timestamps in months.
+// = t1 - t2
+// returns a float value
+func MonthDifference(t1 time.Time, t2 time.Time) float64 {
+
+	yDelta := float64(t1.Year() - t2.Year())
+	mDelta := float64(t1.Month() - t2.Month())
+
+	dDelta := float64(0)
+
+	t1MonthDays := DaysInMonth(t1)
+	t2MonthDays := DaysInMonth(t2)
+
+	if t2.Year() > t1.Year() || (t2.Year() == t1.Year() && t2.Month() > t1.Month()) {
+		dDelta -= 1
+		dDelta += float64(t1MonthDays-t1.Day()) / float64(t1MonthDays)
+		dDelta += float64(t2.Day()) / float64(t2MonthDays)
+	} else if t2.Year() < t1.Year() || (t2.Year() == t1.Year() && t2.Month() < t1.Month()) {
+		dDelta -= 1
+		dDelta += float64(t1.Day()) / float64(t1MonthDays)
+		dDelta += float64(t2MonthDays-t2.Day()) / float64(t2MonthDays)
+	} else {
+		dDelta += float64(t1.Day()-t2.Day()) / float64(t1MonthDays)
+	}
+
+	return yDelta*12 + mDelta + dDelta
+}

timeext/diff_test.go

@@ -81,3 +81,63 @@ func epsilonEquals(a, b float64) bool {
 	epsilon := 0.01
 	return math.Abs(a-b) < epsilon
 }
+
+func TestMonthDifferenceSameDate(t *testing.T) {
+	t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
+	expected := 0.0
+	result := MonthDifference(t2, t1)
+	if !epsilonEquals(result, expected) {
+		t.Errorf("Expected %v, got %v", expected, result)
+	}
+}
+
+func TestMonthDifferenceSameMonth(t *testing.T) {
+	t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2022, 1, 31, 0, 0, 0, 0, time.UTC)
+	expected := 0.967741935483871 // Approximation of 30/31 days
+	result := MonthDifference(t2, t1)
+	if !epsilonEquals(result, expected) {
+		t.Errorf("Expected %v, got %v", expected, result)
+	}
+}
+
+func TestMonthDifferenceDifferentMonthsSameYear(t *testing.T) {
+	t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2022, 3, 1, 0, 0, 0, 0, time.UTC)
+	expected := 2.0
+	result := MonthDifference(t2, t1)
+	if !epsilonEquals(result, expected) {
+		t.Errorf("Expected %v, got %v", expected, result)
+	}
+}
+
+func TestMonthDifferenceDifferentYears(t *testing.T) {
+	t1 := time.Date(2021, 12, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2022, 2, 1, 0, 0, 0, 0, time.UTC)
+	expected := 2.0
+	result := MonthDifference(t2, t1)
+	if !epsilonEquals(result, expected) {
+		t.Errorf("Expected %v, got %v", expected, result)
+	}
+}
+
+func TestMonthDifferenceT1BeforeT2(t *testing.T) {
+	t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2022, 6, 1, 0, 0, 0, 0, time.UTC)
+	expected := 5.0
+	result := MonthDifference(t2, t1)
+	if !epsilonEquals(result, expected) {
+		t.Errorf("Expected %v, got %v", expected, result)
+	}
+}
+
+func TestMonthDifferenceT1AfterT2(t *testing.T) {
+	t1 := time.Date(2022, 6, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
+	expected := -5.0
+	result := MonthDifference(t2, t1)
+	if !epsilonEquals(result, expected) {
+		t.Errorf("Expected %v, got %v", expected, result)
+	}
+}

timeext/time.go

@@ -184,3 +184,10 @@ func AddYears(t time.Time, yearCount float64, tz *time.Location) time.Time {
 
 	return t.Add(time.Duration(float64(t1.Sub(t0)) * floatCount))
 }
+
+func DaysInMonth(t time.Time) int {
+	// https://stackoverflow.com/a/73882035/1761622
+
+	y, m, _ := t.Date()
+	return time.Date(y, m+1, 0, 0, 0, 0, 0, time.UTC).Day()
+}

timeext/time_test.go

@@ -191,3 +191,39 @@ func TestCombineDateAndTime_CombineDifferentParts(t *testing.T) {
 		t.Errorf("Expected %v, got %v", expected, result)
 	}
 }
+
+func TestDaysInMonth_31Days(t *testing.T) {
+	date := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC) // January
+	expected := 31
+	result := DaysInMonth(date)
+	if result != expected {
+		t.Errorf("Expected %d but got %d", expected, result)
+	}
+}
+
+func TestDaysInMonth_30Days(t *testing.T) {
+	date := time.Date(2022, 4, 1, 0, 0, 0, 0, time.UTC) // April
+	expected := 30
+	result := DaysInMonth(date)
+	if result != expected {
+		t.Errorf("Expected %d but got %d", expected, result)
+	}
+}
+
+func TestDaysInMonth_FebruaryLeapYear(t *testing.T) {
+	date := time.Date(2020, 2, 1, 0, 0, 0, 0, time.UTC) // February in a leap year
+	expected := 29
+	result := DaysInMonth(date)
+	if result != expected {
+		t.Errorf("Expected %d but got %d", expected, result)
+	}
+}
+
+func TestDaysInMonth_FebruaryNonLeapYear(t *testing.T) {
+	date := time.Date(2021, 2, 1, 0, 0, 0, 0, time.UTC) // February in a non-leap year
+	expected := 28
+	result := DaysInMonth(date)
+	if result != expected {
+		t.Errorf("Expected %d but got %d", expected, result)
+	}
+}

wmo/queryFindOne.go

@@ -12,7 +12,11 @@ import (
 func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) {
 	r, err := c.findOneInternal(ctx, filter, false)
 	if err != nil {
-		return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed").Str("collection", c.Name()).Build()
+		if filterId, ok := filter["_id"]; ok {
+			return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed").Str("collection", c.Name()).Any("filter", filter).Any("filter_id", filterId).Build()
+		} else {
+			return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed").Str("collection", c.Name()).Any("filter", filter).Build()
+		}
 	}
 
 	return *r, nil
@@ -21,7 +25,7 @@ func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error)
 func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, error) {
 	r, err := c.findOneInternal(ctx, filter, true)
 	if err != nil {
-		return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Str("collection", c.Name()).Build()
+		return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Str("collection", c.Name()).Any("filter", filter).Build()
 	}
 
 	return r, nil
@@ -58,7 +62,11 @@ func (c *Coll[TData]) findOneInternal(ctx context.Context, filter bson.M, allowN
 			return nil, nil
 		}
 		if err != nil {
-			return nil, exerr.Wrap(err, "mongo-query[find-one] failed").Any("filter", filter).Str("collection", c.Name()).NoLog().Build()
+			if filterId, ok := filter["_id"]; ok {
+				return nil, exerr.Wrap(err, "mongo-query[find-one|internal] failed").Str("collection", c.Name()).Any("filter", filter).Any("filter_id", filterId).NoLog().Build()
+			} else {
+				return nil, exerr.Wrap(err, "mongo-query[find-one|internal] failed").Str("collection", c.Name()).Any("filter", filter).NoLog().Build()
+			}
 		}
 
 		return &res, nil

wpdf/.gitignore

@@ -0,0 +1 @@
+wpdf_test.pdf

wpdf/wpdf.go

@@ -14,6 +14,7 @@ type WPDFBuilder struct {
 	fontName    PDFFontFamily
 	fontStyle   PDFFontStyle
 	fontSize    float64
+	debug       bool
 }
 
 type PDFMargins struct {
@@ -62,6 +63,19 @@ func (b *WPDFBuilder) SetMargins(v PDFMargins) {
 
 func (b *WPDFBuilder) AddPage() {
 	b.b.AddPage()
+
+	if b.debug {
+
+		ml, mt, mr, mb := b.GetMargins()
+		pw, ph := b.GetPageSize()
+
+		b.Rect(pw-ml-mr, ph-mt-mb, RectOutline, NewPDFRectOpt().X(ml).Y(mt).LineWidth(0.25).DrawColor(0, 0, 128))
+
+		b.Rect(pw, mt, RectFill, NewPDFRectOpt().X(0).Y(0).FillColor(0, 0, 255).Alpha(0.2, BlendNormal))
+		b.Rect(ml, ph-mt-mb, RectFill, NewPDFRectOpt().X(0).Y(mt).FillColor(0, 0, 255).Alpha(0.2, BlendNormal))
+		b.Rect(mr, ph-mt-mb, RectFill, NewPDFRectOpt().X(pw-mr).Y(mt).FillColor(0, 0, 255).Alpha(0.2, BlendNormal))
+		b.Rect(pw, mb, RectFill, NewPDFRectOpt().X(0).Y(ph-mb).FillColor(0, 0, 255).Alpha(0.2, BlendNormal))
+	}
 }
 
 func (b *WPDFBuilder) SetTextColor(cr, cg, cb int) {
@@ -123,7 +137,21 @@ func (b *WPDFBuilder) SetCellSpacing(h float64) {
 }
 
 func (b *WPDFBuilder) Ln(h float64) {
+	xBefore, yBefore := b.GetXY()
+
 	b.b.Ln(h)
+
+	yAfter := b.GetY()
+
+	if b.debug {
+
+		_, _, mr, _ := b.GetMargins()
+		pw, _ := b.GetPageSize()
+
+		b.Rect(pw-mr-xBefore, yAfter-yBefore, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(128, 128, 0).Alpha(0.5, BlendNormal))
+		b.Rect(pw-mr-xBefore, yAfter-yBefore, RectFill, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).FillColor(128, 128, 0).Alpha(0.1, BlendNormal))
+		b.Line(xBefore, yBefore, pw-mr, yAfter, NewPDFLineOpt().LineWidth(0.25).DrawColor(128, 128, 0))
+	}
 }
 
 func (b *WPDFBuilder) Build() ([]byte, error) {
@@ -217,6 +245,10 @@ func (b *WPDFBuilder) PageNo() int {
 	return b.b.PageNo()
 }
 
+func (b *WPDFBuilder) Bookmark(txtStr string, level int, y float64) {
+	b.b.Bookmark(b.tr(txtStr), level, y)
+}
+
 func (b *WPDFBuilder) GetStringWidth(str string, opts ...PDFCellOpt) float64 {
 
 	var fontNameOverride *PDFFontFamily
@@ -242,3 +274,7 @@ func (b *WPDFBuilder) GetStringWidth(str string, opts ...PDFCellOpt) float64 {
 
 	return b.b.GetStringWidth(str)
 }
+
+func (b *WPDFBuilder) Debug(v bool) {
+	b.debug = v
+}

wpdf/wpdfCell.go

@@ -25,6 +25,7 @@ type PDFCellOpt struct {
 	borderColor       *PDFColor
 	fillColor         *PDFColor
 	autoWidthPaddingX *float64
+	debug             *bool
 }
 
 func NewPDFCellOpt() *PDFCellOpt {
@@ -158,6 +159,11 @@ func (opt *PDFCellOpt) Alpha(alpha float64, blendMode PDFBlendMode) *PDFCellOpt
 	return opt
 }
 
+func (opt *PDFCellOpt) Debug(v bool) *PDFCellOpt {
+	opt.debug = &v
+	return opt
+}
+
 func (opt *PDFCellOpt) Copy() *PDFCellOpt {
 	c := *opt
 	return &c
@@ -186,7 +192,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 	txtTR := b.tr(txt)
 
 	width := float64(0)
-	height := b.cellHeight + b.cellSpacing
+	var height *float64 = nil
 	border := BorderNone
 	ln := BreakToNextLine
 	align := AlignLeft
@@ -204,10 +210,11 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 	var borderColor *PDFColor
 	var fillColor *PDFColor
 	autoWidthPaddingX := float64(0)
+	debug := b.debug
 
 	for _, opt := range opts {
 		width = langext.Coalesce(opt.width, width)
-		height = langext.Coalesce(opt.height, height)
+		height = langext.CoalesceOpt(opt.height, height)
 		border = langext.Coalesce(opt.border, border)
 		ln = langext.Coalesce(opt.ln, ln)
 		align = langext.Coalesce(opt.align, align)
@@ -225,6 +232,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 		borderColor = langext.CoalesceOpt(opt.borderColor, borderColor)
 		fillColor = langext.CoalesceOpt(opt.fillColor, fillColor)
 		autoWidthPaddingX = langext.Coalesce(opt.autoWidthPaddingX, autoWidthPaddingX)
+		debug = langext.Coalesce(opt.debug, debug)
 	}
 
 	if fontNameOverride != nil || fontStyleOverride != nil || fontSizeOverride != nil {
@@ -238,6 +246,11 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 		defer func() { b.SetFont(oldFontName, oldFontStyle, oldFontSize) }()
 	}
 
+	if height == nil {
+		// (do after SetFont, so that b.cellHeight is correctly set to fontOverride)
+		height = langext.Ptr(b.cellHeight + b.cellSpacing)
+	}
+
 	if textColor != nil {
 		oldColorR, oldColorG, oldColorB := b.b.GetTextColor()
 		b.SetTextColor(textColor.R, textColor.G, textColor.B)
@@ -267,10 +280,22 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
 	}
 
 	if autoWidth {
-		width = b.b.GetStringWidth(txtTR) + autoWidthPaddingX
+		width = b.GetStringWidth(txtTR, langext.ArrDeRef(opts)...) + autoWidthPaddingX
 	}
 
-	b.b.CellFormat(width, height, txtTR, string(border), int(ln), string(align), fill, link, linkStr)
+	xBefore, yBefore := b.b.GetXY()
+
+	b.b.CellFormat(width, *height, txtTR, string(border), int(ln), string(align), fill, link, linkStr)
+
+	if debug {
+		if ln == BreakToNextLine {
+			b.Rect(b.GetPageWidth()-xBefore-b.GetMarginRight(), *height, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
+		} else if ln == BreakToRight {
+			b.Rect(b.GetX()-xBefore, *height, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
+		} else if ln == BreakToBelow {
+			b.Rect(b.GetPageWidth()-xBefore-b.GetMarginRight(), *height, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
+		}
+	}
 
 	if extraLn != 0 {
 		b.b.Ln(extraLn)

wpdf/wpdfImage.go

@@ -247,7 +247,7 @@ func (b *WPDFBuilder) Image(img *PDFImageRef, opts ...*PDFImageOpt) {
 	var imageFit *imageext.ImageFit = nil
 	var fillColor color.Color = color.Transparent
 	compression := imageext.CompressionPNGSpeed
-	debug := false
+	debug := b.debug
 	var crop *imageext.ImageCrop = nil
 	var alphaOverride *dataext.Tuple[float64, PDFBlendMode]
 
@@ -271,6 +271,10 @@ func (b *WPDFBuilder) Image(img *PDFImageRef, opts ...*PDFImageOpt) {
 		alphaOverride = langext.CoalesceOpt(opt.alphaOverride, alphaOverride)
 	}
 
+	if flow {
+		y = b.GetY()
+	}
+
 	regName := img.Name
 
 	var subImageBounds *imageext.PercentageRectangle = nil
@@ -355,13 +359,14 @@ func (b *WPDFBuilder) Image(img *PDFImageRef, opts ...*PDFImageOpt) {
 	b.b.ImageOptions(regName, x, y, w, h, flow, fpdfOpt, link, linkStr)
 
 	if debug {
-		b.Rect(w, h, RectOutline, NewPDFRectOpt().X(x).Y(y).LineWidth(2).DrawColor(255, 0, 0))
+		b.Rect(w, h, RectOutline, NewPDFRectOpt().X(x).Y(y).LineWidth(0.25).DrawColor(255, 0, 0))
 
 		if subImageBounds != nil {
 			r := subImageBounds.Of(imageext.Rectangle{X: x, Y: y, W: w, H: h})
+			b.Rect(r.W, r.H, RectOutline, NewPDFRectOpt().X(r.X).Y(r.Y).LineWidth(0.25).DrawColor(255, 0, 0))
 			b.Rect(r.W, r.H, RectFill, NewPDFRectOpt().X(r.X).Y(r.Y).FillColor(255, 0, 0).Alpha(0.2, BlendNormal))
-			b.Line(r.X, r.Y, r.X+r.W, r.Y+r.H, NewPDFLineOpt().LineWidth(2).DrawColor(255, 0, 0))
-			b.Line(r.X+r.W, r.Y, r.X, r.Y+r.H, NewPDFLineOpt().LineWidth(2).DrawColor(255, 0, 0))
+			b.Line(r.X, r.Y, r.X+r.W, r.Y+r.H, NewPDFLineOpt().LineWidth(0.25).DrawColor(255, 0, 0))
+			b.Line(r.X+r.W, r.Y, r.X, r.Y+r.H, NewPDFLineOpt().LineWidth(0.25).DrawColor(255, 0, 0))
 		}
 	}
 }

wpdf/wpdfLine.go

@@ -10,6 +10,7 @@ type PDFLineOpt struct {
 	drawColor *PDFColor
 	alpha     *dataext.Tuple[float64, PDFBlendMode]
 	capStyle  *PDFLineCapStyle
+	debug     *bool
 }
 
 func NewPDFLineOpt() *PDFLineOpt {
@@ -51,17 +52,24 @@ func (opt *PDFLineOpt) CapRound() *PDFLineOpt {
 	return opt
 }
 
+func (opt *PDFLineOpt) Debug(v bool) *PDFLineOpt {
+	opt.debug = &v
+	return opt
+}
+
 func (b *WPDFBuilder) Line(x1 float64, y1 float64, x2 float64, y2 float64, opts ...*PDFLineOpt) {
 	var lineWidth *float64
 	var drawColor *PDFColor
 	var alphaOverride *dataext.Tuple[float64, PDFBlendMode]
 	capStyle := CapButt
+	debug := b.debug
 
 	for _, opt := range opts {
 		lineWidth = langext.CoalesceOpt(opt.lineWidth, lineWidth)
 		drawColor = langext.CoalesceOpt(opt.drawColor, drawColor)
 		alphaOverride = langext.CoalesceOpt(opt.alpha, alphaOverride)
 		capStyle = langext.Coalesce(opt.capStyle, capStyle)
+		debug = langext.Coalesce(opt.debug, debug)
 	}
 
 	if lineWidth != nil {

wpdf/wpdfMultiCell.go

@@ -20,6 +20,7 @@ type PDFMultiCellOpt struct {
 	textColor         *PDFColor
 	borderColor       *PDFColor
 	fillColor         *PDFColor
+	debug             *bool
 }
 
 func NewPDFMultiCellOpt() *PDFMultiCellOpt {
@@ -128,6 +129,16 @@ func (opt *PDFMultiCellOpt) Alpha(alpha float64, blendMode PDFBlendMode) *PDFMul
 	return opt
 }
 
+func (opt *PDFMultiCellOpt) Debug(v bool) *PDFMultiCellOpt {
+	opt.debug = &v
+	return opt
+}
+
+func (opt *PDFMultiCellOpt) Copy() *PDFMultiCellOpt {
+	c := *opt
+	return &c
+}
+
 func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 
 	txtTR := b.tr(txt)
@@ -146,6 +157,7 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 	var textColor *PDFColor
 	var borderColor *PDFColor
 	var fillColor *PDFColor
+	debug := b.debug
 
 	for _, opt := range opts {
 		width = langext.Coalesce(opt.width, width)
@@ -162,6 +174,7 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 		textColor = langext.CoalesceOpt(opt.textColor, textColor)
 		borderColor = langext.CoalesceOpt(opt.borderColor, borderColor)
 		fillColor = langext.CoalesceOpt(opt.fillColor, fillColor)
+		debug = langext.Coalesce(opt.debug, debug)
 	}
 
 	if fontNameOverride != nil || fontStyleOverride != nil || fontSizeOverride != nil {
@@ -203,8 +216,14 @@ func (b *WPDFBuilder) MultiCell(txt string, opts ...*PDFMultiCellOpt) {
 		b.b.SetX(*x)
 	}
 
+	xBefore, yBefore := b.b.GetXY()
+
 	b.b.MultiCell(width, height, txtTR, string(border), string(align), fill)
 
+	if debug {
+		b.Rect(b.GetPageWidth()-xBefore-b.GetMarginRight(), b.GetY()-yBefore, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
+	}
+
 	if extraLn != 0 {
 		b.b.Ln(extraLn)
 	}

wpdf/wpdfRect.go

@@ -16,6 +16,7 @@ type PDFRectOpt struct {
 	radiusTR  *float64
 	radiusBR  *float64
 	radiusBL  *float64
+	debug     *bool
 }
 
 func NewPDFRectOpt() *PDFRectOpt {
@@ -90,6 +91,11 @@ func (opt *PDFRectOpt) Alpha(alpha float64, blendMode PDFBlendMode) *PDFRectOpt
 	return opt
 }
 
+func (opt *PDFRectOpt) Debug(v bool) *PDFRectOpt {
+	opt.debug = &v
+	return opt
+}
+
 func (b *WPDFBuilder) Rect(w float64, h float64, styleStr PDFRectStyle, opts ...*PDFRectOpt) {
 	x := b.GetX()
 	y := b.GetY()
@@ -101,6 +107,7 @@ func (b *WPDFBuilder) Rect(w float64, h float64, styleStr PDFRectStyle, opts ...
 	radiusTR := float64(0)
 	radiusBR := float64(0)
 	radiusBL := float64(0)
+	debug := b.debug
 
 	for _, opt := range opts {
 		x = langext.Coalesce(opt.x, x)
@@ -113,6 +120,7 @@ func (b *WPDFBuilder) Rect(w float64, h float64, styleStr PDFRectStyle, opts ...
 		radiusTR = langext.Coalesce(opt.radiusTR, radiusTR)
 		radiusBR = langext.Coalesce(opt.radiusBR, radiusBR)
 		radiusBL = langext.Coalesce(opt.radiusBL, radiusBL)
+		debug = langext.Coalesce(opt.debug, debug)
 	}
 
 	if lineWidth != nil {

wpdf/wpdfTable.go

@@ -35,24 +35,7 @@ type TableBuilder struct {
 	rows             []tableRow
 	defaultCellStyle *TableCellStyleOpt
 	columnWidths     *[]string
-}
-
-type TableCell struct {
-	Content string
-	Style   TableCellStyleOpt
-}
-
-type TableCellStyleOpt struct {
-	MultiCell   *bool
-	Ellipsize   *bool
-	PaddingHorz *float64
-	MinWidth    *float64
-
-	PDFCellOpt
-}
-
-type tableRow struct {
-	cells []TableCell
+	debug            *bool
 }
 
 func (r tableRow) maxFontSize(defaultFontSize float64) float64 {
@@ -70,8 +53,8 @@ func (b *TableBuilder) Widths(v ...string) *TableBuilder {
 	return b
 }
 
-func (b *TableBuilder) DefaultStyle(s TableCellStyleOpt) *TableBuilder {
-	b.defaultCellStyle = &s
+func (b *TableBuilder) DefaultStyle(s *TableCellStyleOpt) *TableBuilder {
+	b.defaultCellStyle = s
 	return b
 }
 
@@ -85,31 +68,42 @@ func (b *TableBuilder) PadY(v float64) *TableBuilder {
 	return b
 }
 
-func (b *TableBuilder) AddRow(cells ...TableCell) {
+func (b *TableBuilder) AddRow(cells ...TableCell) *TableBuilder {
 	b.rows = append(b.rows, tableRow{cells: cells})
+	return b
 }
 
-func (b *TableBuilder) AddRowWithStyle(style TableCellStyleOpt, cells ...string) {
+func (b *TableBuilder) AddRowWithStyle(style *TableCellStyleOpt, cells ...string) *TableBuilder {
 	tcels := make([]TableCell, 0, len(cells))
 	for _, cell := range cells {
-		tcels = append(tcels, TableCell{Content: cell, Style: style})
+		tcels = append(tcels, TableCell{Content: cell, Style: *style})
 	}
 
 	b.rows = append(b.rows, tableRow{cells: tcels})
+
+	return b
 }
 
-func (b *TableBuilder) AddRowDefaultStyle(cells ...string) {
+func (b *TableBuilder) AddRowDefaultStyle(cells ...string) *TableBuilder {
 	tcels := make([]TableCell, 0, len(cells))
 	for _, cell := range cells {
 		tcels = append(tcels, TableCell{Content: cell, Style: langext.Coalesce(b.defaultCellStyle, TableCellStyleOpt{})})
 	}
 
 	b.rows = append(b.rows, tableRow{cells: tcels})
+
+	return b
+}
+
+func (b *TableBuilder) BuildRow() *TableRowBuilder {
+	return &TableRowBuilder{tabbuilder: b, cells: make([]TableCell, 0)}
 }
 
 func (b *TableBuilder) Build() {
 	builder := b.builder
 
+	debug := langext.Coalesce(b.debug, b.builder.debug)
+
 	if len(b.rows) == 0 {
 		return // nothing to do
 	}
@@ -140,17 +134,21 @@ func (b *TableBuilder) Build() {
 			str := cell.Content
 			style := cell.Style
 
-			ellipsize := langext.Coalesce(style.Ellipsize, true)
-			cellPaddingHorz := langext.Coalesce(style.PaddingHorz, 2)
+			ellipsize := langext.Coalesce(style.ellipsize, true)
+			cellPaddingHorz := langext.Coalesce(style.paddingHorz, 2)
+
+			fillHeight := langext.Coalesce(style.fillHeight, false)
 
 			bx := builder.GetX()
 			by := builder.GetY()
 
 			cellWidth := columnWidths[cellIdx]
 
-			if langext.Coalesce(style.MultiCell, true) {
+			_ = fillHeight // TODO implement, but how?? ( cells with fillHeight=true should have a border of the full column height, even if another column is growing it, but we do not know teh height beforehand ... )
 
-				builder.MultiCell(str, style.PDFCellOpt.Copy().ToMulti().Width(cellWidth))
+			if langext.Coalesce(style.multiCell, true) {
+
+				builder.MultiCell(str, style.PDFCellOpt.Copy().ToMulti().Width(cellWidth).Debug(debug))
 
 			} else {
 
@@ -163,7 +161,7 @@ func (b *TableBuilder) Build() {
 					}
 				}
 
-				builder.Cell(str, style.PDFCellOpt.Copy().Width(cellWidth))
+				builder.Cell(str, style.PDFCellOpt.Copy().Width(cellWidth).Debug(debug))
 
 			}
 
@@ -222,8 +220,8 @@ func (b *TableBuilder) calculateColumns() []float64 {
 		for _, row := range b.rows {
 			if len(row.cells) > colIdx {
 
-				ph := langext.Coalesce(row.cells[colIdx].Style.PaddingHorz, 2)
-				mw := langext.Coalesce(row.cells[colIdx].Style.MinWidth, 0)
+				ph := langext.Coalesce(row.cells[colIdx].Style.paddingHorz, 2)
+				mw := langext.Coalesce(row.cells[colIdx].Style.minWidth, 0)
 
 				minWidth = max(minWidth, ph+mw)
 
@@ -281,23 +279,28 @@ func (b *TableBuilder) calculateColumns() []float64 {
 		return columnWidths
 	}
 
-	for i, _ := range columnDef {
-		if frColumnWeights[i] != 0 {
-			w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
-			remainingWidth += columnWidths[i]
-			columnWidths[i] = w
-			remainingWidth -= w
+	{
+		rmSub := 0.0
+		for i := range columnDef {
+			if frColumnWeights[i] != 0 {
+				w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
+				rmSub += w - columnWidths[i]
+				columnWidths[i] = w
+			}
 		}
+		remainingWidth -= rmSub
 	}
 
-	if remainingWidth > 0 {
+	if remainingWidth > 0.01 {
+		rmSub := 0.0
 		for i, _ := range columnDef {
 			if frColumnWeights[i] != 0 {
 				addW := (remainingWidth / float64(frColumnWidthCount)) * frColumnWeights[i]
+				rmSub += addW
 				columnWidths[i] += addW
-				remainingWidth -= addW
 			}
 		}
+		remainingWidth -= rmSub
 	}
 
 	return columnWidths
@@ -307,6 +310,11 @@ func (b *TableBuilder) RowCount() int {
 	return len(b.rows)
 }
 
+func (b *TableBuilder) Debug(v bool) *TableBuilder {
+	b.debug = &v
+	return b
+}
+
 func (b *WPDFBuilder) Table() *TableBuilder {
 	return &TableBuilder{
 		builder:          b,
@@ -321,12 +329,13 @@ func defaultTableStyle() *TableCellStyleOpt {
 	return &TableCellStyleOpt{
 		PDFCellOpt: *NewPDFCellOpt().
 			FontSize(float64(8)).
-			BorderColorHex(uint32(0x888888)).
-			FillColorHex(uint32(0xFFFFFF)).
+			Border(BorderFull).
+			BorderColorHex(uint32(0x666666)).
+			FillColorHex(uint32(0xF0F0F0)).
 			TextColorHex(uint32(0x000000)).
-			FillBackground(false),
-		MinWidth:  langext.Ptr(float64(5)),
-		Ellipsize: langext.PTrue,
-		MultiCell: langext.PFalse,
+			FillBackground(true),
+		minWidth:  langext.Ptr(float64(5)),
+		ellipsize: langext.PTrue,
+		multiCell: langext.PFalse,
 	}
 }

wpdf/wpdfTableCell.go

@@ -0,0 +1,187 @@
+package wpdf
+
+import (
+	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+)
+
+type TableCell struct {
+	Content string
+	Style   TableCellStyleOpt
+}
+
+type TableCellStyleOpt struct {
+	multiCell   *bool
+	ellipsize   *bool
+	paddingHorz *float64
+	minWidth    *float64
+	fillHeight  *bool
+
+	PDFCellOpt
+}
+
+func NewTableCellStyleOpt() *TableCellStyleOpt {
+	return &TableCellStyleOpt{}
+}
+
+func (o *TableCellStyleOpt) FillHeight(b bool) *TableCellStyleOpt {
+	o.fillHeight = &b
+	return o
+}
+
+func (o *TableCellStyleOpt) MultiCell(v bool) *TableCellStyleOpt {
+	o.multiCell = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Ellipsize(v bool) *TableCellStyleOpt {
+	o.ellipsize = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) PaddingHorz(v float64) *TableCellStyleOpt {
+	o.paddingHorz = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) MinWidth(v float64) *TableCellStyleOpt {
+	o.minWidth = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) CellStyle(v PDFCellOpt) *TableCellStyleOpt {
+	o.PDFCellOpt = v
+	return o
+}
+
+func (o *TableCellStyleOpt) Width(v float64) *TableCellStyleOpt {
+	o.PDFCellOpt.width = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Height(v float64) *TableCellStyleOpt {
+	o.PDFCellOpt.height = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Border(v PDFBorder) *TableCellStyleOpt {
+	o.PDFCellOpt.border = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) LnPos(v PDFTextBreak) *TableCellStyleOpt {
+	o.PDFCellOpt.ln = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Align(v PDFTextAlign) *TableCellStyleOpt {
+	o.PDFCellOpt.align = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) FillBackground(v bool) *TableCellStyleOpt {
+	o.PDFCellOpt.fill = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Link(v int) *TableCellStyleOpt {
+	o.PDFCellOpt.link = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) LinkStr(v string) *TableCellStyleOpt {
+	o.PDFCellOpt.linkStr = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Font(fontName PDFFontFamily, fontStyle PDFFontStyle, fontSize float64) *TableCellStyleOpt {
+	o.PDFCellOpt.fontNameOverride = &fontName
+	o.PDFCellOpt.fontStyleOverride = &fontStyle
+	o.PDFCellOpt.fontSizeOverride = &fontSize
+	return o
+}
+
+func (o *TableCellStyleOpt) FontName(v PDFFontFamily) *TableCellStyleOpt {
+	o.PDFCellOpt.fontNameOverride = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) FontStyle(v PDFFontStyle) *TableCellStyleOpt {
+	o.PDFCellOpt.fontStyleOverride = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) FontSize(v float64) *TableCellStyleOpt {
+	o.PDFCellOpt.fontSizeOverride = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) Bold() *TableCellStyleOpt {
+	o.PDFCellOpt.fontStyleOverride = langext.Ptr(Bold)
+	return o
+}
+
+func (o *TableCellStyleOpt) Italic() *TableCellStyleOpt {
+	o.PDFCellOpt.fontStyleOverride = langext.Ptr(Italic)
+	return o
+}
+
+func (o *TableCellStyleOpt) LnAfter(v float64) *TableCellStyleOpt {
+	o.PDFCellOpt.extraLn = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) X(v float64) *TableCellStyleOpt {
+	o.PDFCellOpt.x = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) AutoWidth() *TableCellStyleOpt {
+	o.PDFCellOpt.autoWidth = langext.PTrue
+	return o
+}
+
+func (o *TableCellStyleOpt) AutoWidthPaddingX(v float64) *TableCellStyleOpt {
+	o.PDFCellOpt.autoWidthPaddingX = &v
+	return o
+}
+
+func (o *TableCellStyleOpt) TextColor(cr, cg, cb int) *TableCellStyleOpt {
+	o.PDFCellOpt.textColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return o
+}
+
+func (o *TableCellStyleOpt) TextColorHex(c uint32) *TableCellStyleOpt {
+	o.PDFCellOpt.textColor = langext.Ptr(hexToColor(c))
+	return o
+}
+
+func (o *TableCellStyleOpt) BorderColor(cr, cg, cb int) *TableCellStyleOpt {
+	o.PDFCellOpt.borderColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return o
+}
+
+func (o *TableCellStyleOpt) BorderColorHex(c uint32) *TableCellStyleOpt {
+	o.PDFCellOpt.borderColor = langext.Ptr(hexToColor(c))
+	return o
+}
+
+func (o *TableCellStyleOpt) FillColor(cr, cg, cb int) *TableCellStyleOpt {
+	o.PDFCellOpt.fillColor = langext.Ptr(rgbToColor(cr, cg, cb))
+	return o
+}
+
+func (o *TableCellStyleOpt) FillColorHex(c uint32) *TableCellStyleOpt {
+	o.PDFCellOpt.fillColor = langext.Ptr(hexToColor(c))
+	return o
+}
+
+func (o *TableCellStyleOpt) Alpha(alpha float64, blendMode PDFBlendMode) *TableCellStyleOpt {
+	o.PDFCellOpt.alphaOverride = &dataext.Tuple[float64, PDFBlendMode]{V1: alpha, V2: blendMode}
+	return o
+}
+
+func (o *TableCellStyleOpt) Debug(v bool) *TableCellStyleOpt {
+	o.PDFCellOpt.debug = &v
+	return o
+}

wpdf/wpdfTableRow.go

@@ -0,0 +1,52 @@
+package wpdf
+
+import "gogs.mikescher.com/BlackForestBytes/goext/langext"
+
+type tableRow struct {
+	cells []TableCell
+}
+
+type TableRowBuilder struct {
+	tabbuilder   *TableBuilder
+	defaultStyle *TableCellStyleOpt
+	cells        []TableCell
+}
+
+func (r *TableRowBuilder) RowStyle(style *TableCellStyleOpt) *TableRowBuilder {
+	r.defaultStyle = style
+	return r
+}
+
+func (r *TableRowBuilder) Cell(cell string) *TableRowBuilder {
+	r.cells = append(r.cells, TableCell{Content: cell, Style: langext.Coalesce3(r.defaultStyle, r.tabbuilder.defaultCellStyle, TableCellStyleOpt{})})
+	return r
+}
+
+func (r *TableRowBuilder) Cells(cells ...string) *TableRowBuilder {
+	for _, cell := range cells {
+		r.cells = append(r.cells, TableCell{Content: cell, Style: langext.Coalesce3(r.defaultStyle, r.tabbuilder.defaultCellStyle, TableCellStyleOpt{})})
+	}
+	return r
+}
+
+func (r *TableRowBuilder) CellObject(cell TableCell) *TableRowBuilder {
+	r.cells = append(r.cells, cell)
+	return r
+}
+
+func (r *TableRowBuilder) CellObjects(cells ...TableCell) *TableRowBuilder {
+	for _, cell := range cells {
+		r.cells = append(r.cells, cell)
+	}
+	return r
+}
+
+func (r *TableRowBuilder) CellWithStyle(cell string, style *TableCellStyleOpt) *TableRowBuilder {
+	r.cells = append(r.cells, TableCell{Content: cell, Style: *style})
+	return r
+}
+
+func (r *TableRowBuilder) BuildRow() *TableBuilder {
+	r.tabbuilder.AddRow(r.cells...)
+	return r.tabbuilder
+}

wpdf/wpdf_test.go

@@ -0,0 +1,105 @@
+package wpdf
+
+import (
+	_ "embed"
+	"fmt"
+	"gogs.mikescher.com/BlackForestBytes/goext/imageext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"os"
+	"path"
+	"testing"
+)
+
+//go:embed logo.png
+var logoData []byte
+
+func TestPDFBuilder(t *testing.T) {
+	builder := NewPDFBuilder(Portrait, SizeA4, true)
+
+	builder.Debug(true)
+
+	logoRef := builder.RegisterImage(logoData)
+
+	builder.SetMargins(PDFMargins{Left: 15, Top: 40, Right: 10})
+	builder.AddPage()
+
+	builder.SetFont(FontHelvetica, Normal, 10)
+	builder.Cell("Neueinrichtung deiner Entgeltumwandlung", NewPDFCellOpt().Bold().FontSize(20))
+	builder.Ln(10)
+
+	builder.SetFont(FontHelvetica, Normal, 10)
+	builder.Cell("Hello World", NewPDFCellOpt().Width(50).Align(AlignHorzCenter).LnPos(BreakToRight))
+	builder.IncX(10)
+	builder.Cell("Second Text", NewPDFCellOpt().AutoWidth().AutoWidthPaddingX(2).LnPos(BreakToRight))
+	builder.Ln(10)
+
+	builder.MultiCell("Im Fall einer individuellen Entgeltumwandlung ist die Zuschussverpflichtung auf der Grundlage des Betriebsrentenstärkungsgesetzes in der gesetzlich vorgeschriebenen Höhe (§ 1a Abs. 1a BetrAVG), über den arbeitgeberfinanzierten Zuschuss erfüllt.")
+	builder.Ln(4)
+
+	builder.Image(logoRef, NewPDFImageOpt().X(90).Y(160).Width(70).Height(30).ImageFit(imageext.ImageFitContainCenter))
+
+	builder.Ln(4)
+
+	cellStyleHeader := &TableCellStyleOpt{
+		PDFCellOpt: *NewPDFCellOpt().
+			FontSize(float64(8)).
+			BorderColorHex(uint32(0x666666)).
+			Border(BorderFull).
+			FillColorHex(uint32(0xC0C0C0)).
+			FillBackground(true).
+			TextColorHex(uint32(0x000000)).
+			Align(AlignHorzCenter).
+			Bold(),
+		minWidth:  langext.Ptr(float64(5)),
+		ellipsize: langext.PTrue,
+		multiCell: langext.PFalse,
+	}
+
+	cellStyleMulti := &TableCellStyleOpt{
+		PDFCellOpt: *NewPDFCellOpt().
+			FontSize(float64(8)).
+			BorderColorHex(uint32(0x666666)).
+			Border(BorderFull).
+			FillColorHex(uint32(0xC060C0)).
+			FillBackground(true).
+			TextColorHex(uint32(0x000000)),
+		minWidth:  langext.Ptr(float64(5)),
+		ellipsize: langext.PFalse,
+		multiCell: langext.PTrue,
+	}
+
+	builder.Table().
+		Widths("auto", "20", "1fr", "20").
+		PadX(2).
+		PadY(2).
+		AddRowWithStyle(cellStyleHeader, "test", "hello", "123", "end").
+		AddRowDefaultStyle("test", "hello", "123", "end").
+		AddRowDefaultStyle("123", "helasdsalo", "a", "enwqad").
+		AddRowDefaultStyle("123asd", "TrimMeTrimMeTrimMeTrimMe", "a", "enwqad").
+		AddRowWithStyle(cellStyleMulti, "123", "helasdsalo", "a", "MultiCell: enwqad enw\nqad enwqad enwqad enwqad enwqad").
+		AddRowDefaultStyle("123", "helasdsalo", "a", "enwqad").
+		Debug(false).
+		Build()
+
+	builder.Ln(8)
+
+	builder.Table().
+		Widths("auto", "20", "1fr", "20").
+		PadX(2).
+		PadY(2).
+		BuildRow().RowStyle(cellStyleHeader).Cells("test", "hello", "123", "end").BuildRow().
+		BuildRow().Cells("test", "hello", "123", "end").BuildRow().
+		BuildRow().RowStyle(cellStyleMulti.FillHeight(true)).Cell("123").Cell("helasdsalo").Cell("a").Cell("MultiCell: enwqad enw\nqad enwqad enwqad enwqad enwqad").BuildRow().
+		AddRowDefaultStyle("123", "helasdsalo", "a", "enwqad").
+		Debug(false).
+		Build()
+
+	bin, err := builder.Build()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fn := "wpdf_test.pdf"
+	_ = os.WriteFile(fn, bin, 0644)
+	fmt.Println("file://" + path.Join(langext.Must(os.Getwd()), fn))
+}