Merge pull request #167 from haskell-graphql/99-module-hierarchy

Clean up module structure

Author: jml

CHANGELOG.rst

@@ -12,6 +12,8 @@ Breaking changes
 * You must use protolude 0.2.1 or later
 * ``Defaultable`` must now be imported from ``GraphQL.API``, rather than ``GraphQL.Resolver``,
   this moves ``GraphQL.API`` closer to being sufficient for API definition. (see `#149`_)
+* ``GraphQL.Value.ToValue`` and ``GraphQL.Value.FromValue`` modules have been removed.
+  Import ``ToValue(..)`` and ``FromValue(..)`` from ``GraphQL.Value`` directly.
 
 Improvements
 ------------

graphql-api.cabal

@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 2160ff0226a0b10f7166ddbcf09ec6f79dfddfd66c81244898fb1afabe36bcf8
+-- hash: 244f60f8e2def55fa21d6d61b793b76e26ffbe6fea3b5a4b9fee01127d32358d
 
 name:           graphql-api
 version:        0.3.0
@@ -51,22 +51,25 @@ library
   exposed-modules:
       GraphQL
       GraphQL.API
-      GraphQL.API.Enum
+      GraphQL.Internal.API
+      GraphQL.Internal.API.Enum
       GraphQL.Internal.Arbitrary
       GraphQL.Internal.Execution
       GraphQL.Internal.Name
       GraphQL.Internal.OrderedMap
       GraphQL.Internal.Output
+      GraphQL.Internal.Resolver
       GraphQL.Internal.Schema
       GraphQL.Internal.Syntax.AST
       GraphQL.Internal.Syntax.Encoder
       GraphQL.Internal.Syntax.Parser
       GraphQL.Internal.Syntax.Tokens
       GraphQL.Internal.Validation
+      GraphQL.Internal.Value
+      GraphQL.Internal.Value.FromValue
+      GraphQL.Internal.Value.ToValue
       GraphQL.Resolver
       GraphQL.Value
-      GraphQL.Value.FromValue
-      GraphQL.Value.ToValue
   other-modules:
       Paths_graphql_api
   default-language: Haskell2010

graphql-wai/src/GraphQL/Wai.hs

@@ -9,14 +9,15 @@ module GraphQL.Wai
 
 import Protolude
 
-import GraphQL (interpretAnonymousQuery)
-import GraphQL.API (HasObjectDefinition)
-import GraphQL.Resolver (HasResolver, Handler)
+import qualified Data.Aeson as Aeson
 import Network.Wai (Application, queryString, responseLBS)
-import GraphQL.Value.ToValue (toValue)
 import Network.HTTP.Types.Header (hContentType)
 import Network.HTTP.Types.Status (status200, status400)
-import qualified Data.Aeson as Aeson
+
+import GraphQL (interpretAnonymousQuery)
+import GraphQL.API (HasObjectDefinition)
+import GraphQL.Resolver (HasResolver, Handler)
+import GraphQL.Value (toValue)
 
 
 -- | Adapt a GraphQL handler to a WAI application. This is really just