eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stylish haskell changes

Browse source 
And import fix.
This commit is contained in:
Julian K. Arni 2015-08-17 23:56:29 +02:00
parent 98b6e85128
commit 6eb7add53a
61 changed files with 377 additions and 373 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servant-blaze/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

2
servant-client/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

18
servant-client/src/Servant/Common/BaseUrl.hs
View file

@ -11,13 +11,13 @@ module Servant.Common.BaseUrl (
, showBaseUrl , showBaseUrl
) where ) where
import Control.Monad.Catch (MonadThrow, throwM, Exception) import Control.Monad.Catch (Exception, MonadThrow, throwM)
import Data.List import Data.List
import Data.Typeable import Data.Typeable
import GHC.Generics import GHC.Generics
import Network.URI import Network.URI
import Safe import Safe
import Text.Read import Text.Read
-- | URI scheme to use -- | URI scheme to use
data Scheme = data Scheme =
@ -29,8 +29,8 @@ data Scheme =
-- for servant's automatically-generated clients. -- for servant's automatically-generated clients.
data BaseUrl = BaseUrl data BaseUrl = BaseUrl
{ baseUrlScheme :: Scheme -- ^ URI scheme to use { baseUrlScheme :: Scheme -- ^ URI scheme to use
, baseUrlHost :: String -- ^ host (eg "haskell.org") , baseUrlHost :: String -- ^ host (eg "haskell.org")
, baseUrlPort :: Int -- ^ port (eg 80) , baseUrlPort :: Int -- ^ port (eg 80)
} deriving (Show, Eq, Ord, Generic) } deriving (Show, Eq, Ord, Generic)
showBaseUrl :: BaseUrl -> String showBaseUrl :: BaseUrl -> String

12
servant-client/test/Servant/Common/BaseUrlSpec.hs
View file

@ -1,15 +1,15 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-orphans #-}
module Servant.Common.BaseUrlSpec where module Servant.Common.BaseUrlSpec where
#if !MIN_VERSION_base(4,8,0) #if !MIN_VERSION_base(4,8,0)
import Control.Applicative import Control.Applicative
#endif #endif
import Control.DeepSeq import Control.DeepSeq
import Test.Hspec import Test.Hspec
import Test.QuickCheck import Test.QuickCheck
import Servant.Common.BaseUrl import Servant.Common.BaseUrl
spec :: Spec spec :: Spec
spec = do spec = do

2
servant-client/test/Spec.hs
View file

@ -1,4 +1,4 @@
import Servant.ClientSpec (spec, failSpec) import Servant.ClientSpec (failSpec, spec)
main :: IO () main :: IO ()
main = do main = do

2
servant-docs/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

2
servant-docs/src/Servant/Docs.hs
View file

@ -166,4 +166,4 @@ module Servant.Docs
, single , single
) where ) where
import Servant.Docs.Internal import Servant.Docs.Internal

4
servant-docs/src/Servant/Docs/Internal.hs
View file

@ -1,5 +1,5 @@
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
@ -23,6 +23,7 @@ module Servant.Docs.Internal where
import Control.Applicative import Control.Applicative
#endif #endif
import Control.Lens import Control.Lens
import Data.ByteString.Conversion (ToByteString, toByteString)
import Data.ByteString.Lazy.Char8 (ByteString) import Data.ByteString.Lazy.Char8 (ByteString)
import qualified Data.CaseInsensitive as CI import qualified Data.CaseInsensitive as CI
import Data.Hashable import Data.Hashable
@ -32,7 +33,6 @@ import Data.Maybe
import Data.Monoid import Data.Monoid
import Data.Ord (comparing) import Data.Ord (comparing)
import Data.Proxy import Data.Proxy
import Data.ByteString.Conversion (ToByteString, toByteString)
import Data.String.Conversions import Data.String.Conversions
import Data.Text (Text, pack, unpack) import Data.Text (Text, pack, unpack)
import GHC.Exts (Constraint) import GHC.Exts (Constraint)

2
servant-examples/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

30
servant-examples/auth-combinator/auth-combinator.hs
View file

@ -1,19 +1,19 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
import Data.Aeson {-# LANGUAGE TypeFamilies #-}
import Data.ByteString (ByteString) {-# LANGUAGE TypeOperators #-}
import Data.Text (Text) import Data.Aeson
import GHC.Generics import Data.ByteString (ByteString)
import Network.HTTP.Types import Data.Text (Text)
import Network.Wai import GHC.Generics
import Network.Wai.Handler.Warp import Network.HTTP.Types
import Servant import Network.Wai
import Servant.Server.Internal import Network.Wai.Handler.Warp
import Servant
import Servant.Server.Internal
-- Pretty much stolen/adapted from -- Pretty much stolen/adapted from
-- https://github.com/haskell-servant/HaskellSGMeetup2015/blob/master/examples/authentication-combinator/AuthenticationCombinator.hs -- https://github.com/haskell-servant/HaskellSGMeetup2015/blob/master/examples/authentication-combinator/AuthenticationCombinator.hs

32
servant-examples/hackage/hackage.hs
View file

@ -1,21 +1,21 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
import Control.Applicative {-# LANGUAGE TypeOperators #-}
import Control.Monad import Control.Applicative
import Control.Monad.IO.Class import Control.Monad
import Control.Monad.Trans.Either import Control.Monad.IO.Class
import Data.Aeson import Control.Monad.Trans.Either
import Data.Monoid import Data.Aeson
import Data.Proxy import Data.Monoid
import Data.Text (Text) import Data.Proxy
import GHC.Generics import Data.Text (Text)
import Servant.API import GHC.Generics
import Servant.Client import Servant.API
import Servant.Client
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.IO as T import qualified Data.Text.IO as T
type HackageAPI = type HackageAPI =
"users" :> Get '[JSON] [UserSummary] "users" :> Get '[JSON] [UserSummary]

24
servant-examples/socket-io-chat/socket-io-chat.hs
View file

@ -1,24 +1,24 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeOperators #-}
{-# LANGUAGE TypeOperators #-}
import Data.Monoid ((<>)) import Data.Monoid ((<>))
#if !MIN_VERSION_base(4,8,0) #if !MIN_VERSION_base(4,8,0)
import Control.Applicative((<$>)) import Control.Applicative ((<$>))
#endif #endif
import Network.Wai import Network.EngineIO.Wai
import Servant import Network.Wai
import Network.EngineIO.Wai import Network.Wai.Handler.Warp (run)
import Network.Wai.Handler.Warp (run) import Servant
import qualified Control.Concurrent.STM as STM import qualified Control.Concurrent.STM as STM
import qualified Network.SocketIO as SocketIO import qualified Network.SocketIO as SocketIO
import Chat (eioServer, ServerState (..)) import Chat (ServerState (..), eioServer)
type API = "socket.io" :> Raw type API = "socket.io" :> Raw

20
servant-examples/tutorial/T1.hs
View file

@ -1,19 +1,19 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module T1 where module T1 where
import Data.Aeson import Data.Aeson
import Data.Time.Calendar import Data.Time.Calendar
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Servant import Servant
data User = User data User = User
{ name :: String { name :: String
, age :: Int , age :: Int
, email :: String , email :: String
, registration_date :: Day , registration_date :: Day
} deriving (Eq, Show, Generic) } deriving (Eq, Show, Generic)

24
servant-examples/tutorial/T10.hs
View file

@ -1,18 +1,18 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
module T10 where module T10 where
import Data.ByteString.Lazy (ByteString) import Data.ByteString.Lazy (ByteString)
import Data.Text.Lazy (pack) import Data.Text.Lazy (pack)
import Data.Text.Lazy.Encoding (encodeUtf8) import Data.Text.Lazy.Encoding (encodeUtf8)
import Network.HTTP.Types import Network.HTTP.Types
import Network.Wai import Network.Wai
import Servant import Servant
import Servant.Docs import Servant.Docs
import qualified T3 import qualified T3
type DocsAPI = T3.API :<|> Raw type DocsAPI = T3.API :<|> Raw

20
servant-examples/tutorial/T2.hs
View file

@ -1,19 +1,19 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module T2 where module T2 where
import Data.Aeson import Data.Aeson
import Data.Time.Calendar import Data.Time.Calendar
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Servant import Servant
data User = User data User = User
{ name :: String { name :: String
, age :: Int , age :: Int
, email :: String , email :: String
, registration_date :: Day , registration_date :: Day
} deriving (Eq, Show, Generic) } deriving (Eq, Show, Generic)

28
servant-examples/tutorial/T3.hs
View file

@ -1,15 +1,15 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module T3 where module T3 where
import Control.Monad.Trans.Either import Control.Monad.Trans.Either
import Data.Aeson import Data.Aeson
import Data.List import Data.List
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Servant import Servant
data Position = Position data Position = Position
{ x :: Int { x :: Int
@ -26,9 +26,9 @@ instance FromJSON HelloMessage
instance ToJSON HelloMessage instance ToJSON HelloMessage
data ClientInfo = ClientInfo data ClientInfo = ClientInfo
{ name :: String { name :: String
, email :: String , email :: String
, age :: Int , age :: Int
, interested_in :: [String] , interested_in :: [String]
} deriving (Show, Generic) } deriving (Show, Generic)
@ -36,10 +36,10 @@ instance FromJSON ClientInfo
instance ToJSON ClientInfo instance ToJSON ClientInfo
data Email = Email data Email = Email
{ from :: String { from :: String
, to :: String , to :: String
, subject :: String , subject :: String
, body :: String , body :: String
} deriving (Show, Generic) } deriving (Show, Generic)
instance FromJSON Email instance FromJSON Email

22
servant-examples/tutorial/T4.hs
View file

@ -1,18 +1,18 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
module T4 where module T4 where
import Data.Aeson import Data.Aeson
import Data.Foldable (foldMap) import Data.Foldable (foldMap)
import GHC.Generics import GHC.Generics
import Lucid import Lucid
import Network.Wai import Network.Wai
import Servant import Servant
import Servant.HTML.Lucid import Servant.HTML.Lucid
data Person = Person data Person = Person
{ firstName :: String { firstName :: String

22
servant-examples/tutorial/T5.hs
View file

@ -1,17 +1,17 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
module T5 where module T5 where
import Control.Monad.IO.Class import Control.Monad.IO.Class
import Control.Monad.Trans.Either import Control.Monad.Trans.Either
import Data.Aeson import Data.Aeson
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Servant import Servant
import System.Directory import System.Directory
type IOAPI = "myfile.txt" :> Get '[JSON] FileContent type IOAPI = "myfile.txt" :> Get '[JSON] FileContent

8
servant-examples/tutorial/T6.hs
View file

@ -1,10 +1,10 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module T6 where module T6 where
import Network.Wai import Network.Wai
import Servant import Servant
type API = "code" :> Raw type API = "code" :> Raw

12
servant-examples/tutorial/T7.hs
View file

@ -1,12 +1,12 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module T7 where module T7 where
import Control.Monad.Trans.Either import Control.Monad.Trans.Either
import Control.Monad.Trans.Reader import Control.Monad.Trans.Reader
import Network.Wai import Network.Wai
import Servant import Servant
type ReaderAPI = "a" :> Get '[JSON] Int type ReaderAPI = "a" :> Get '[JSON] Int
:<|> "b" :> Get '[JSON] String :<|> "b" :> Get '[JSON] String

14
servant-examples/tutorial/T8.hs
View file

@ -1,14 +1,14 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module T8 where module T8 where
import Control.Monad.Trans.Either import Control.Monad.Trans.Either
import Data.Aeson import Data.Aeson
import Servant import Servant
import Servant.Client import Servant.Client
import T3 import T3
position :: Int -- ^ value for "x" position :: Int -- ^ value for "x"
-> Int -- ^ value for "y" -> Int -- ^ value for "y"

28
servant-examples/tutorial/T9.hs
View file

@ -1,20 +1,20 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
module T9 where module T9 where
import Control.Applicative import Control.Applicative
import Control.Monad.IO.Class import Control.Monad.IO.Class
import Data.Aeson import Data.Aeson
import Data.Text (Text) import Data.Text (Text)
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Servant import Servant
import Servant.JS import Servant.JS
import Servant.JS.JQuery import Servant.JS.JQuery
import System.Random import System.Random
import qualified Data.Text as T import qualified Data.Text as T
import qualified Language.Javascript.JQuery as JQ import qualified Language.Javascript.JQuery as JQ

2
servant-examples/tutorial/t8-main.hs
View file

@ -1,4 +1,4 @@
import T8 import T8
main :: IO () main :: IO ()
main = run main = run

8
servant-examples/tutorial/tutorial.hs
View file

@ -1,8 +1,9 @@
import Network.Wai import Network.Wai
import Network.Wai.Handler.Warp import Network.Wai.Handler.Warp
import System.Environment import System.Environment
import qualified T1 import qualified T1
import qualified T10
import qualified T2 import qualified T2
import qualified T3 import qualified T3
import qualified T4 import qualified T4
@ -10,7 +11,6 @@ import qualified T5
import qualified T6 import qualified T6
import qualified T7 import qualified T7
import qualified T9 import qualified T9
import qualified T10
app :: String -> (Application -> IO ()) -> IO () app :: String -> (Application -> IO ()) -> IO ()
app n f = case n of app n f = case n of

18
servant-examples/wai-middleware/wai-middleware.hs
View file

@ -1,13 +1,13 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
import Data.Aeson import Data.Aeson
import Data.Text import Data.Text
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Network.Wai.Handler.Warp import Network.Wai.Handler.Warp
import Network.Wai.Middleware.RequestLogger import Network.Wai.Middleware.RequestLogger
import Servant import Servant
data Product = Product data Product = Product
{ name :: Text { name :: Text

2
servant-js/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

28
servant-js/examples/counter.hs
View file

@ -1,19 +1,19 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE TypeOperators #-}
import Control.Concurrent.STM import Control.Concurrent.STM
import Control.Monad.IO.Class import Control.Monad.IO.Class
import Data.Aeson import Data.Aeson
import Data.Proxy import Data.Proxy
import GHC.Generics import GHC.Generics
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import Servant import Servant
import Servant.JS import Servant.JS
import qualified Servant.JS as SJS import qualified Servant.JS as SJS
import qualified Servant.JS.Angular as NG import qualified Servant.JS.Angular as NG
import System.FilePath import System.FilePath
-- * A simple Counter data type -- * A simple Counter data type
newtype Counter = Counter { value :: Int } newtype Counter = Counter { value :: Int }

20
servant-js/src/Servant/JS.hs
View file

@ -1,7 +1,7 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TypeOperators #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : Servant.JS -- Module : Servant.JS
@ -114,13 +114,13 @@ module Servant.JS
, AjaxReq , AjaxReq
) where ) where
import Data.Proxy import Data.Proxy
import Servant.API import Servant.API
import Servant.JS.Angular import Servant.JS.Angular
import Servant.JS.Axios import Servant.JS.Axios
import Servant.JS.Internal import Servant.JS.Internal
import Servant.JS.JQuery import Servant.JS.JQuery
import Servant.JS.Vanilla import Servant.JS.Vanilla
-- | Generate the data necessary to generate javascript code -- | Generate the data necessary to generate javascript code
-- for all the endpoints of an API, as ':<|>'-separated values -- for all the endpoints of an API, as ':<|>'-separated values

12
servant-js/src/Servant/JS/Angular.hs
View file

@ -1,16 +1,16 @@
module Servant.JS.Angular where module Servant.JS.Angular where
import Servant.JS.Internal import Control.Lens
import Control.Lens import Data.List
import Data.List import Data.Monoid
import Data.Monoid import Servant.JS.Internal
-- | Options specific to the angular code generator -- | Options specific to the angular code generator
data AngularOptions = AngularOptions data AngularOptions = AngularOptions
{ serviceName :: String -- ^ When generating code with wrapInService, { serviceName :: String -- ^ When generating code with wrapInService,
-- name of the service to generate -- name of the service to generate
, prologue :: String -> String -> String -- ^ beginning of the service definition , prologue :: String -> String -> String -- ^ beginning of the service definition
, epilogue :: String -- ^ end of the service definition , epilogue :: String -- ^ end of the service definition
} }
-- | Default options for the Angular codegen. Used by 'wrapInService'. -- | Default options for the Angular codegen. Used by 'wrapInService'.

14
servant-js/src/Servant/JS/Axios.hs
View file

@ -1,10 +1,10 @@
module Servant.JS.Axios where module Servant.JS.Axios where
import Servant.JS.Internal import Control.Lens
import Control.Lens import Data.Char (toLower)
import Data.Char (toLower) import Data.List
import Data.List import Data.Monoid
import Data.Monoid import Servant.JS.Internal
-- | Axios 'configuration' type -- | Axios 'configuration' type
-- Let you customize the generation using Axios capabilities -- Let you customize the generation using Axios capabilities
@ -13,9 +13,9 @@ data AxiosOptions = AxiosOptions
-- should be made using credentials -- should be made using credentials
withCredentials :: !Bool withCredentials :: !Bool
-- | the name of the cookie to use as a value for xsrf token -- | the name of the cookie to use as a value for xsrf token
, xsrfCookieName :: !(Maybe String) , xsrfCookieName :: !(Maybe String)
-- | the name of the header to use as a value for xsrf token -- | the name of the header to use as a value for xsrf token
, xsrfHeaderName :: !(Maybe String) , xsrfHeaderName :: !(Maybe String)
} }
-- | Default instance of the AxiosOptions -- | Default instance of the AxiosOptions

8
servant-js/src/Servant/JS/JQuery.hs
View file

@ -1,9 +1,9 @@
module Servant.JS.JQuery where module Servant.JS.JQuery where
import Servant.JS.Internal import Control.Lens
import Control.Lens import Data.List
import Data.List import Data.Monoid
import Data.Monoid import Servant.JS.Internal
-- | Generate javascript functions that use the /jQuery/ library -- | Generate javascript functions that use the /jQuery/ library
-- to make the AJAX calls. Uses 'defCommonGeneratorOptions' -- to make the AJAX calls. Uses 'defCommonGeneratorOptions'

8
servant-js/src/Servant/JS/Vanilla.hs
View file

@ -1,9 +1,9 @@
module Servant.JS.Vanilla where module Servant.JS.Vanilla where
import Servant.JS.Internal import Control.Lens
import Control.Lens import Data.List
import Data.List import Data.Monoid
import Data.Monoid import Servant.JS.Internal
-- | Generate vanilla javascript functions to make AJAX requests -- | Generate vanilla javascript functions to make AJAX requests
-- to your API, using /XMLHttpRequest/. Uses 'defCommonGeneratorOptions' -- to your API, using /XMLHttpRequest/. Uses 'defCommonGeneratorOptions'

22
servant-js/test/Servant/JSSpec.hs
View file

@ -7,18 +7,18 @@
{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-orphans #-}
module Servant.JSSpec where module Servant.JSSpec where
import Data.Either (isRight) import Data.Either (isRight)
import Data.Proxy import Data.Proxy
import Language.ECMAScript3.Parser (parseFromString) import Language.ECMAScript3.Parser (parseFromString)
import Test.Hspec import Test.Hspec
import Servant.API import Servant.API
import Servant.JS import Servant.JS
import qualified Servant.JS.Vanilla as JS import qualified Servant.JS.Angular as NG
import qualified Servant.JS.JQuery as JQ import qualified Servant.JS.Axios as AX
import qualified Servant.JS.Angular as NG import qualified Servant.JS.JQuery as JQ
import qualified Servant.JS.Axios as AX import qualified Servant.JS.Vanilla as JS
import Servant.JSSpec.CustomHeaders import Servant.JSSpec.CustomHeaders
type TestAPI = "simple" :> ReqBody '[JSON,FormUrlEncoded] String :> Post '[JSON] Bool type TestAPI = "simple" :> ReqBody '[JSON,FormUrlEncoded] String :> Post '[JSON] Bool
:<|> "has.extension" :> Get '[FormUrlEncoded,JSON] Bool :<|> "has.extension" :> Get '[FormUrlEncoded,JSON] Bool

14
servant-js/test/Servant/JSSpec/CustomHeaders.hs
View file

@ -8,13 +8,13 @@
module Servant.JSSpec.CustomHeaders where module Servant.JSSpec.CustomHeaders where
import Control.Lens import Control.Lens
import Data.Monoid import Data.Monoid
import Data.Proxy import Data.Proxy
import GHC.TypeLits import GHC.TypeLits
import Servant.API import Servant.API
import Servant.JS import Servant.JS
import Servant.JS.Internal import Servant.JS.Internal
-- | This is a hypothetical combinator that fetches an Authorization header. -- | This is a hypothetical combinator that fetches an Authorization header.
-- The symbol in the header denotes what kind of authentication we are -- The symbol in the header denotes what kind of authentication we are

2
servant-lucid/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

2
servant-mock/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

18
servant-mock/example/main.hs
View file

@ -1,13 +1,13 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}
import Data.Aeson {-# LANGUAGE TypeOperators #-}
import GHC.Generics import Data.Aeson
import Network.Wai.Handler.Warp import GHC.Generics
import Servant import Network.Wai.Handler.Warp
import Servant.Mock import Servant
import Test.QuickCheck.Arbitrary import Servant.Mock
import Test.QuickCheck.Arbitrary
newtype User = User { username :: String } newtype User = User { username :: String }
deriving (Eq, Show, Arbitrary, Generic) deriving (Eq, Show, Arbitrary, Generic)

2
servant-server/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

26
servant-server/example/greet.hs
View file

@ -1,19 +1,19 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE PolyKinds #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
import Data.Aeson import Data.Aeson
import Data.Monoid import Data.Monoid
import Data.Proxy import Data.Proxy
import Data.Text import Data.Text
import GHC.Generics import GHC.Generics
import Network.Wai import Network.Wai
import Network.Wai.Handler.Warp import Network.Wai.Handler.Warp
import Servant import Servant
-- * Example -- * Example

12
servant-server/src/Servant.hs
View file

@ -14,9 +14,9 @@ module Servant (
Proxy(..), Proxy(..),
) where ) where
import Data.Proxy import Data.Proxy
import Servant.API import Servant.API
import Servant.Common.Text import Servant.Common.Text
import Servant.Server import Servant.Server
import Servant.Utils.Links import Servant.Utils.Links
import Servant.Utils.StaticFiles import Servant.Utils.StaticFiles

4
servant-server/src/Servant/Server.hs
View file

@ -77,8 +77,8 @@ module Servant.Server
) where ) where
import Data.Proxy (Proxy) import Data.Proxy (Proxy)
import Network.Wai (Application) import Network.Wai (Application)
import Servant.Server.Internal import Servant.Server.Internal
import Servant.Server.Internal.Enter import Servant.Server.Internal.Enter

2
servant-server/src/Servant/Server/Internal.hs
View file

@ -27,7 +27,7 @@ import Control.Monad.Trans.Either (EitherT)
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString.Lazy as BL
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe (catMaybes, fromMaybe) import Data.Maybe (mapMaybe, fromMaybe)
import Data.String (fromString) import Data.String (fromString)
import Data.String.Conversions (cs, (<>), ConvertibleStrings) import Data.String.Conversions (cs, (<>), ConvertibleStrings)
import Data.Text (Text) import Data.Text (Text)

10
servant-server/src/Servant/Server/Internal/PathInfo.hs
View file

@ -1,10 +1,10 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
module Servant.Server.Internal.PathInfo where module Servant.Server.Internal.PathInfo where
import Data.List (unfoldr) import Data.List (unfoldr)
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import Network.Wai (Request, pathInfo) import Network.Wai (Request, pathInfo)
-- | Like `null . pathInfo`, but works with redundant trailing slashes. -- | Like `null . pathInfo`, but works with redundant trailing slashes.
pathIsEmpty :: Request -> Bool pathIsEmpty :: Request -> Bool

10
servant-server/src/Servant/Server/Internal/Router.hs
View file

@ -1,10 +1,10 @@
module Servant.Server.Internal.Router where module Servant.Server.Internal.Router where
import Data.Map (Map) import Data.Map (Map)
import qualified Data.Map as M import qualified Data.Map as M
import Data.Monoid ((<>)) import Data.Monoid ((<>))
import Data.Text (Text) import Data.Text (Text)
import Network.Wai (Request, pathInfo) import Network.Wai (Request, pathInfo)
import Servant.Server.Internal.PathInfo import Servant.Server.Internal.PathInfo
import Servant.Server.Internal.RoutingApplication import Servant.Server.Internal.RoutingApplication

33
servant-server/src/Servant/Server/Internal/RoutingApplication.hs
View file

@ -5,23 +5,24 @@
module Servant.Server.Internal.RoutingApplication where module Servant.Server.Internal.RoutingApplication where
#if !MIN_VERSION_base(4,8,0) #if !MIN_VERSION_base(4,8,0)
import Control.Applicative (Applicative, (<$>)) import Control.Applicative (Applicative, (<$>))
import Data.Monoid (Monoid, mappend, mempty) import Data.Monoid (Monoid, mappend, mempty)
#endif #endif
import Control.Monad.Trans.Either (EitherT, runEitherT) import Control.Monad.Trans.Either (EitherT, runEitherT)
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString.Lazy as BL
import Data.IORef (newIORef, readIORef, writeIORef) import Data.IORef (newIORef, readIORef,
import Data.Maybe (fromMaybe) writeIORef)
import Data.Monoid ((<>)) import Data.Maybe (fromMaybe)
import Data.String (fromString) import Data.Monoid ((<>))
import Network.HTTP.Types hiding (Header, ResponseHeaders) import Data.String (fromString)
import Network.Wai (Application, Request, Response, import Network.HTTP.Types hiding (Header,
ResponseReceived, ResponseHeaders)
requestBody, import Network.Wai (Application, Request,
responseLBS, Response, ResponseReceived,
strictRequestBody) requestBody, responseLBS,
import Servant.API ((:<|>) (..)) strictRequestBody)
import Servant.API ((:<|>) (..))
import Servant.Server.Internal.ServantErr import Servant.Server.Internal.ServantErr
type RoutingApplication = type RoutingApplication =

8
servant-server/src/Servant/Server/Internal/ServantErr.hs
View file

@ -2,10 +2,10 @@
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
module Servant.Server.Internal.ServantErr where module Servant.Server.Internal.ServantErr where
import qualified Data.ByteString.Char8 as BS import qualified Data.ByteString.Char8 as BS
import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy as LBS
import qualified Network.HTTP.Types as HTTP import qualified Network.HTTP.Types as HTTP
import Network.Wai (responseLBS, Response) import Network.Wai (Response, responseLBS)
data ServantErr = ServantErr { errHTTPCode :: Int data ServantErr = ServantErr { errHTTPCode :: Int
, errReasonPhrase :: String , errReasonPhrase :: String

11
servant-server/src/Servant/Utils/StaticFiles.hs
View file

@ -7,12 +7,13 @@ module Servant.Utils.StaticFiles (
serveDirectory, serveDirectory,
) where ) where
import System.FilePath (addTrailingPathSeparator) import Network.Wai.Application.Static (defaultFileServerSettings,
import Network.Wai.Application.Static (staticApp, defaultFileServerSettings) staticApp)
import Servant.API.Raw (Raw) import Servant.API.Raw (Raw)
import Servant.Server (Server) import Servant.Server (Server)
import System.FilePath (addTrailingPathSeparator)
#if !MIN_VERSION_wai_app_static(3,1,0) #if !MIN_VERSION_wai_app_static(3,1,0)
import Filesystem.Path.CurrentOS (decodeString) import Filesystem.Path.CurrentOS (decodeString)
#endif #endif
-- | Serve anything under the specified directory as a 'Raw' endpoint. -- | Serve anything under the specified directory as a 'Raw' endpoint.

2
servant-server/test/Doctests.hs
View file

@ -1,6 +1,6 @@
module Main where module Main where
import Data.List (isPrefixOf) import Data.List (isPrefixOf)
import System.Directory import System.Directory
import System.FilePath import System.FilePath
import System.FilePath.Find import System.FilePath.Find

8
servant-server/test/Servant/Server/Internal/EnterSpec.hs
View file

@ -3,16 +3,16 @@
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module Servant.Server.Internal.EnterSpec where module Servant.Server.Internal.EnterSpec where
import qualified Control.Category as C import qualified Control.Category as C
import Control.Monad.Reader import Control.Monad.Reader
import Control.Monad.Trans.Either import Control.Monad.Trans.Either
import Data.Proxy import Data.Proxy
import Servant.API import Servant.API
import Servant.Server import Servant.Server
import Test.Hspec (Spec, describe, it) import Test.Hspec (Spec, describe, it)
import Test.Hspec.Wai (get, matchStatus, post, import Test.Hspec.Wai (get, matchStatus, post,
shouldRespondWith, with) shouldRespondWith, with)
spec :: Spec spec :: Spec
spec = describe "module Servant.Server.Enter" $ do spec = describe "module Servant.Server.Enter" $ do

38
servant-server/test/Servant/Utils/StaticFilesSpec.hs
View file

@ -1,27 +1,29 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-orphans #-}
module Servant.Utils.StaticFilesSpec where module Servant.Utils.StaticFilesSpec where
import Control.Exception (bracket) import Control.Exception (bracket)
import Data.Proxy (Proxy(Proxy)) import Data.Proxy (Proxy (Proxy))
import Network.Wai (Application) import Network.Wai (Application)
import System.Directory (getCurrentDirectory, setCurrentDirectory, createDirectory) import System.Directory (createDirectory,
import System.IO.Temp (withSystemTempDirectory) getCurrentDirectory,
import Test.Hspec (Spec, describe, it, around_) setCurrentDirectory)
import Test.Hspec.Wai (with, get, shouldRespondWith) import System.IO.Temp (withSystemTempDirectory)
import Test.Hspec (Spec, around_, describe, it)
import Test.Hspec.Wai (get, shouldRespondWith, with)
import Servant.API (JSON) import Servant.API (JSON)
import Servant.API.Alternative ((:<|>)((:<|>))) import Servant.API.Alternative ((:<|>) ((:<|>)))
import Servant.API.Capture (Capture) import Servant.API.Capture (Capture)
import Servant.API.Get (Get) import Servant.API.Get (Get)
import Servant.API.Raw (Raw) import Servant.API.Raw (Raw)
import Servant.API.Sub ((:>)) import Servant.API.Sub ((:>))
import Servant.Server (Server, serve) import Servant.Server (Server, serve)
import Servant.ServerSpec (Person(Person)) import Servant.ServerSpec (Person (Person))
import Servant.Utils.StaticFiles (serveDirectory) import Servant.Utils.StaticFiles (serveDirectory)
type Api = type Api =
"dummy_api" :> Capture "person_name" String :> Get '[JSON] Person "dummy_api" :> Capture "person_name" String :> Get '[JSON] Person

2
servant/Setup.hs
View file

@ -1,2 +1,2 @@
import Distribution.Simple import Distribution.Simple
main = defaultMain main = defaultMain

4
servant/src/Servant/API.hs
View file

@ -69,8 +69,8 @@ import Servant.API.ContentTypes (Accept (..), FormUrlEncoded,
import Servant.API.Delete (Delete) import Servant.API.Delete (Delete)
import Servant.API.Get (Get) import Servant.API.Get (Get)
import Servant.API.Header (Header (..)) import Servant.API.Header (Header (..))
import Servant.API.HttpVersion (HttpVersion(..)) import Servant.API.HttpVersion (HttpVersion (..))
import Servant.API.IsSecure (IsSecure(..)) import Servant.API.IsSecure (IsSecure (..))
import Servant.API.MatrixParam (MatrixFlag, MatrixParam, import Servant.API.MatrixParam (MatrixFlag, MatrixParam,
MatrixParams) MatrixParams)
import Servant.API.Patch (Patch) import Servant.API.Patch (Patch)

2
servant/src/Servant/API/Delete.hs
View file

@ -4,7 +4,7 @@
{-# OPTIONS_HADDOCK not-home #-} {-# OPTIONS_HADDOCK not-home #-}
module Servant.API.Delete (Delete) where module Servant.API.Delete (Delete) where
import Data.Typeable ( Typeable ) import Data.Typeable (Typeable)
-- | Combinator for DELETE requests. -- | Combinator for DELETE requests.
-- --

2
servant/src/Servant/API/HttpVersion.hs
View file

@ -3,7 +3,7 @@ module Servant.API.HttpVersion
HttpVersion(..) HttpVersion(..)
) where ) where
import Network.HTTP.Types (HttpVersion(..)) import Network.HTTP.Types (HttpVersion (..))
-- $httpversion -- $httpversion
-- --

2
servant/src/Servant/API/IsSecure.hs
View file

@ -4,7 +4,7 @@ module Servant.API.IsSecure
IsSecure(..) IsSecure(..)
) where ) where
import Data.Typeable import Data.Typeable
-- | Was this request made over an SSL connection? -- | Was this request made over an SSL connection?
-- --

2
servant/src/Servant/API/Put.hs
View file

@ -4,7 +4,7 @@
{-# OPTIONS_HADDOCK not-home #-} {-# OPTIONS_HADDOCK not-home #-}
module Servant.API.Put (Put) where module Servant.API.Put (Put) where
import Data.Typeable ( Typeable ) import Data.Typeable (Typeable)
-- | Endpoint for PUT requests, usually used to update a ressource. -- | Endpoint for PUT requests, usually used to update a ressource.
-- The type @a@ is the type of the response body that's returned. -- The type @a@ is the type of the response body that's returned.

2
servant/src/Servant/API/Raw.hs
View file

@ -2,7 +2,7 @@
{-# OPTIONS_HADDOCK not-home #-} {-# OPTIONS_HADDOCK not-home #-}
module Servant.API.Raw where module Servant.API.Raw where
import Data.Typeable (Typeable) import Data.Typeable (Typeable)
-- | Endpoint for plugging in your own Wai 'Application's. -- | Endpoint for plugging in your own Wai 'Application's.
-- --
-- The given 'Application' will get the request as received by the server, potentially with -- The given 'Application' will get the request as received by the server, potentially with

2
servant/src/Servant/API/RemoteHost.hs
View file

@ -4,7 +4,7 @@ module Servant.API.RemoteHost
RemoteHost RemoteHost
) where ) where
import Data.Typeable import Data.Typeable
-- | Provides access to the host or IP address -- | Provides access to the host or IP address
-- from which the HTTP request was sent. -- from which the HTTP request was sent.

2
servant/src/Servant/API/Vault.hs
View file

@ -3,7 +3,7 @@ module Servant.API.Vault
Vault Vault
) where ) where
import Data.Vault.Lazy (Vault) import Data.Vault.Lazy (Vault)
-- $vault -- $vault
-- --

2
servant/test/Doctests.hs
View file

@ -1,6 +1,6 @@
module Main where module Main where
import Data.List (isPrefixOf) import Data.List (isPrefixOf)
import System.Directory import System.Directory
import System.FilePath import System.FilePath
import System.FilePath.Find import System.FilePath.Find

22
servant/test/Servant/API/ContentTypesSpec.hs
View file

@ -12,22 +12,22 @@ import Data.Monoid
#endif #endif
import Control.Arrow import Control.Arrow
import Data.Aeson import Data.Aeson
import Data.ByteString.Char8 (ByteString, append, pack)
import qualified Data.ByteString.Lazy as BSL
import Data.Either import Data.Either
import Data.Function (on) import Data.Function (on)
import Data.List (maximumBy)
import Data.Maybe (fromJust, isJust, isNothing)
import Data.Proxy import Data.Proxy
import Data.ByteString.Char8 (ByteString, append, pack) import Data.String (IsString (..))
import qualified Data.ByteString.Lazy as BSL import Data.String.Conversions (cs)
import Data.List (maximumBy) import qualified Data.Text as TextS
import Data.Maybe (fromJust, isJust, isNothing) import qualified Data.Text.Lazy as TextL
import Data.String (IsString (..))
import Data.String.Conversions (cs)
import qualified Data.Text as TextS
import qualified Data.Text.Lazy as TextL
import GHC.Generics import GHC.Generics
import Network.URL (exportParams, importParams) import Network.URL (exportParams, importParams)
import Test.Hspec import Test.Hspec
import Test.QuickCheck import Test.QuickCheck
import Test.QuickCheck.Instances () import Test.QuickCheck.Instances ()
import Servant.API.ContentTypes import Servant.API.ContentTypes