From fc9ad9c4a1e2e79a6b93d2599ca8fa6770caf631 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sun, 1 Dec 2019 20:43:19 +0100 Subject: Consider __typename when evaluating fragments Fixes #30. --- src/Language/GraphQL/Schema.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Language/GraphQL/Schema.hs') diff --git a/src/Language/GraphQL/Schema.hs b/src/Language/GraphQL/Schema.hs index afe068f..fa8bf78 100644 --- a/src/Language/GraphQL/Schema.hs +++ b/src/Language/GraphQL/Schema.hs @@ -131,8 +131,8 @@ resolve resolvers = fmap (Aeson.toJSON . fold) . traverse tryResolvers tryResolvers (SelectionField fld@(Field _ name _ _)) = maybe (errmsg fld) (tryResolver fld) $ find (compareResolvers name) resolvers tryResolvers (SelectionFragment (Fragment typeCondition selections')) = do - that <- maybe (return "") resolveTypeName (find (compareResolvers "__typename") resolvers) - if Aeson.String typeCondition == that + that <- traverse resolveTypeName (find (compareResolvers "__typename") resolvers) + if maybe True (Aeson.String typeCondition ==) that then fmap fold . traverse tryResolvers $ selections' else return mempty compareResolvers name (Resolver name' _) = name == name' -- cgit v1.2.3