From 7bb4dd0edff37decb3ae8458915b837650897d38 Mon Sep 17 00:00:00 2001 From: 0z5a Date: Sat, 14 Nov 2026 17:19:41 +0100 Subject: [PATCH] query: skip nil embedded struct pointers An untagged anonymous field holding a nil pointer to a struct was encoded as an empty parameter named after the embedded type, e.g. ListOptions=&state=open instead of state=open. A nil embedded struct pointer has no fields to promote, so encode nothing for it, as encoding/json does. --- query/encode.go | 4 ++++ query/encode_test.go | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/query/encode.go b/query/encode.go index ec5c0ee..7f5e450 100644 --- a/query/encode.go +++ b/query/encode.go @@ -177,6 +177,10 @@ func reflectValue(values url.Values, val reflect.Value, scope string) error { embedded = append(embedded, v) continue } + // a nil pointer to an embedded struct has no fields to promote + if sv.Kind() == reflect.Ptr && sv.IsNil() && sv.Type().Elem().Kind() == reflect.Struct { + continue + } } name = sf.Name diff --git a/query/encode_test.go b/query/encode_test.go index e65afa9..d3571b9 100644 --- a/query/encode_test.go +++ b/query/encode_test.go @@ -403,6 +403,29 @@ func TestValues_EmbeddedStructs(t *testing.T) { OuterPtr{&Inner{V: "a"}}, url.Values{"V": {"a"}}, }, + { + // nil embedded struct pointer has no fields to encode + OuterPtr{}, + url.Values{}, + }, + { + struct { + *Inner + W string + }{W: "b"}, + url.Values{"W": {"b"}}, + }, + { + struct{ N OuterPtr }{}, + url.Values{}, + }, + { + // named embedded struct pointer is encoded like any nil pointer + struct { + *Inner `url:"inner"` + }{}, + url.Values{"inner": {""}}, + }, { Mixed{Inner: Inner{V: "a"}, V: "b"}, url.Values{"V": {"b", "a"}},