BlackForestBytes/goext
20
0
Fork 0
Code Actions

v0.0.512
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 5m6s
Details

Browse Source
This commit is contained in:
Mike Schwörer 2024-09-15 21:25:21 +02:00
parent d7fbef37db
commit 1f456c5134
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
goextVersion.go
View File

@ -1,5 +1,5 @@
package goext package goext
const GoextVersion = "0.0.511" const GoextVersion = "0.0.512"
const GoextVersionTimestamp = "2024-09-15T18:22:07+0200" const GoextVersionTimestamp = "2024-09-15T21:25:21+0200"

12
gojson/encode.go
View File

@ -788,7 +788,7 @@ FieldLoop:
if f.omitEmpty && isEmptyValue(fv) { if f.omitEmpty && isEmptyValue(fv) {
continue continue
} else if opts.filter != nil && !matchesJSONFilter(f.jsonfilter, *opts.filter) { } else if !matchesJSONFilter(f.jsonfilter, opts.filter) {
continue continue
} }
e.WriteByte(next) 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 { 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] == "-" { if len(filter) == 1 && filter[0] == "-" {
return false return false
} }
if filter.Contains(value) { if filter.Contains(*value) {
return true return true
} }