Rename Type to GType

We have two things called `Type`: the AST-level type and the Schema-level
type. Here, we rename both.

`GType` is chosen for consistency with `GInt`, `GBool`, etc.

Motivation is allowing us to work on GHC 8.0 and 8.2.
See protolude/protolude#79 for details.

Author: jml

src/GraphQL/API.hs

@@ -191,7 +191,7 @@ class HasAnnotatedType a where
   -- forget this. Maybe we can flip the internal encoding to be
   -- non-null by default and needing explicit null-encoding (via
   -- Maybe).
-  getAnnotatedType :: Either NameError (Schema.AnnotatedType Schema.Type)
+  getAnnotatedType :: Either NameError (Schema.AnnotatedType Schema.GType)
 
 -- | Turn a non-null type into the optional version of its own type.
 dropNonNull :: Schema.AnnotatedType t -> Schema.AnnotatedType t
@@ -204,7 +204,7 @@ instance forall a. HasAnnotatedType a => HasAnnotatedType (Maybe a) where
   -- see TODO in HasAnnotatedType class
   getAnnotatedType = dropNonNull <$> getAnnotatedType @a
 
-builtinType :: Schema.Builtin -> Either NameError (Schema.AnnotatedType Schema.Type)
+builtinType :: Schema.Builtin -> Either NameError (Schema.AnnotatedType Schema.GType)
 builtinType = pure . Schema.TypeNonNull . Schema.NonNullTypeNamed . Schema.BuiltinType
 
 -- TODO(jml): Given that AnnotatedType is parametrised, we can probably reduce

src/GraphQL/Internal/Execution.hs

@@ -32,7 +32,7 @@ import GraphQL.Internal.Validation
   , VariableDefinition(..)
   , VariableValue
   , Variable
-  , Type(..)
+  , GType(..)
   )
 
 -- | Get an operation from a GraphQL document

src/GraphQL/Internal/Schema.hs

@@ -8,7 +8,7 @@
 --
 -- Equivalent representation of GraphQL /values/ is in "GraphQL.Value".
 module GraphQL.Internal.Schema
-  ( Type(..)
+  ( GType(..)
   -- * Builtin types
   , Builtin(..)
   -- * Defining new types
@@ -40,7 +40,7 @@ module GraphQL.Internal.Schema
   , lookupType
   ) where
 
-import Protolude hiding (Type)
+import Protolude
 
 import qualified Data.Map as Map
 import GraphQL.Value (Value)
@@ -100,13 +100,13 @@ data NonNullType t = NonNullTypeNamed t
                    | NonNullTypeList  (ListType t)
                    deriving (Eq, Ord, Show)
 
-data Type = DefinedType TypeDefinition | BuiltinType Builtin deriving (Eq, Ord, Show)
+data GType = DefinedType TypeDefinition | BuiltinType Builtin deriving (Eq, Ord, Show)
 
-instance DefinesTypes Type where
+instance DefinesTypes GType where
   getDefinedTypes (BuiltinType _) = mempty
   getDefinedTypes (DefinedType t) = getDefinedTypes t
 
-instance HasName Type where
+instance HasName GType where
   getName (DefinedType x) = getName x
   getName (BuiltinType x) = getName x
 
@@ -154,7 +154,7 @@ instance DefinesTypes ObjectTypeDefinition where
 
 type Interfaces = [InterfaceTypeDefinition]
 
-data FieldDefinition = FieldDefinition Name [ArgumentDefinition] (AnnotatedType Type)
+data FieldDefinition = FieldDefinition Name [ArgumentDefinition] (AnnotatedType GType)
                        deriving (Eq, Ord, Show)
 
 instance HasName FieldDefinition where

src/GraphQL/Internal/Syntax/AST.hs

@@ -27,7 +27,7 @@ module GraphQL.Internal.Syntax.AST
   , ObjectField(..)
   , DefaultValue
   , Directive(..)
-  , Type(..)
+  , GType(..)
   , NamedType(..)
   , ListType(..)
   , NonNullType(..)
@@ -46,7 +46,7 @@ module GraphQL.Internal.Syntax.AST
   , TypeExtensionDefinition(..)
   ) where
 
-import Protolude hiding (Type)
+import Protolude
 
 import Test.QuickCheck (Arbitrary(..), listOf, oneof)
 
@@ -78,7 +78,7 @@ data OperationDefinition
 data Node = Node (Maybe Name) [VariableDefinition] [Directive] SelectionSet
             deriving (Eq,Show)
 
-data VariableDefinition = VariableDefinition Variable Type (Maybe DefaultValue)
+data VariableDefinition = VariableDefinition Variable GType (Maybe DefaultValue)
                           deriving (Eq,Show)
 
 newtype Variable = Variable Name deriving (Eq, Ord, Show)
@@ -169,14 +169,14 @@ data Directive = Directive Name [Argument] deriving (Eq,Show)
 
 -- * Type Reference
 
-data Type = TypeNamed NamedType
-          | TypeList ListType
-          | TypeNonNull NonNullType
-            deriving (Eq, Ord, Show)
+data GType = TypeNamed NamedType
+           | TypeList ListType
+           | TypeNonNull NonNullType
+           deriving (Eq, Ord, Show)
 
 newtype NamedType = NamedType Name deriving (Eq, Ord, Show)
 
-newtype ListType = ListType Type deriving (Eq, Ord, Show)
+newtype ListType = ListType GType deriving (Eq, Ord, Show)
 
 data NonNullType = NonNullTypeNamed NamedType
                  | NonNullTypeList  ListType
@@ -198,12 +198,12 @@ data ObjectTypeDefinition = ObjectTypeDefinition Name Interfaces [FieldDefinitio
 
 type Interfaces = [NamedType]
 
-data FieldDefinition = FieldDefinition Name ArgumentsDefinition Type
+data FieldDefinition = FieldDefinition Name ArgumentsDefinition GType
                        deriving (Eq,Show)
 
 type ArgumentsDefinition = [InputValueDefinition]
 
-data InputValueDefinition = InputValueDefinition Name Type (Maybe DefaultValue)
+data InputValueDefinition = InputValueDefinition Name GType (Maybe DefaultValue)
                             deriving (Eq,Show)
 
 data InterfaceTypeDefinition = InterfaceTypeDefinition Name [FieldDefinition]

src/GraphQL/Internal/Syntax/Encoder.hs

@@ -138,7 +138,7 @@ directive (AST.Directive name args) = "@" <> unName name <> optempty arguments a
 
 -- * Type Reference
 
-type_ :: AST.Type -> Text
+type_ :: AST.GType -> Text
 type_ (AST.TypeNamed (AST.NamedType x)) = unName x
 type_ (AST.TypeList x) = listType x
 type_ (AST.TypeNonNull x) = nonNullType x

src/GraphQL/Internal/Syntax/Parser.hs

@@ -208,7 +208,7 @@ directive = AST.Directive
 
 -- * Type Reference
 
-type_ :: Parser AST.Type
+type_ :: Parser AST.GType
 type_ = AST.TypeList    <$> listType
     <|> AST.TypeNonNull <$> nonNullType
     <|> AST.TypeNamed   <$> namedType

src/GraphQL/Internal/Validation.hs

@@ -44,7 +44,7 @@ module GraphQL.Internal.Validation
   , VariableDefinition(..)
   , VariableValue
   , Variable
-  , AST.Type(..)
+  , AST.GType(..)
   -- * Resolving queries
   , SelectionSetByType
   , SelectionSet(..)
@@ -624,7 +624,7 @@ validateArguments args = Arguments <$> mapErrors DuplicateArgument (makeMap [(na
 data VariableDefinition
   = VariableDefinition
     { variable :: Variable -- ^ The name of the variable
-    , variableType :: AST.Type -- ^ The type of the variable
+    , variableType :: AST.GType -- ^ The type of the variable
     , defaultValue :: Maybe Value -- ^ An optional default value for the variable
     } deriving (Eq, Ord, Show)
 

tests/SchemaTests.hs

@@ -27,7 +27,7 @@ import GraphQL.Internal.Schema
   , AnnotatedType(..)
   , ListType(..)
   , UnionTypeDefinition(..)
-  , Type(..)
+  , GType(..)
   , TypeDefinition(..)
   , NonNullType(..)
   , Builtin(..)