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

When argument is not found return null

Browse Source 
The relevant test was restored too.
This commit is contained in:
Danny Navarro
2017-03-03 20:39:03 -03:00
parent fb071210cf
commit 2b5648efda
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Data/GraphQL/Schema.hs
View File

@ -24,7 +24,7 @@ module Data.GraphQL.Schema
, Value(..)
) where
import Control.Applicative (Alternative(empty))
import Control.Applicative (Alternative(empty), (<|>))
import Data.Foldable (fold)
import Data.List.NonEmpty (NonEmpty)
import Data.Maybe (fromMaybe)
@ -66,6 +66,7 @@ objectA
=> Name -> (Arguments -> Resolvers f) -> Resolver f
objectA name f fld@(Field _ _ args flds) = withField name (resolve (f args) flds) fld
-- | Create a named 'Resolver' from a list of 'Resolver's.
object' :: (Alternative f, Monad f) => Text -> f [Resolver f] -> Resolver f
object' name resolvs = objectA' name $ \case
@ -136,9 +137,11 @@ enumA _ _ _ = empty
withField
:: (Alternative f, Aeson.ToJSON a)
=> Name -> f a -> Field -> f (HashMap Text Aeson.Value)
withField name f (Field alias name' _ _) =
withField name v (Field alias name' _ _) =
if name == name'
then fmap (HashMap.singleton aliasOrName . Aeson.toJSON) f
then fmap (HashMap.singleton aliasOrName . Aeson.toJSON) v
-- TODO: Report error when Non-Nullable type for field argument.
<|> pure (HashMap.singleton aliasOrName Aeson.Null)
else empty
where
aliasOrName = fromMaybe name alias