Skip to content

fix: Define field args in deterministic order #5

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 2 commits into from
Jul 15, 2022
Merged

fix: Define field args in deterministic order #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11917e0
Define field arguments in a deterministic order
AndrewSisley Jul 14, 2022
b2134d2
Yield introspected input fields in deterministic order
AndrewSisley Jul 14, 2022
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
8 changes: 8 additions & 0 deletions definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"fmt"
"reflect"
"regexp"
"sort"
"strings"

"github.com/graphql-go/graphql/language/ast"
)
Expand Down Expand Up @@ -588,6 +590,12 @@ func defineFieldMap(ttype Named, fieldMap Fields) (FieldDefinitionMap, error) {
}
fieldDef.Args = append(fieldDef.Args, fieldArg)
}

// Sort args so that their order is deterministic (alpha-numeric descending)
sort.Slice(fieldDef.Args, func(i, j int) bool {
return strings.Compare(fieldDef.Args[i].Name(), fieldDef.Args[j].Name()) == -1
})

resultFieldMap[fieldName] = fieldDef
}
return resultFieldMap, nil
Expand Down
7 changes: 7 additions & 0 deletions introspection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"reflect"
"sort"
"strings"

"github.com/graphql-go/graphql/language/ast"
"github.com/graphql-go/graphql/language/printer"
Expand Down Expand Up @@ -618,6 +619,12 @@ func init() {
for _, field := range ttype.Fields() {
fields = append(fields, field)
}

// Sort args so that their order is deterministic (alpha-numeric descending)
sort.Slice(fields, func(i, j int) bool {
return strings.Compare(fields[i].Name(), fields[j].Name()) == -1
})

return fields, nil
}
return nil, nil
Expand Down