这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: serialization of []http.Cookie #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: serialization of []http.Cookie #778

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions huma.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,16 @@
Field reflect.StructField
Name string
TimeFormat string
ShouldSkip bool
}

func findHeaders(t reflect.Type) *findResult[*headerInfo] {
return findInType(t, nil, func(sf reflect.StructField, i []int) *headerInfo {
return findInType(t, func(r reflect.Type, ints []int) *headerInfo {
if r.Kind() == reflect.Slice && deref(r.Elem()) == cookieType {
return &headerInfo{ShouldSkip: true}
}
return nil
}, func(sf reflect.StructField, i []int) *headerInfo {
// Ignore embedded fields
if sf.Anonymous {
return nil
Expand All @@ -260,7 +266,7 @@
timeFormat = f
}
}
return &headerInfo{sf, header, timeFormat}
return &headerInfo{sf, header, timeFormat, false}
}, false, "Status", "Body")
}

Expand Down Expand Up @@ -404,15 +410,11 @@
t = deref(t)
zero := reflect.Zero(reflect.TypeOf((*T)(nil)).Elem()).Interface()

ignoreAnonymous := false
resolved := false
if onType != nil {
if v := onType(t, path); v != zero {
result.Paths = append(result.Paths, findResultPath[T]{path, v})

// Found what we were looking for in the type, no need to go deeper.
// We do still want to potentially process each non-anonymous field,
// so only skip anonymous ones.
ignoreAnonymous = true
resolved = true
}
}

Expand All @@ -429,7 +431,9 @@
if slices.Contains(ignore, f.Name) {
continue
}
if ignoreAnonymous && f.Anonymous {
// We do still want to potentially process each non-anonymous field,
// so only skip anonymous ones.
if resolved && f.Anonymous {
continue
}
fi := append([]int{}, path...)
Expand All @@ -439,18 +443,22 @@
result.Paths = append(result.Paths, findResultPath[T]{fi, v})
}
}

if f.Anonymous || recurseFields || deref(f.Type).Kind() != reflect.Struct {
// Always process embedded structs and named fields which are not
// structs. If `recurseFields` is true then we also process named
// struct fields recursively.
visited[t] = struct{}{}
_findInType(f.Type, fi, result, onType, onField, recurseFields, visited, ignore...)
delete(visited, t)
}
}
case reflect.Slice:
if resolved {
return
}
_findInType(t.Elem(), path, result, onType, onField, recurseFields, visited, ignore...)
case reflect.Map:
if resolved {
return
}

Check warning on line 461 in huma.go

View check run for this annotation

Codecov / codecov/patch

huma.go#L460-L461 

Added lines #L460 - L461 were not covered by tests
_findInType(t.Elem(), path, result, onType, onField, recurseFields, visited, ignore...)
}
}
Expand Down Expand Up @@ -1385,6 +1393,10 @@
}
outHeaders := findHeaders(outputType)
for _, entry := range outHeaders.Paths {
if entry.Value.ShouldSkip {
continue
}

// Document the header's name and type.
if op.Responses[defaultStatusStr].Headers == nil {
op.Responses[defaultStatusStr].Headers = map[string]*Param{}
Expand Down
Loading