dac560c...master · typeable/servant-reflex

.gitignore+2

since splitsnapshots

unifiedsplit

@@ -7,3 +7,5 @@ log

7*.stats

8out

9/.stack-work/

10+TAGS

11+dist-newstyle

.travis.yml+1

@@ -12,5 +12,6 @@ before_script:

12

13script:

14 - nix-build travis.nix -A build

15+ - nix-build travis.nix -A buildGhc

15 - nix-build travis.nix -A testserver

16 - nix-build travis.nix -A testserver

16 - nix-build travis.nix -A testresults

17 - nix-build travis.nix -A testresults

README.md+1−1

@@ -7,7 +7,7 @@

7Keeping your frontend in sync with your API server can be difficult - when the

8API changes its input parameters or return type, XHR requests from the

9frontend will fail at runtime. If your API is defined by

10−[servant](haskell-servant.readthedocs.io) combinators, you can use

10+[servant](https://haskell-servant.readthedocs.io) combinators, you can use

11`servant-reflex` to share the API between the server and frontend.

12Syncronization between is checked at compile time, and rather than building XHR

13requests by hand, API endpoints are available behind `reflex`'s FRP semantics.

default.nix+9−17

@@ -1,28 +1,20 @@

1−{ mkDerivation, aeson, base, bytestring, case-insensitive

1+{ mkDerivation, base, bytestring, case-insensitive, containers

2−, containers, data-default, exceptions, ghcjs-dom, http-api-data

2+, data-default, exceptions, ghcjs-dom, http-api-data, http-media

3−, http-media, jsaddle, mtl, network-uri, reflex, reflex-dom-core

3+, jsaddle, mtl, network-uri, reflex, reflex-dom, reflex-dom-core

4−, safe, scientific, servant, servant-auth, stdenv

4+, safe, servant, servant-auth, stdenv, string-conversions, text

5−, string-conversions, text, transformers

5+, transformers

6}:

7mkDerivation {

8 pname = "servant-reflex";

9− version = "0.3.5";

9+ version = "0.3.6";

10− src = builtins.filterSource

11− (path: type:

12− baseNameOf path != "result"

13− && baseNameOf path != "nix"

14− ) ./.;

10+ src = ./.;

15− configureFlags = [ "-fexample" ];

16 isLibrary = true;

11 isLibrary = true;

17 isExecutable = true;

12 isExecutable = true;

18 libraryHaskellDepends = [

13 libraryHaskellDepends = [

19 base bytestring case-insensitive containers data-default exceptions

14 base bytestring case-insensitive containers data-default exceptions

20 ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex

15 ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex

21− reflex-dom-core safe servant servant-auth string-conversions text

16+ reflex-dom reflex-dom-core safe servant servant-auth string-conversions

22− transformers

17+ text transformers

23− ];

24− executableHaskellDepends = [

25− aeson base reflex reflex-dom-core scientific servant text

26 ];

18 ];

27 description = "servant API generator for reflex apps";

19 description = "servant API generator for reflex apps";

28 license = stdenv.lib.licenses.bsd3;

20 license = stdenv.lib.licenses.bsd3;

exec/Example.hs+2−1

@@ -21,7 +21,8 @@ import Servant.API

21import API

22import Data.Proxy

23import Text.Read (readMaybe)

24−import Reflex.Dom.Core hiding (run)

24+import Reflex.Dom.Core hiding (run, mainWidget)

25+import Reflex.Dom (mainWidget)

25------------------------------------------------------------------------------

26------------------------------------------------------------------------------

26import Servant.Reflex

27import Servant.Reflex

27import Servant.Reflex.Multi

28import Servant.Reflex.Multi

nix/reflex-platform.nix+2−2

@@ -1,7 +1,7 @@

1let

2− rev = "df0bdcca5eb2a3236ec0496e4430d91876b29cf5";

2+ rev = "1aba6f367982bd6dd78ec2fda75ab246a62d32c5" ;

3in import (builtins.fetchTarball

4 {

5 url = "https://github.com/reflex-frp/reflex-platform/archive/${rev}.tar.gz";

6− sha256 = "1ja3vkq9px8f9iyiazq44mamaahgiphi9l236pvzbl5jvhi5c4qr";

6+ sha256 = "137vg6i8yy4lp6rz4wbvvhfcc9d9qf7j1b3fnng3r7sj63k7j664" ;

7 }) {}

servant-reflex.cabal+5−4

@@ -1,5 +1,5 @@

1Name: servant-reflex

2−Version: 0.3.5

2+Version: 0.3.6

3Synopsis: servant API generator for reflex apps

4Description: Generate reflex-compatible client functions from servant API descriptions

5License: BSD3

@@ -36,10 +36,10 @@ library

36 jsaddle >= 0.8 && < 0.10,

37 mtl >= 2.2.1 && < 2.3,

38 network-uri >= 2.6 && < 2.7,

39− reflex >= 0.5 && < 0.8,

39+ reflex >= 0.5 && < 0.9,

40− reflex-dom-core >= 0.6 && < 0.7,

40+ reflex-dom-core >= 0.6 && < 0.8,

41 safe >= 0.3.9 && < 0.4,

42− servant >= 0.16 && < 0.18,

42+ servant >= 0.16 && < 0.19,

43 servant-auth >= 0.2.1 && < 0.4,

44 string-conversions >= 0.4 && < 0.5,

45 text >= 1.2 && < 1.3,

@@ -61,6 +61,7 @@ executable example

61 base,

62 scientific,

63 servant,

64+ reflex-dom,

64 reflex-dom-core,

65 reflex-dom-core,

65 text

66 text

66 default-language: Haskell2010

67 default-language: Haskell2010

src/Servant/Common/BaseUrl.hs+5−1

@@ -1,4 +1,5 @@

1{-# LANGUAGE ConstraintKinds #-}

2+{-# LANGUAGE CPP #-}

2{-# LANGUAGE DeriveDataTypeable #-}

3{-# LANGUAGE DeriveDataTypeable #-}

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE FlexibleContexts #-}

5{-# LANGUAGE FlexibleContexts #-}

@@ -31,8 +32,11 @@ import Reflex

31import Reflex.Dom.Core

32import Reflex.Dom.Core

32import Text.Read

33import Text.Read

33

34

34−

35+#if !MIN_VERSION_reflex_dom_core(0,7,0)

35type SupportsServantReflex t m = (Reflex t, TriggerEvent t m, PerformEvent t m, HasWebView (Performable m), MonadJSM (Performable m))

36type SupportsServantReflex t m = (Reflex t, TriggerEvent t m, PerformEvent t m, HasWebView (Performable m), MonadJSM (Performable m))

37+#else

38+type SupportsServantReflex t m = (Reflex t, TriggerEvent t m, PerformEvent t m, MonadJSM (Performable m))

39+#endif

36

40

37-- | URI scheme to use

41-- | URI scheme to use

38data Scheme =

42data Scheme =

src/Servant/Common/Req.hs+2−1

@@ -298,7 +298,9 @@ performRequests reqMeth rs reqHost opts trigger = do

298performSomeRequestsAsync

299 :: (MonadIO (Performable m),

300 MonadJSM (Performable m),

301+#if !MIN_VERSION_reflex_dom_core(0,7,0)

301 HasWebView (Performable m),

302 HasWebView (Performable m),

303+#endif

302 PerformEvent t m,

304 PerformEvent t m,

303 TriggerEvent t m,

305 TriggerEvent t m,

304 Traversable f,

306 Traversable f,

@@ -428,4 +430,3 @@ builderToText = TE.decodeUtf8 . BL.toStrict . Builder.toLazyByteString

428

430

429escape :: T.Text -> T.Text

431escape :: T.Text -> T.Text

430escape = T.pack . N.escapeURIString (not . N.isReserved) . T.unpack . TE.decodeUtf8 . BL.toStrict . Builder.toLazyByteString . toEncodedUrlPiece

432escape = T.pack . N.escapeURIString (not . N.isReserved) . T.unpack . TE.decodeUtf8 . BL.toStrict . Builder.toLazyByteString . toEncodedUrlPiece

431−

src/Servant/Reflex.hs+34−20

@@ -39,34 +39,36 @@ module Servant.Reflex

39

40------------------------------------------------------------------------------

41import Control.Applicative

42−import Data.Monoid ((<>))

43−import qualified Data.Set as Set

44−import qualified Data.Text.Encoding as E

45import qualified Data.CaseInsensitive as CI

42import qualified Data.CaseInsensitive as CI

46import Data.Functor.Identity

43import Data.Functor.Identity

47−import Data.Proxy (Proxy (..))

48import qualified Data.Map as Map

44import qualified Data.Map as Map

45+import Data.Monoid ((<>))

46+import Data.Proxy (Proxy (..))

47+import qualified Data.Set as Set

49import Data.Text (Text)

48import Data.Text (Text)

50import qualified Data.Text as T

49import qualified Data.Text as T

50+import qualified Data.Text.Encoding as E

51import GHC.Exts (Constraint)

52import GHC.TypeLits (KnownSymbol, symbolVal)

53−import Servant.API ((:<|>)(..),(:>), BasicAuth,

53+import Servant.API ((:<|>) (..), (:>), BasicAuth,

54− BasicAuthData, BuildHeadersTo(..),

54+ BasicAuthData, BuildHeadersTo (..),

55− Capture, contentType, Header,

55+ Capture, Header, Headers (..),

56− Headers(..), HttpVersion, IsSecure,

56+ HttpVersion, IsSecure,

57− MimeRender(..), MimeUnrender,

57+ MimeRender (..), MimeUnrender,

58− NoContent, QueryFlag, QueryParam,

58+ NoContent, QueryFlag, QueryParam',

59− QueryParams, Raw, ReflectMethod(..),

59+ QueryParams, Raw, ReflectMethod (..),

60 RemoteHost, ReqBody,

61− ToHttpApiData(..), Vault, Verb)

61+ ToHttpApiData (..), Vault, Verb,

62+ contentType)

63+import Servant.API.Description (Summary)

62import qualified Servant.Auth as Auth

64import qualified Servant.Auth as Auth

63

65

64import Reflex.Dom.Core (Dynamic, Event, Reflex,

66import Reflex.Dom.Core (Dynamic, Event, Reflex,

65− XhrRequest(..),

67+ XhrRequest (..), XhrResponse (..),

66− XhrResponseHeaders(..),

68+ XhrResponseHeaders (..),

67− XhrResponse(..), attachPromptlyDynWith, constDyn, ffor, fmapMaybe,

69+ attachPromptlyDynWith, constDyn, ffor,

70+ fmapMaybe, leftmost,

68− leftmost, performRequestsAsync,

71+ performRequestsAsync)

69− )

70------------------------------------------------------------------------------

72------------------------------------------------------------------------------

71import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,

73import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,

72 showBaseUrl,

74 showBaseUrl,

@@ -327,6 +329,19 @@ instance HasClient t m sublayout tag

327 clientWithRouteAndResultHandler Proxy =

329 clientWithRouteAndResultHandler Proxy =

328 clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)

330 clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)

329

331

332+-- | Using a 'Summary' combinator in your API doesn't affect the client

333+-- functions.

334+instance (HasClient t m sublayout tag, KnownSymbol sym)

335+ => HasClient t m (Summary sym :> sublayout) tag where

336+

337+ type Client t m (Summary sym :> sublayout) tag =

338+ Client t m sublayout tag

339+

340+ clientWithRouteAndResultHandler Proxy =

341+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)

342+

343+

344+

330

345

331-- | If you use a 'QueryParam' in one of your endpoints in your API,

346-- | If you use a 'QueryParam' in one of your endpoints in your API,

332-- the corresponding querying function will automatically take

347-- the corresponding querying function will automatically take

@@ -355,9 +370,9 @@ instance HasClient t m sublayout tag

355-- > -- 'getBooksBy Nothing' for all books

370-- > -- 'getBooksBy Nothing' for all books

356-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov

371-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov

357instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)

372instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)

358− => HasClient t m (QueryParam sym a :> sublayout) tag where

373+ => HasClient t m (QueryParam' mods sym a :> sublayout) tag where

359

374

360− type Client t m (QueryParam sym a :> sublayout) tag =

375+ type Client t m (QueryParam' mods sym a :> sublayout) tag =

361 Dynamic t (QParam a) -> Client t m sublayout tag

376 Dynamic t (QParam a) -> Client t m sublayout tag

362

377

363 -- if mparam = Nothing, we don't add it to the query string

378 -- if mparam = Nothing, we don't add it to the query string

@@ -607,4 +622,3 @@ type family HasCookieAuth xs :: Constraint where

607 HasCookieAuth '[] = CookieAuthNotEnabled

622 HasCookieAuth '[] = CookieAuthNotEnabled

608

623

609class CookieAuthNotEnabled

624class CookieAuthNotEnabled

610−

src/Servant/Reflex/Multi.hs+35−22

@@ -37,28 +37,30 @@ module Servant.Reflex.Multi (

37 ) where

38

39------------------------------------------------------------------------------

40−import Control.Applicative (liftA2)

40+import Control.Applicative (liftA2)

41−import Data.Functor.Compose (Compose (..), getCompose)

41+import Data.Functor.Compose (Compose (..), getCompose)

42−import Data.Proxy (Proxy (..))

42+import Data.Proxy (Proxy (..))

43−import qualified Data.Set as Set

43+import qualified Data.Set as Set

44−import Data.Text (Text)

44+import Data.Text (Text)

45−import qualified Data.Text as T

45+import qualified Data.Text as T

46−import qualified Data.Text.Encoding as E

46+import qualified Data.Text.Encoding as E

47−import GHC.TypeLits (KnownSymbol, symbolVal)

47+import GHC.TypeLits (KnownSymbol, symbolVal)

48−import Servant.API ((:<|>) (..), (:>), BasicAuth,

48+import Servant.API ((:<|>) (..), (:>), BasicAuth,

49− BasicAuthData, BuildHeadersTo (..),

49+ BasicAuthData, BuildHeadersTo (..),

50− Capture, Header, Headers (..),

50+ Capture, Header, Headers (..),

51− HttpVersion, IsSecure, MimeRender (..),

51+ HttpVersion, IsSecure,

52+ MimeRender (..), MimeUnrender,

52− MimeUnrender, NoContent, QueryFlag,

53+ NoContent, QueryFlag, QueryParam,

53− QueryParam, QueryParams, Raw,

54+ QueryParams, Raw, ReflectMethod (..),

54− ReflectMethod (..), RemoteHost,

55+ RemoteHost, ReqBody,

55− ReqBody, ToHttpApiData (..), Vault,

56+ ToHttpApiData (..), Vault, Verb,

56− Verb, contentType)

57+ contentType)

57−

58+import Servant.API.Description (Summary)

59+

58−import Reflex.Dom.Core (Dynamic, Event, Reflex,

60+import Reflex.Dom.Core (Dynamic, Event, Reflex,

59− XhrRequest (..),

61+ XhrRequest (..),

60− XhrResponseHeaders (..),

62+ XhrResponseHeaders (..),

61− attachPromptlyDynWith, constDyn)

63+ attachPromptlyDynWith, constDyn)

62------------------------------------------------------------------------------

64------------------------------------------------------------------------------

63import Servant.Common.BaseUrl (BaseUrl (..), Scheme (..),

65import Servant.Common.BaseUrl (BaseUrl (..), Scheme (..),

64 SupportsServantReflex)

66 SupportsServantReflex)

@@ -240,6 +242,17 @@ instance HasClientMulti t m sublayout f tag

240 clientWithRouteMulti (Proxy :: Proxy sublayout) q f tag

242 clientWithRouteMulti (Proxy :: Proxy sublayout) q f tag

241

243

242

244

245+------------------------------------------------------------------------------

246+instance (HasClientMulti t m sublayout f tag, KnownSymbol sym)

247+ => HasClientMulti t m (Summary sym :> sublayout) f tag where

248+

249+ type ClientMulti t m (Summary sym :> sublayout) f tag =

250+ ClientMulti t m sublayout f tag

251+

252+ clientWithRouteMulti Proxy q f tag =

253+ clientWithRouteMulti (Proxy :: Proxy sublayout) q f tag

254+

255+

243------------------------------------------------------------------------------

256------------------------------------------------------------------------------

244instance (KnownSymbol sym,

257instance (KnownSymbol sym,

245 ToHttpApiData a,

258 ToHttpApiData a,

travis.nix+1

@@ -48,6 +48,7 @@ in

48 inherit reflexPlatform ghcPkgs ghcjsPkgs;

49

50 build = ghcjsPkgs.servant-reflex;

51+ buildGhc = ghcPkgs.servant-reflex;

51 testserver = ghcPkgs.testserver;

52 testserver = ghcPkgs.testserver;

52 testdriver = ghcPkgs.testdriver;

53 testdriver = ghcPkgs.testdriver;

53 inherit testresults;

54 inherit testresults;