starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-24 09:18:31 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

fix: non-struct anonymous field unmarshaling

Browse Source
This commit is contained in:
yusing
2025-04-16 15:15:22 +08:00
parent 973a44ee07
commit 81a6ef9745
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/json/struct.go
View File

@@ -79,13 +79,15 @@ func flattenFields(t reflect.Type) []*field {
f.marshal = appendMarshal f.marshal = appendMarshal
} }
if structField.Anonymous { if structField.Anonymous {
if structField.Type.Kind() == reflect.Pointer { t := structField.Type
f.inner = flattenFields(structField.Type.Elem()) if t.Kind() == reflect.Pointer {
t = t.Elem()
f.omitEmpty = true f.omitEmpty = true
} else {
f.inner = flattenFields(structField.Type)
} }
f.hasInner = len(f.inner) > 0 if t.Kind() == reflect.Struct {
f.inner = flattenFields(t)
f.hasInner = len(f.inner) > 0
}
} }
fields = append(fields, f) fields = append(fields, f)
if f.omitEmpty { if f.omitEmpty {