OSS/graphql
1
1
Fork 1
Code Issues 5 Pull Requests Actions Releases 22 Wiki Activity

Provide location information for interface errors

Browse Source
This commit is contained in:
Eugen Wissner 2021-06-17 08:15:27 +02:00
parent c311cb0070
commit 2ce2be5d91
Signed by: belka
GPG Key ID: A27FDC1E8EE902C0
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Language/GraphQL/Execute/Execution.hs
View File

@ -132,12 +132,13 @@ completeValue (Out.ObjectBaseType objectType) fields result =
completeValue (Out.InterfaceBaseType interfaceType) fields result completeValue (Out.InterfaceBaseType interfaceType) fields result
| Type.Object objectMap <- result = do | Type.Object objectMap <- result = do
let abstractType = Internal.AbstractInterfaceType interfaceType let abstractType = Internal.AbstractInterfaceType interfaceType
let Transform.Field _ _ _ _ location = NonEmpty.head fields
concreteType <- resolveAbstractType abstractType objectMap concreteType <- resolveAbstractType abstractType objectMap
case concreteType of case concreteType of
Just objectType -> executeSelectionSet result objectType Just objectType -> executeSelectionSet result objectType
$ mergeSelectionSets fields $ mergeSelectionSets fields
Nothing -> addError null Nothing -> addError null
$ Error "Interface value completion failed." [] [] $ Error "Interface value completion failed." [location] []
completeValue (Out.UnionBaseType unionType) fields result completeValue (Out.UnionBaseType unionType) fields result
| Type.Object objectMap <- result = do | Type.Object objectMap <- result = do
let abstractType = Internal.AbstractUnionType unionType let abstractType = Internal.AbstractUnionType unionType
@ -148,7 +149,8 @@ completeValue (Out.UnionBaseType unionType) fields result
$ mergeSelectionSets fields $ mergeSelectionSets fields
Nothing -> addError null Nothing -> addError null
$ Error "Union value completion failed." [location] [] $ Error "Union value completion failed." [location] []
completeValue _ _ _ = addError null $ Error "Value completion failed." [] [] completeValue _ (Transform.Field _ _ _ _ location :| _) _ =
addError null $ Error "Value completion failed." [location] []
mergeSelectionSets :: MonadCatch m mergeSelectionSets :: MonadCatch m
=> NonEmpty (Transform.Field m) => NonEmpty (Transform.Field m)

18
tests/Language/GraphQL/ExecuteSpec.hs
View File

@ -218,7 +218,7 @@ spec =
$ parse document "" "{ philosopher { school } }" $ parse document "" "{ philosopher { school } }"
in actual `shouldBe` expected in actual `shouldBe` expected
it "gives location information for invalid interfaces" $ it "gives location information for non-null unions" $
let data'' = Aeson.object let data'' = Aeson.object
[ "philosopher" .= Aeson.object [ "philosopher" .= Aeson.object
[ "interest" .= Aeson.Null [ "interest" .= Aeson.Null
@ -234,6 +234,22 @@ spec =
$ parse document "" "{ philosopher { interest } }" $ parse document "" "{ philosopher { interest } }"
in actual `shouldBe` expected in actual `shouldBe` expected
it "gives location information for invalid interfaces" $
let data'' = Aeson.object
[ "philosopher" .= Aeson.object
[ "majorWork" .= Aeson.Null
]
]
executionErrors = pure $ Error
{ message = "Interface value completion failed."
, locations = [Location 1 17]
, path = []
}
expected = Response data'' executionErrors
Right (Right actual) = either (pure . parseError) execute'
$ parse document "" "{ philosopher { majorWork { title } } }"
in actual `shouldBe` expected
context "Subscription" $ context "Subscription" $
it "subscribes" $ it "subscribes" $
let data'' = Aeson.object let data'' = Aeson.object