From 8b164c4844da128dc5119febc3defb1ebdf2cc3a Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 30 Jun 2020 10:28:10 +0200 Subject: Move Core module out of AST --- src/Language/GraphQL/Execute/Execution.hs | 3 +-- src/Language/GraphQL/Execute/Transform.hs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Language/GraphQL/Execute') diff --git a/src/Language/GraphQL/Execute/Execution.hs b/src/Language/GraphQL/Execute/Execution.hs index 0291bf8..5e53311 100644 --- a/src/Language/GraphQL/Execute/Execution.hs +++ b/src/Language/GraphQL/Execute/Execution.hs @@ -19,7 +19,6 @@ import Data.Maybe (fromMaybe) import Data.Sequence (Seq(..)) import Data.Text (Text) import Language.GraphQL.AST (Name) -import Language.GraphQL.AST.Core import Language.GraphQL.Error import Language.GraphQL.Execute.Coerce import qualified Language.GraphQL.Execute.Transform as Transform @@ -36,7 +35,7 @@ resolveFieldValue :: Monad m -> ResolverT m a -> m (Either Text a) resolveFieldValue result args = - flip runReaderT (Context {arguments = Arguments args, values = result}) + flip runReaderT (Context {arguments = Type.Arguments args, values = result}) . runExceptT . runResolverT diff --git a/src/Language/GraphQL/Execute/Transform.hs b/src/Language/GraphQL/Execute/Transform.hs index 733ac8c..79ee855 100644 --- a/src/Language/GraphQL/Execute/Transform.hs +++ b/src/Language/GraphQL/Execute/Transform.hs @@ -44,7 +44,6 @@ import Data.Text (Text) import qualified Data.Text as Text import qualified Language.GraphQL.AST as Full import Language.GraphQL.AST (Name) -import Language.GraphQL.AST.Core import qualified Language.GraphQL.Execute.Coerce as Coerce import Language.GraphQL.Type.Directive (Directive(..)) import qualified Language.GraphQL.Type.Directive as Directive @@ -341,7 +340,7 @@ directives :: [Full.Directive] -> State (Replacement m) [Directive] directives = traverse directive where directive (Full.Directive directiveName directiveArguments) - = Directive directiveName . Arguments + = Directive directiveName . Type.Arguments <$> foldM go HashMap.empty directiveArguments go arguments (Full.Argument name value') = do substitutedValue <- value value' -- cgit v1.2.3