Introduce Node data type to simplify OperationDefinition

Thanks to @swolchok for the suggestion.

Data/GraphQL/AST.hs

@@ -16,11 +16,11 @@ data Definition = DefinitionOperation OperationDefinition
                 | DefinitionType      TypeDefinition
                   deriving (Eq,Show)
 
-data OperationDefinition =
+data OperationDefinition = Query    Node
-    Query        Name [VariableDefinition] [Directive] SelectionSet
+                         | Mutation Node
-  | Mutation     Name [VariableDefinition] [Directive] SelectionSet
+                           deriving (Eq,Show)
-  -- Not official yet
+
-  -- -- | Subscription Name [VariableDefinition] [Directive] SelectionSet
+data Node = Node Name [VariableDefinition] [Directive] SelectionSet
             deriving (Eq,Show)
 
 data VariableDefinition = VariableDefinition Variable Type (Maybe DefaultValue)

Data/GraphQL/Parser.hs

@@ -45,7 +45,6 @@ name = tok $ append <$> takeWhile1 isA_z
     -- `isAlpha` handles many more Unicode Chars
     isA_z =  inClass $ '_' : ['A'..'Z'] ++ ['a'..'z']
 
-
 -- * Document
 
 document :: Parser Document
@@ -54,7 +53,8 @@ document = whiteSpace
     -- Try SelectionSet when no definition
     <|> (Document . pure
                   . DefinitionOperation
-                  . Query mempty empty empty
+                  . Query
+                  . Node mempty empty empty
                 <$> selectionSet)
     <?> "document error!"
 
@@ -66,11 +66,12 @@ definition = DefinitionOperation <$> operationDefinition
 
 operationDefinition :: Parser OperationDefinition
 operationDefinition =
-        op Query "query"
+        Query    <$ tok "query"    <*> node
-    <|> op Mutation "mutation"
+    <|> Mutation <$ tok "mutation" <*> node
     <?> "operationDefinition error!"
-  where
+
-    op f n = f <$ tok n <*> tok name
+node :: Parser Node
+node = Node <$> name
             <*> optempty variableDefinitions
             <*> optempty directives
             <*> selectionSet