Collect types once the schema is created

tests/Language/GraphQL/ExecuteSpec.hs

@@ -26,12 +26,7 @@ import Text.Megaparsec (parse)
 import Text.RawString.QQ (r)
 
 philosopherSchema :: Schema (Either SomeException)
-philosopherSchema = Schema
-    { query = queryType
-    , mutation = Nothing
-    , subscription = Just subscriptionType
-    , directives = HashMap.empty
-    }
+philosopherSchema = schema queryType Nothing (Just subscriptionType) mempty
 
 queryType :: Out.ObjectType (Either SomeException)
 queryType = Out.ObjectType "Query" Nothing []

tests/Language/GraphQL/ValidateSpec.hs

@@ -22,12 +22,7 @@ import Text.Megaparsec (parse)
 import Text.RawString.QQ (r)
 
 petSchema :: Schema IO
-petSchema = Schema
-    { query = queryType
-    , mutation = Nothing
-    , subscription = Just subscriptionType
-    , directives = HashMap.empty
-    } 
+petSchema = schema queryType Nothing (Just subscriptionType) mempty
 
 queryType :: ObjectType IO
 queryType = ObjectType "Query" Nothing [] $ HashMap.fromList

tests/Test/DirectiveSpec.hs

@@ -19,7 +19,7 @@ import Test.Hspec.GraphQL
 import Text.RawString.QQ (r)
 
 experimentalResolver :: Schema IO
-experimentalResolver = schema queryType
+experimentalResolver = schema queryType Nothing Nothing mempty
   where
     queryType = Out.ObjectType "Query" Nothing []
         $ HashMap.singleton "experimentalField"

tests/Test/FragmentSpec.hs

@@ -67,7 +67,7 @@ sizeFieldType
     $ pure $ snd size
 
 toSchema :: Text -> (Text, Value) -> Schema IO
-toSchema t (_, resolve) = schema queryType
+toSchema t (_, resolve) = schema queryType Nothing Nothing mempty
   where
     garmentType = Out.UnionType "Garment" Nothing [hatType, shirtType]
     typeNameField = Out.Field Nothing (Out.NamedScalarType string) mempty

tests/Test/RootOperationSpec.hs

@@ -24,13 +24,10 @@ hatType = Out.ObjectType "Hat" Nothing []
     $ pure $ Int 60
 
 garmentSchema :: Schema IO
-garmentSchema = Schema
-    { query = Out.ObjectType "Query" Nothing [] hatFieldResolver
-    , mutation = Just $ Out.ObjectType "Mutation" Nothing [] incrementFieldResolver
-    , subscription = Nothing
-    , directives = HashMap.empty
-    }
+garmentSchema = schema queryType (Just mutationType) Nothing mempty
   where
+    queryType = Out.ObjectType "Query" Nothing [] hatFieldResolver
+    mutationType = Out.ObjectType "Mutation" Nothing [] incrementFieldResolver
     garment = pure $ Object $ HashMap.fromList
         [ ("circumference", Int 60)
         ]

tests/Test/StarWars/Schema.hs

@@ -18,7 +18,7 @@ import Prelude hiding (id)
 -- See https://github.com/graphql/graphql-js/blob/master/src/__tests__/starWarsSchema.js
 
 starWarsSchema :: Schema (Either SomeException)
-starWarsSchema = schema queryType
+starWarsSchema = schema queryType Nothing Nothing mempty
   where
     queryType = Out.ObjectType "Query" Nothing [] $ HashMap.fromList
         [ ("hero", heroFieldResolver)