Skip to content

Resolver thunk check relocation #39

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
luisjakon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolver thunk check relocation #39

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
22 changes: 10 additions & 12 deletions executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,17 +1077,7 @@ func (executor *Executor) resolveGroupedFields(reqCtx *RequestContext, isParalle
wg.Done()
}
}()
var key string
var value interface{}
var err error
if src, ok := source.(func() (interface{}, error)); ok {
value, err = src()
if err == nil {
key, value, err = executor.getFieldEntry(reqCtx, objectType, value, responseKey, fields)
}
} else {
key, value, err = executor.getFieldEntry(reqCtx, objectType, source, responseKey, fields)
}
key, value, err := executor.getFieldEntry(reqCtx, objectType, source, responseKey, fields)
if err != nil {
errMutex.Lock()
errs = append(errs, err)
Expand Down Expand Up @@ -1142,7 +1132,15 @@ func (executor *Executor) getFieldEntry(reqCtx *RequestContext, objectType *Obje
return "", nil, err
}
subSelectionSet := executor.mergeSelectionSets(fields)
responseValue, err := executor.completeValueCatchingError(reqCtx, objectType, fieldType, firstField, resolvedObject, subSelectionSet)
var responseValue interface{}
if thunk, ok := resolvedObject.(func() (interface{}, error)); ok {
responseValue, err = thunk()
if err == nil {
responseValue, err = executor.completeValueCatchingError(reqCtx, objectType, fieldType, firstField, responseValue, subSelectionSet)
}
} else {
responseValue, err = executor.completeValueCatchingError(reqCtx, objectType, fieldType, firstField, resolvedObject, subSelectionSet)
}
if err != nil {
return "", nil, err
}
Expand Down