Skip to content

feat: create a new ScalarLeafsRuleWithoutSuggestions validator rule #413

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
XuankangLin wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −21
Open

feat: create a new ScalarLeafsRuleWithoutSuggestions validator rule #413

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
56 changes: 35 additions & 21 deletions validator/rules/scalar_leafs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ import (
. "github.com/vektah/gqlparser/v2/validator/core"
)

var ScalarLeafsRule = Rule{
Name: "ScalarLeafs",
RuleFunc: func(observers *Events, addError AddErrFunc) {
observers.OnField(func(walker *Walker, field *ast.Field) {
if field.Definition == nil {
return
}
func ruleFuncScalarLeafs(observers *Events, addError AddErrFunc, disableSuggestion bool) {
observers.OnField(func(walker *Walker, field *ast.Field) {
if field.Definition == nil {
return
}

fieldType := walker.Schema.Types[field.Definition.Type.Name()]
if fieldType == nil {
return
}
fieldType := walker.Schema.Types[field.Definition.Type.Name()]
if fieldType == nil {
return
}

if fieldType.IsLeafType() && len(field.SelectionSet) > 0 {
if fieldType.IsLeafType() && len(field.SelectionSet) > 0 {
addError(
Message(`Field "%s" must not have a selection since type "%s" has no subfields.`, field.Name, fieldType.Name),
At(field.Position),
)
}

if !fieldType.IsLeafType() && len(field.SelectionSet) == 0 {
if disableSuggestion {
addError(
Message(
`Field "%s" must not have a selection since type "%s" has no subfields.`,
field.Name,
fieldType.Name,
),
Message(`Field "%s" of type "%s" must have a selection of subfields.`, field.Name, field.Definition.Type.String()),
At(field.Position),
)
}

if !fieldType.IsLeafType() && len(field.SelectionSet) == 0 {
} else {
addError(
Message(
`Field "%s" of type "%s" must have a selection of subfields.`,
Expand All @@ -41,6 +41,20 @@ var ScalarLeafsRule = Rule{
At(field.Position),
)
}
})
}
})
}

var ScalarLeafsRule = Rule{
Name: "ScalarLeafs",
RuleFunc: func(observers *Events, addError AddErrFunc) {
ruleFuncScalarLeafs(observers, addError, false)
},
}

var ScalarLeafsRuleWithoutSuggestions = Rule{
Name: "ScalarLeafsWithoutSuggestions",
RuleFunc: func(observers *Events, addError AddErrFunc) {
ruleFuncScalarLeafs(observers, addError, true)
},
}