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

fix: better handling of zero values; no panic for generic types #33

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

Merged
merged 1 commit into from
Mar 22, 2022
Merged

fix: better handling of zero values; no panic for generic types #33

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,13 @@ func shallowStructToMap(v reflect.Value, result map[string]interface{}) {
if name == "-" {
continue
}
if len(parts) == 2 && parts[1] == "omitempty" && v.Field(i).IsZero() {
if len(parts) > 1 && parts[1] == "omitempty" {
vf := v.Field(i)
zero := vf.IsZero()
if vf.Kind() == reflect.Slice || vf.Kind() == reflect.Map {
// Special case: omit if they have no items in them to match the
// JSON encoder.
zero = vf.Len() > 0
zero = vf.Len() == 0
}
if zero {
continue
Expand Down
4 changes: 3 additions & 1 deletion graphql_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ func getFields(typ reflect.Type) []reflect.StructField {
if newTyp.Kind() == reflect.Ptr {
newTyp = newTyp.Elem()
}
fields = append(fields, getFields(newTyp)...)
if newTyp.Kind() == reflect.Struct {
fields = append(fields, getFields(newTyp)...)
}
}

return fields
Expand Down
6 changes: 5 additions & 1 deletion schema/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ func getFields(typ reflect.Type) []reflect.StructField {
if newTyp.Kind() == reflect.Ptr {
newTyp = newTyp.Elem()
}
fields = append(fields, getFields(newTyp)...)
if newTyp.Kind() == reflect.Struct {
fields = append(fields, getFields(newTyp)...)
}
}

return fields
Expand Down Expand Up @@ -542,6 +544,8 @@ func GenerateWithMode(t reflect.Type, mode Mode, schema *Schema) (*Schema, error
return GenerateWithMode(t.Elem(), mode, schema)
case reflect.Interface:
// Interfaces can be any type.
case reflect.Uintptr, reflect.UnsafePointer, reflect.Func:
// Ignored...
default:
return nil, fmt.Errorf("unsupported type %s from %s", t.Kind(), t)
}
Expand Down