summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Navarro <j@dannynavarro.net>2017-03-01 21:04:35 -0300
committerDanny Navarro <j@dannynavarro.net>2017-03-01 16:04:35 -0300
commit5954962de133ed45b49fdc831685ab6f602261ad (patch)
tree5d6fb0c64aa5af06bf20a84ee3fbfee46b4013c5
parent1327bcf7f7934c5cef91cf769ba73f297a77c4d6 (diff)
downloadgraphql-5954962de133ed45b49fdc831685ab6f602261ad.tar.gz
Make alternate Schema functions work with AST.Core
-rw-r--r--Data/GraphQL/Schema.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Data/GraphQL/Schema.hs b/Data/GraphQL/Schema.hs
index d11a637..2646bac 100644
--- a/Data/GraphQL/Schema.hs
+++ b/Data/GraphQL/Schema.hs
@@ -76,9 +76,9 @@ object' name resolvs = objectA' name $ \case
objectA'
:: (Alternative f, Monad f)
=> Text -> ([Argument] -> f [Resolver f]) -> Resolver f
-objectA' name f fld@(Field _ _ args _ sels) = do
+objectA' name f fld@(Field _ _ args flds) = do
resolvs <- f args
- withField name (resolvers resolvs $ fields sels) fld
+ withField name (resolve resolvs flds) fld
-- | A scalar represents a primitive value, like a string or an integer.
@@ -116,9 +116,9 @@ array' name resolvs = arrayA' name $ \case
arrayA'
:: (Alternative f, Monad f)
=> Text -> ([Argument] -> f [[Resolver f]]) -> Resolver f
-arrayA' name f fld@(Field _ _ args _ sels) = do
+arrayA' name f fld@(Field _ _ args sels) = do
resolvs <- f args
- withField name (joinErrs $ traverse (flip resolvers $ fields sels) $ resolvs) fld
+ withField name (traverse (`resolve` sels) resolvs) fld
-- | Represents one of a finite set of possible values.
-- Used in place of a 'scalar' when the possible responses are easily enumerable.