on fa2a523 help sign in
27 files changed+1015−85
since splitsnapshots
unifiedsplit
.gitmodules−12 .travis.yml+8−39 default.nix+34 deps/http-api-data−1 deps/reflex-platform−1 deps/servant−1 deps/servant-snap−1 exec/API.hs+4−1 exec/Example.hs+157−17 nix.conf+3 nix/reflex-platform.nix+9 nix/servant-reflex.nix+24 nix/testdriver.nix+3 nix/testresults.nix+22 nix/testserver.nix+25 release.nix+27 servant-reflex.cabal+7 shell.nix+3 src/Servant/Reflex/RequestAPI.hs+567 testdriver/default.nix+16 testdriver/shell.nix+1 testdriver/test/Servant/ReflexSpec.hs+1−1 testserver/API.hs+72−1 testserver/Main.hs+16−10 testserver/default.nix+14 testserver/shell.nix+1 testserver/testserver.cabal+1
.gitmodules−12
@@ -1,12 +0,0 @@
1−[submodule "deps/http-api-data"]
2− path = deps/http-api-data
3− url = https://github.com/fizruk/http-api-data
4−[submodule "deps/servant"]
5− path = deps/servant
6− url = https://github.com/haskell-servant/servant
7−[submodule "deps/servant-snap"]
8− path = deps/servant-snap
9− url = https://github.com/haskell-servant/servant-snap
10−[submodule "deps/reflex-platform"]
11− path = deps/reflex-platform
12− url = https://github.com/reflex-frp/reflex-platform
.travis.yml+8−39
@@ -1,53 +1,22 @@
1−sudo: required
2−
3−before_cache:
4− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
5− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
6−
7−addons:
8− apt:
9− - phantomjs
10−
11−matrix:
12− include:
13− - env: CABALVER=1.24 GHCVER=7.10.3
14− compiler: ": #GHC 7.10.3"
15− addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.3], sources: [hvr-ghc]}}
16− - env: CABALVER=1.24 GHCVER=8.0.1
17− compiler: ": #GHC 8.0.1"
18− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
1+language: nix
192
3+cache: false
204
215
226before_install:
237 - unset CC
24− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
25− - git submodule update --init --recursive
268
279install:
28− - cabal --version
29− - BENCH=${BENCH---enable-benchmarks}
30− - TEST=${TEST---enable-tests}
31− - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
32− - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
33− then
34− zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
35− $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
36− fi
37− - travis_retry cabal update -v
38− - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
39− - deps/reflex-platform/work-on ./overrides-ghc.nix ./testserver --command "cd testserver && cabal configure -fExample && cabal build"
40− - deps/reflex-platform/work-on ghc ./testdriver --command "cd testdriver && cabal configure && cabal build"
41− - cd testserver && dist/build/back/back -p 8000 &
42− - sleep 3
43− - phantomjs --webdriver=127.0.0.1:4444 &
44− - sleep 3
4510
4611script:
12+ - git clone https://github.com/reflex-frp/reflex-platform
13+ - cd reflex-platform && sudo echo "Yes" | ./try-reflex --command "exit 0"
14+ - strace nix build -f ../release.nix servant-reflex
15+
16+ - nix build -f ./release.nix servant-reflex --substituters https://cache.nixos.org --substituters https://nixcache.reflex-frp.org
17+ - nix build -f ./release.nix testresults
4718 - git config --global user.email "travis-ci@example.com"
4819 - git config --global user.name "Travis-CI"
49− - ./build.sh
50− # - testdriver/dist/build/spec/spec
5120
5221cache:
5322 directories:
default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ mkDerivation, aeson, base, bytestring, case-insensitive
2+, containers, data-default, exceptions, generic-lens, ghcjs-dom, http-api-data
3+, http-media, jsaddle, mtl, network-uri, reflex, reflex-dom
4+, reflex-dom-core, safe, scientific, servant, servant-auth, stdenv
5+, string-conversions, text, transformers
6+}:
7+mkDerivation {
8+ pname = "servant-reflex";
9+ version = "0.3.3";
10+ # src = ./.;
11+ src = builtins.filterSource
12+ (path: type:
13+ baseNameOf path != "result"
14+ && baseNameOf path != "nix"
15+ # baseNameOf (toString path) == "src" ||
16+ # baseNameOf (toString path) == "exec" ||
17+ # baseNameOf (toString path) == "servant-reflex.cabal"
18+
19+ ) ./.;
20+ configureFlags = [ "-fexample" ];
21+ isLibrary = true;
22+ isExecutable = true;
23+ libraryHaskellDepends = [
24+ base bytestring case-insensitive containers data-default exceptions
25+ generic-lens ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex
26+ reflex-dom-core safe servant servant-auth string-conversions text
27+ transformers
28+ ];
29+ executableHaskellDepends = [
30+ aeson base reflex reflex-dom scientific servant text
31+ ];
32+ description = "Servant reflex API generator";
33+ license = stdenv.lib.licenses.bsd3;
34+}
deps/http-api-datadeleted−1

Submodule changed.

deps/reflex-platformdeleted−1

Submodule changed.

deps/servantdeleted−1

Submodule changed.

deps/servant-snapdeleted−1

Submodule changed.

exec/API.hs+4−1
@@ -31,6 +31,7 @@ instance FromJSON Answer where
3131-- | API spec for server, client, and docs
3232type API = "getunit" :> Get '[JSON] ()
3333 :<|> "getint" :> Get '[JSON] Int
34+ :<|> "dblint" :> Capture "anint" Int :> Get '[JSON] Int
3435 :<|> "sayhi" :> QueryParam "username" Text
3536 :> QueryParams "greetings" Text
3637 :> QueryFlag "gusto"
@@ -39,7 +40,9 @@ type API = "getunit" :> Get '[JSON] ()
3940 :> Post '[JSON] Double
4041 :<|> "a" :> "b" :> QueryFlag "gusto" :> Get '[JSON] Text
4142 :<|> "qna" :> ReqBody '[JSON] Question
42− :> Post '[JSON] Answer
43+ :> Header "qnum" Int
44+ :> Header "is-favorite" Bool
45+ :> Post '[JSON] (Headers '[Header "anum" Int, Header "was-favorite" Bool] Answer)
4346 :<|> "secret" :> BasicAuth "realm" () :> Get '[JSON] Int
4447 :<|> Raw
4548
exec/Example.hs+157−17
@@ -5,6 +5,8 @@
55{-# LANGUAGE RankNTypes #-}
66{-# LANGUAGE RecursiveDo #-}
77{-# LANGUAGE ScopedTypeVariables #-}
8+{-# LANGUAGE TypeApplications #-}
9+{-# LANGUAGE TypeOperators #-}
810
911module Main where
1012
@@ -25,16 +27,153 @@ import Reflex.Dom hiding (run)
2527------------------------------------------------------------------------------
2628import Servant.Reflex
2729import Servant.Reflex.Multi
30+import qualified Servant.Reflex.RequestAPI as SR
2831
2932
3033api :: Proxy API
3134api = Proxy
3235
36+type MyAPI =
37+ "getunit" :> Get '[JSON] ()
38+ :<|> "getint" :> Get '[JSON] Int
39+ :<|> "dblint" :> Capture "anint" Int :> Get '[JSON] Int
40+ :<|> "sayhi" :> QueryParam "username" Text
41+ :> QueryParams "greetings" Text
42+ :> QueryFlag "gusto"
43+ :> Get '[JSON] Text
44+ :<|> "double" :> ReqBody '[JSON] Double
45+ :> Post '[JSON] Double
46+ :<|> "a" :> "b" :> QueryFlag "gusto" :> Get '[JSON] Text
47+ :<|> "qna" :> ReqBody '[JSON] Question
48+ :> Header "qnum" Int
49+ :> Header "is-favorite" Bool
50+ :> Post '[JSON] (Headers '[Header "anum" Int, Header "was-favorite" Bool] Answer)
51+ :<|> "secret" :> BasicAuth "realm" () :> Get '[JSON] Int
52+
3353main :: IO ()
3454main = mainWidget $ do
55+ divClass "example-tuple" runTuple
3556 divClass "example-base" run
3657 divClass "example-multi" runMulti
3758
59+hiWidget :: (SupportsServantReflex t m,
60+ DomBuilder t m,
61+ DomBuilderSpace m ~ GhcjsDomSpace,
62+ PostBuild t m) => m (Dynamic t (Maybe Text),
63+ Dynamic t [Text],
64+ Dynamic t Bool,
65+ Event t ())
66+hiWidget = do
67+ text "Name"
68+ el "br" $ return ()
69+ inp :: Dynamic t Text <- fmap value $ divClass "name-input" $ (textInput def)
70+ let checkedName = fmap (\i -> bool (Just i) Nothing (T.null i)) inp
71+ el "br" $ return ()
72+
73+ text "Greetings (space-separated)"
74+ el "br" $ return ()
75+ greetings <- fmap (fmap T.words . value) $
76+ divClass "greetings-input" $ (textInput def)
77+
78+ el "br" $ return ()
79+
80+ gusto <- fmap value $ divClass "gusto-input" $ checkbox False def
81+
82+ el "br" $ return ()
83+ sayHiClicks :: Event t () <- divClass "hi-button" $ button "Say hi"
84+ return (checkedName, greetings, gusto, sayHiClicks)
85+
86+
87+readWidget :: (SupportsServantReflex t m,
88+ DomBuilder t m,
89+ DomBuilderSpace m ~ GhcjsDomSpace,
90+ PostBuild t m,
91+ Read a
92+ ) => m (Dynamic t (Maybe a))
93+readWidget = fmap (readMaybe . T.unpack) . value <$> textInput def
94+
95+readWidget' :: (SupportsServantReflex t m,
96+ DomBuilder t m,
97+ DomBuilderSpace m ~ GhcjsDomSpace,
98+ PostBuild t m,
99+ Read a
100+ ) => a -> m (Dynamic t a)
101+readWidget' d = fmap (fromMaybe d . readMaybe . T.unpack) . value <$> textInput def
102+
103+basicAuthWidget :: (SupportsServantReflex t m,
104+ DomBuilder t m,
105+ DomBuilderSpace m ~ GhcjsDomSpace,
106+ PostBuild t m
107+ ) => m (Dynamic t BasicAuthData)
108+basicAuthWidget = do
109+ un <- fmap value $ text "Username" >> textArea def
110+ pw <- fmap value $ text "Unhidden PW" >> textArea def
111+ return $ BasicAuthData <$> fmap T.encodeUtf8 un <*> fmap T.encodeUtf8 pw
112+
113+
114+runTuple :: forall t m. (SupportsServantReflex t m,
115+ DomBuilder t m,
116+ DomBuilderSpace m ~ GhcjsDomSpace,
117+ MonadFix m,
118+ PostBuild t m,
119+ MonadHold t m) => m ()
120+runTuple = do
121+ el "h1" (text "Tuple API")
122+ url <- baseUrlWidget
123+
124+ let (getUnit :<|> getInt :<|> dblInt :<|> sayHi :<|> dbl :<|> ab :<|> question :<|> secret :<|> _) =
125+ SR.clientR (Proxy @API) (Proxy @m) (Proxy @t) (Proxy @[]) url
126+
127+ u <- divClass "demo-group" $ do
128+ unitBtn <- button "get unit"
129+ getUnit (fmap (:[]) unitBtn)
130+
131+ (giR, diR) <- divClass "demo-group" $ do
132+ int <- readWidget
133+ getIntBtn <- button "get int"
134+ dblIntBtn <- button "double int"
135+ gi <- getInt (fmap (:[]) getIntBtn)
136+ di <- dblInt (fmap (:[]) (fmapMaybe id $ tagPromptlyDyn int dblIntBtn))
137+ return (gi, di)
138+
139+ hiResp <- divClass "demo-group" $ do
140+ (nm, greets, gusto, hiClicks) <- hiWidget
141+ let hiReqs = tagPromptlyDyn ((,,) <$> nm <*> greets <*> gusto) hiClicks
142+ sayHi (fmap (:[]) hiReqs)
143+
144+ dblResp <- divClass "demo-group" $ do
145+ dblInput <- readWidget
146+ dblBtn <- button "double double"
147+ dbl $ (fmap (:[])) $ fmapMaybe id $ tagPromptlyDyn dblInput dblBtn
148+
149+ twoPathResp <- divClass "demo-group" $ do
150+ twoPathInp <- text "Two Path" >> checkbox False def
151+ ab (fmap (:[]) $ updated (value twoPathInp))
152+
153+ qnaR <- divClass "demo-group" $ do
154+ q <- fmap Question . value <$> textInput def
155+ i <- readWidget' 0
156+ f <- readWidget' False
157+ question (fmap (:[]) (updated $ (,,) <$> q <*> i <*> f))
158+
159+ secretR <- divClass "demo-group" $ do
160+ ba <- basicAuthWidget
161+ sBtn <- button "Get secret"
162+ secret (fmap pure $ tagPromptlyDyn ba sBtn)
163+
164+ divClass "demo-group" $ do
165+ el "div" $ text "responses"
166+ dynText =<< holdDyn "No responses yet"
167+ (leftmost [ tshow <$> u , tshow <$> giR
168+ , tshow <$> diR
169+ , tshow <$> hiResp , tshow <$> dblResp
170+ , tshow <$> twoPathResp
171+ , T.concat . fmap (either tshow (\x -> tshow (tshow (getHeaders x), tshow (getResponse x)))) <$> qnaR
172+ , tshow <$> secretR
173+ ])
174+
175+ return ()
176+
38177
39178runMulti :: forall t m. (SupportsServantReflex t m,
40179 DomBuilder t m,
@@ -45,7 +184,7 @@ runMulti :: forall t m. (SupportsServantReflex t m,
45184runMulti = do
46185 url <- baseUrlWidget
47186 el "br" blank
48− let (_ :<|> _ :<|> sayHi :<|> dbl :<|> _ :<|> _ :<|> _ :<|> _ ) =
187+ let (_ :<|> _ :<|> _ :<|> sayHi :<|> dbl :<|> _ :<|> _ :<|> _ :<|> _ ) =
49188 clientA api (Proxy :: Proxy m) (Proxy :: Proxy []) (Proxy :: Proxy Int) url
50189
51190 num :: Dynamic t (Either Text Double) <- fmap (note "No read" . readMaybe . T.unpack) . value <$> textInput def
@@ -97,9 +236,9 @@ run = mdo
97236
98237 -- Name the computed API client functions
99238 let tweakRequest = ClientOptions $ \r -> do
100− putStrLn ("Got req: " ++ show r)
239+ -- putStrLn ("Got req: " ++ show r)
101240 return $ r & withCredentials .~ True
102− let (getUnit :<|> getInt :<|> sayhi :<|> dbl
241+ let (getUnit :<|> getInt :<|> dblInt :<|> sayhi :<|> dbl
103242 :<|> multi :<|> qna :<|> secret :<|> doRaw) =
104243 clientWithOpts api (Proxy :: Proxy m) (Proxy :: Proxy Int) url tweakRequest
105244
@@ -159,7 +298,7 @@ run = mdo
159298 holdDyn "(no errors)" (fmapMaybe reqFailure (dblResp))
160299 el "br" (return ())
161300 divClass "double-result" $ el "p" $ dynText =<<
162− holdDyn "No number yet" (fmap tShow $
301+ holdDyn "No number yet" (fmap tshow $
163302 fmapMaybe reqSuccess (dblResp))
164303 return dblBtn
165304
@@ -168,7 +307,7 @@ run = mdo
168307 b <- value <$> checkbox False def
169308 mpGo <- button "Test"
170309 multiResp <- multi b (tag (current reqCount) mpGo)
171− dynText =<< holdDyn "No res yet" (fmap tShow $
310+ dynText =<< holdDyn "No res yet" (fmap tshow $
172311 fmapMaybe reqSuccess $
173312 (multiResp))
174313 return mpGo
@@ -182,14 +321,15 @@ run = mdo
182321 txt <- value <$> textInput def
183322 ev <- fmap (1 <$) $ button "Question"
184323 let dQ = Right . Question <$> traceDyn "will send: " txt
185− rr <- qna dQ ev
324+ -- rr <- qna dQ ev _ _
186325 el "p" $
187− dynText =<< holdDyn "No Answer" (unAnswer <$> fmapMaybe reqSuccess rr)
326+ return ()
327+ -- dynText =<< holdDyn "No Answer" (unAnswer <$> fmapMaybe reqSuccess rr)
188328
189329 divClass "demo-group" $ do
190330 un <- fmap value $ text "Username" >> textArea def
191331 pw <- fmap value $ text "Unhidden PW" >> textArea def
192− let ba :: Dynamic t (BasicAuthData ) = BasicAuthData
332+ let ba :: Dynamic t BasicAuthData = BasicAuthData
193333 <$> fmap T.encodeUtf8 un
194334 <*> fmap T.encodeUtf8 pw
195335 b <- button "Get secret"
@@ -200,20 +340,20 @@ run = mdo
200340
201341showXhrResponse :: XhrResponse -> Text
202342showXhrResponse (XhrResponse stat stattxt rbmay rtmay respHeaders) =
203− T.unlines ["stat: " <> tShow stat
204− ,"stattxt: " <> tShow stattxt
343+ T.unlines ["stat: " <> tshow stat
344+ ,"stattxt: " <> tshow stattxt
205345 ,"resp: " <> maybe "" showRB rbmay
206− ,"rtext: " <> tShow rtmay
207− ,"rHeaders: " <> tShow respHeaders]
346+ ,"rtext: " <> tshow rtmay
347+ ,"rHeaders: " <> tshow respHeaders]
208348
209−tShow :: Show a => a -> Text
210−tShow = T.pack . show
349+tshow :: Show a => a -> Text
350+tshow = T.pack . show
211351
212352showRB :: XhrResponseBody -> Text
213−showRB (XhrResponseBody_Default t) = tShow t
214−showRB (XhrResponseBody_Text t) = tShow t
353+showRB (XhrResponseBody_Default t) = tshow t
354+showRB (XhrResponseBody_Text t) = tshow t
215355showRB (XhrResponseBody_Blob t) = "<Blob>"
216−showRB (XhrResponseBody_ArrayBuffer t) = tShow t
356+showRB (XhrResponseBody_ArrayBuffer t) = tshow t
217357
218358note :: e -> Maybe a -> Either e a
219359note e = maybe (Left e) Right
nix.confnew file+3
@@ -0,0 +1,3 @@
1+substituters = https://cache.nixos.org https://cache.nixos.org https://nixcache.reflex-frp.org
2+trusted-substituters = https://cache.nixos.org https://cache.nixos.org https://nixcache.reflex-frp.org
3+trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=
nix/reflex-platform.nixnew file+9
@@ -0,0 +1,9 @@
1+{ fetchFromGitHub }:
2+
3+
4+import (fetchFromGitHub {
5+ owner = "reflex-frp";
6+ repo = "reflex-platform";
7+ rev = "04aa7c00d79a2fac81f5b302b919e1b630c20e7f";
8+ sha256 = "1ckz07a839h3f8k94x2ybi9c89hqbkwnn1zxjxb0bfim8f2wqar7";
9+ }) { }
nix/servant-reflex.nixnew file+24
@@ -0,0 +1,24 @@
1+{ pkgs ? import <nixpkgs> {}, reflexPlatform, compiler ? "ghcjs" }:
2+
3+let
4+
5+ generic-lens-src = pkgs.fetchFromGitHub {
6+ owner = "kcsongor";
7+ repo = "generic-lens";
8+ rev = "6787a4e85d09ad9fcfe5baae53fea2cccbae5976";
9+ sha256 = "1bvjwxm4ik2zcx9s57ibi376y255vm5mawx12s1sjcn09mv1vvdh";
10+ };
11+
12+ ghcjsPackages = reflexPlatform.${compiler}.override {
13+ overrides = self: super: {
14+ servant = super.servant;
15+ generic-lens = pkgs.haskell.lib.dontCheck (self.callCabal2nix "generic-lens" generic-lens-src {
16+ inspection-testing = null;
17+ });
18+ wai = super.wai;
19+ servant-reflex = pkgs.haskell.lib.appendConfigureFlag
20+ (self.callPackage ../. {}) "-fExample";
21+ };
22+ };
23+
24+in ghcjsPackages.servant-reflex
nix/testdriver.nixnew file+3
@@ -0,0 +1,3 @@
1+{ reflexPlatform }:
2+
3+reflexPlatform.ghc.callPackage ../testdriver/default.nix {}
nix/testresults.nixnew file+22
@@ -0,0 +1,22 @@
1+{ curl, reflexPlatform, testdriver, testserver, phantomjs }:
2+
3+reflexPlatform.nixpkgs.pkgs.runCommand "runWebdriveTest.sh" {} ''
4+ echo About to phantom
5+ ${phantomjs}/bin/phantomjs --webdriver=127.0.0.1:4444 &
6+ sleep 3
7+
8+ echo About to server
9+ cd ${testserver} && ./back -q --no-access-log --no-error-log &
10+ sleep 3
11+
12+ ${curl}/bin/curl localhost:8000
13+ ${curl}/bin/curl localhost:8000/runmain.js
14+
15+ echo About to testdrive
16+ ${testdriver}/bin/spec
17+ echo Done
18+ mkdir $out
19+ echo Done > $out/out.txt
20+ trap "exit" INT TERM
21+ trap "kill 0" EXIT
22+ ''
nix/testserver.nixnew file+25
@@ -0,0 +1,25 @@
1+{ servant-reflex, reflexPlatform }:
2+
3+let
4+ ghcPackages = reflexPlatform.ghc.override {
5+ overrides = self: super: {
6+ snap = reflexPlatform.lib.doJailbreak (self.callCabal2nix "snap" ../../snap {});
7+ hspec-snap = reflexPlatform.lib.doJailbreak (super.hspec-snap);
8+ servant-snap = reflexPlatform.lib.doJailbreak (super.servant-snap);
9+ skylighting = reflexPlatform.lib.dontCheck super.skylighting;
10+ testserver = (self.callPackage ../testserver/default.nix {}).overrideDerivation (old:
11+ { postInstall = ''
12+ echo "SOURCE IS: $src"
13+ echo "ls IS: $ls"
14+ echo "EXAMPLE IS: ${servant-reflex}"
15+ cp dist/build/back/back $out/back
16+ mkdir $out/static
17+ cp ${servant-reflex}/bin/example.jsexe/* $out/static/
18+ '';
19+ }
20+ );
21+ heist = reflexPlatform.lib.doJailbreak super.heist;
22+ };
23+ };
24+
25+in ghcPackages.testserver
release.nixnew file+27
@@ -0,0 +1,27 @@
1+{ pkgs ? import <nixpkgs> {}, compiler ? "ghcjs" }:
2+
3+let
4+ reflexPlatform =
5+ import ./nix/reflex-platform.nix {
6+ fetchFromGitHub = pkgs.fetchFromGitHub;
7+ };
8+
9+in rec {
10+
11+ servant-reflex = import ./nix/servant-reflex.nix {
12+ reflexPlatform = reflexPlatform;
13+ compiler = compiler;
14+ };
15+ testserver = import ./nix/testserver.nix
16+ { reflexPlatform = reflexPlatform;
17+ servant-reflex = servant-reflex ;
18+ };
19+ testdriver = import ./nix/testdriver.nix
20+ { reflexPlatform = reflexPlatform;
21+ };
22+ testresults = import ./nix/testresults.nix
23+ { inherit reflexPlatform testserver testdriver;
24+ inherit (pkgs) curl;
25+ phantomjs = pkgs.phantomjs2;
26+ };
27+ }
servant-reflex.cabal+7
@@ -19,6 +19,8 @@ library
1919 exposed-modules:
2020 Servant.Reflex
2121 Servant.Reflex.Multi
22+ Servant.Reflex.RequestAPI
23+ Servant.Reflex.RequestAPI2
2224
2325 other-modules:
2426 Servant.Common.BaseUrl
@@ -32,13 +34,18 @@ library
3234 containers >= 0.5.6 && < 0.6,
3335 data-default >= 0.5 && < 0.8,
3436 exceptions >= 0.8 && < 0.9,
37+ generic-lens,
3538 ghcjs-dom >= 0.2 && < 0.10,
3639 http-api-data >= 0.3.6 && < 0.4,
3740 http-media >= 0.6 && < 0.8,
3841 jsaddle >= 0.8 && < 0.10,
42+ lens,
3943 mtl >= 2.2.1 && < 2.3,
4044 network-uri >= 2.6 && < 2.7,
4145 reflex >= 0.5 && < 0.6,
46+ -- Temporary
47+ reflex-dom,
48+
4249 reflex-dom-core == 0.4 && < 0.5,
4350 safe >= 0.3.9 && < 0.4,
4451 servant >= 0.8 && < 0.13,
shell.nixnew file+3
@@ -0,0 +1,3 @@
1+{ compiler ? "ghcjs" }:
2+
3+(import ./release.nix { inherit compiler; }).servant-reflex.env
src/Servant/Reflex/RequestAPI.hsnew file+567
@@ -0,0 +1,567 @@
1+{-# LANGUAGE AllowAmbiguousTypes #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE DeriveGeneric #-}
5+{-# LANGUAGE FlexibleContexts #-}
6+{-# LANGUAGE FlexibleInstances #-}
7+{-# LANGUAGE GADTs #-}
8+{-# LANGUAGE InstanceSigs #-}
9+{-# LANGUAGE MultiParamTypeClasses #-}
10+{-# LANGUAGE OverloadedStrings #-}
11+{-# LANGUAGE PolyKinds #-}
12+{-# LANGUAGE RankNTypes #-} -- Temporary
13+{-# LANGUAGE ScopedTypeVariables #-}
14+{-# LANGUAGE TupleSections #-}
15+{-# LANGUAGE TypeApplications #-}
16+{-# LANGUAGE TypeFamilies #-}
17+{-# LANGUAGE TypeOperators #-}
18+{-# LANGUAGE UndecidableInstances #-}
19+
20+module Servant.Reflex.RequestAPI where
21+
22+import Control.Arrow (first, second)
23+import Control.Lens
24+import Data.Generics.Product
25+import Data.Proxy
26+import Data.CaseInsensitive (mk)
27+import qualified Data.List as L
28+import qualified Data.Map as M
29+import Data.Maybe (catMaybes)
30+import Data.Semigroup ((<>))
31+import qualified Data.Set as Set
32+import qualified Data.Text.Encoding as E
33+import Data.Text (Text)
34+import qualified Data.Text as T
35+import qualified Data.ByteString.Lazy as BL
36+import GHC.Generics
37+import GHC.TypeLits (KnownSymbol, symbolVal)
38+import Reflex hiding (HList(..))
39+import Language.Javascript.JSaddle (MonadJSM)
40+import Servant.API hiding (HList(..))
41+import Servant.Common.Req hiding (QueryPart(..))
42+import Servant.Common.BaseUrl
43+
44+import Reflex.Dom hiding (HList(..))
45+
46+import Servant.Reflex (BuildHeaderKeysTo (..), toHeaders)
47+
48+{-
49+TODO:
50+ - [x] :<|>
51+ - [x] Verb content
52+ - [x] Verb nocontent
53+ - [x] Verb (Headers content)
54+ - [x] Verb (Headers nocontent)
55+ - [ ] Stream
56+ - [X] Capture :> ...
57+ - [ ] Capture' :> ...
58+ - [x] CaptureAll :> ...
59+ - [x] QueryParam :> ...
60+ - [x] QueryParams :> ...
61+ - [x] QueryFlag :> ...
62+ - [x] ReqBody :> ...
63+ - [ ] Header' :> ...
64+ - [x] Header :> ...
65+ - [x] Summary :> ...
66+ - [x] Description :> ...
67+ - [x] path :> ...
68+ - [ ] RemoteHost :> ...
69+ - [x] IsSecure :> ...
70+ - [x] Vault :> ...
71+ - [ ] WithNamedContext :> ...
72+ - [ ] AuthenticatedRequest :> ...
73+ - [x] BasicAuth :> ...
74+ - [ ] EmptyClient :> ...
75+ - [ ] EmptyClient
76+ - [ ] HttpVersion :> ...
77+-}
78+data HList xs where
79+ HNil :: HList '[]
80+ HCons :: x -> HList xs -> HList (x ': xs)
81+
82+clientR :: forall t m layout f . (HasClientR t m (Seal layout) f, Applicative f, Reflex t)
83+ => Proxy layout -> Proxy (m :: * -> *) -> Proxy t -> Proxy f
84+ -> Dynamic t BaseUrl -> ClientR t m (Seal layout) f
85+clientR _ mP tP fP url =
86+ clientRWithRoute (Proxy :: Proxy (Seal layout)) mP fP undefined url undefined
87+
88+-- | A class for generating top-level the API client function
89+class HasClientR t (m :: * -> *) api (f :: * -> *) where
90+ type ClientR t m api f :: *
91+ clientRWithRoute :: Proxy api -> Proxy m -> Proxy f
92+ -> Dynamic t (f (Req t)) -> Dynamic t BaseUrl
93+ -> ClientOptions -> ClientR t m api f
94+
95+-- instance EndpointR t m Raw f where
96+-- type EInputs t m Raw f = '[XhrRequest T.Text]
97+-- type EOutput t m Raw f = XhrResponse
98+
99+-- mkReq (HCons (XhrRequest method url conf) NHil) =
100+-- ReqR method
101+
102+
103+-- | A class for generating endpoint-level API client functions
104+-- We need two separate type classes because the needs of endpoints
105+-- and top-level clients are incompatible
106+--
107+-- Endpoints need to accumulate a list of their input types from
108+-- the API definition (the @EInputs@ associated type) when building
109+-- up a function from a sequence of @:>@ combinators. But for
110+-- sequences of @:<|>@ combinators, such a listing doesn't make
111+-- sense. So, we use one class for endpoint-level recursion and
112+-- another for collecting endpoints into the top-level API
113+class EndpointR t m api f where
114+
115+ type EInputs t m api f :: [*]
116+ type EOutput t m api f :: *
117+
118+ mkReq :: HList (EInputs t m api f) -> ReqR
119+ getResp :: XhrResponse -> EOutput t m api f
120+
121+
122+------------------------------------------------------------------------------
123+-- | :<|> APIs
124+instance {-# OVERLAPPING #-}
125+ (HasClientR t m (layoutLeft) f,
126+ HasClientR t m (layoutRight) f
127+ ) => HasClientR t m (layoutLeft :<|> layoutRight) f where
128+ type ClientR t m (layoutLeft :<|> layoutRight) f =
129+ ClientR t m layoutLeft f :<|> ClientR t m layoutRight f
130+ clientRWithRoute _ tP mP _ url opts =
131+ clientRWithRoute (Proxy @layoutLeft) tP mP undefined url opts
132+ :<|>
133+ clientRWithRoute (Proxy @layoutRight) tP mP undefined url opts
134+
135+#if MIN_VERSION_servant (0,13,0)
136+-- TODO: Untested
137+instance HasClientR t m EmptyClient f where
138+ type ClientR t m api f = EmptyClient
139+ clientRWithRoute _ _ _ _ _ _ = EmptyClient
140+#endif
141+
142+
143+class ToTuple xs where
144+ type Tuple xs :: *
145+ toTuple :: xs -> Tuple xs
146+ fromTuple :: Tuple xs -> xs
147+
148+data Sealed a
149+data SealedRaw
150+
151+type family Seal a where
152+ Seal (a :<|> b) = Seal a :<|> Seal b
153+ Seal Raw = SealedRaw
154+ Seal a = Sealed a
155+
156+
157+-- | Turn a single Endpoint into a client, by turning the input HList
158+-- into a tuple
159+instance {-# OVERLAPPING #-} forall t m layout f .(EndpointR t m layout f,
160+ ToTuple (HList (EInputs t m layout f)),
161+ Monad m
162+ , Traversable f
163+ , SupportsServantReflex t m
164+ ) => HasClientR t (m :: * -> *) (Sealed layout) (f :: * -> *) where
165+ type ClientR t m (Sealed layout) f =
166+ Event t (f (Tuple (HList (EInputs t m layout f))))
167+ -> m (Event t (f (EOutput t m layout f)))
168+ clientRWithRoute _ mP fP dReq url opts (reqs :: Event t (f (Tuple (HList (EInputs t m layout f ))))) = do
169+ let reqTuples = fmap (fromTuple @(HList (EInputs t m layout f ))) <$> reqs
170+
171+ -- TODO: replace these 2 lines w/ the next 2. The trace is for library debugging
172+ reqRs = traceEventWith (concat . fmap ((<> "\n") . show)) $ fmap (mkReq @t @m @layout @f) <$> reqTuples
173+ reqs' = ffor (attachPromptlyDyn url reqRs) $ \(bUrl, rs) -> mkXhrRequest bUrl <$> rs
174+ -- reqs' = ffor (attachPromptlyDyn url reqTuples) $ \(bUrl, inputs) ->
175+ -- mkXhrRequest bUrl . mkReq @t @m @layout @f <$> inputs
176+ resps <- performRequestsAsync $ reqs'
177+ return (fmap (getResp @t @m @layout @f) <$> resps)
178+
179+
180+instance (SupportsServantReflex t m, Traversable f) => HasClientR t m SealedRaw f where
181+ type ClientR t m SealedRaw f = Event t (f (XhrRequest T.Text)) -> m (Event t (f XhrResponse))
182+ clientRWithRoute _ mP fP dReq url opts reqs = performRequestsAsync reqs
183+
184+
185+instance {-# OVERLAPPING #-}(MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m, Applicative f
186+ ) => EndpointR t m (Verb method status cts' a) f where
187+ type EInputs t m (Verb method status cts' a) f = '[]
188+ type EOutput t m (Verb method status cts' a) f = Either String a
189+
190+ mkReq _ = emptyReqR . E.decodeUtf8 $ reflectMethod (Proxy @method)
191+ getResp resp = case _xhrResponse_response resp of
192+ Just (XhrResponseBody_ArrayBuffer x) -> mimeUnrender (Proxy @ct) (BL.fromStrict x)
193+
194+instance {-# OVERLAPPING #-}(ReflectMethod method, SupportsServantReflex t m, Applicative f
195+ ) => EndpointR t m (Verb method status cts' NoContent) f where
196+ type EInputs t m (Verb method status cts' NoContent) f = '[]
197+ type EOutput t m (Verb method status cts' NoContent) f = Either String NoContent
198+
199+ mkReq _ = emptyReqR . E.decodeUtf8 $ reflectMethod (Proxy @method)
200+ getResp resp = Right NoContent -- TODO: Should EOutput be `NoContent` rather than Either... ?
201+
202+
203+instance {-# OVERLAPPING #-}
204+ (MimeUnrender ct a,
205+ BuildHeadersTo hs,
206+ ReflectMethod method, cts' ~ (ct ': cts),
207+ SupportsServantReflex t m,
208+ Applicative f,
209+ BuildHeaderKeysTo hs
210+ ) => EndpointR t m (Verb method status cts' (Headers hs a)) f where
211+ type EInputs t m (Verb method status cts' (Headers hs a)) f = '[]
212+ type EOutput t m (Verb method status cts' (Headers hs a)) f = Either String (Headers hs a)
213+
214+ mkReq _ = set (field @"reqRRespHeaders") (OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy @hs)))) $ emptyReqR $ E.decodeUtf8 $ reflectMethod (Proxy @method)
215+ getResp resp = case _xhrResponse_response resp of
216+ Just (XhrResponseBody_ArrayBuffer x) ->
217+ let hs = buildHeadersTo
218+ . fmap (first (mk . E.encodeUtf8) . second E.encodeUtf8)
219+ . M.toList
220+ $ _xhrResponse_headers resp
221+ in fmap (flip Headers (hs)) $ mimeUnrender (Proxy @ct) (BL.fromStrict x)
222+
223+
224+instance {-# OVERLAPPING #-}(MimeUnrender ct a,
225+ BuildHeadersTo hs,
226+ BuildHeaderKeysTo hs,
227+ ReflectMethod method,
228+ SupportsServantReflex t m,
229+ Applicative f
230+ ) => EndpointR t m (Verb method status cts' (Headers hs NoContent)) f where
231+ type EInputs t m (Verb method status cts' (Headers hs NoContent)) f = '[]
232+ type EOutput t m (Verb method status cts' (Headers hs NoContent)) f = Either String (Headers hs NoContent)
233+
234+ mkReq _ = set (field @"reqRRespHeaders") (OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy @hs)))) $ emptyReqR . E.decodeUtf8 $ reflectMethod (Proxy @method)
235+ getResp resp = case _xhrResponse_response resp of
236+ Just (XhrResponseBody_ArrayBuffer x) ->
237+ let hs = buildHeadersTo
238+ . fmap (first (mk . E.encodeUtf8) . second E.encodeUtf8)
239+ . M.toList
240+ $ _xhrResponse_headers resp
241+ in Right (Headers NoContent hs)
242+
243+
244+instance (SupportsServantReflex t m,
245+ ToHttpApiData a,
246+ EndpointR t m sublayout f,
247+ Applicative f
248+ ) => EndpointR t m (Capture capture a :> sublayout) f where
249+
250+ type EInputs t m (Capture capture a :> sublayout) f = a ': EInputs t m sublayout f
251+ type EOutput t m (Capture capture a :> sublayout) f = EOutput t m sublayout f
252+
253+ mkReq (HCons x xs) = (\a -> over (field @"reqRPathParts") (toUrlPiece a:)) x $
254+ mkReq @t @m @sublayout @f xs
255+
256+ getResp = getResp @t @m @sublayout @f
257+
258+instance (SupportsServantReflex t m,
259+ ToHttpApiData a,
260+ EndpointR t m sublayout f,
261+ Applicative f
262+ ) => EndpointR t m (CaptureAll capture a :> sublayout) f where
263+
264+ type EInputs t m (CaptureAll capture a :> sublayout) f = [a] ': EInputs t m sublayout f
265+ type EOutput t m (CaptureAll capture a :> sublayout) f = EOutput t m sublayout f
266+
267+ mkReq (HCons x xs) = (\a -> over (field @"reqRPathParts") (fmap toUrlPiece a <>)) x $
268+ mkReq @t @m @sublayout @f xs
269+
270+ getResp = getResp @t @m @sublayout @f
271+
272+
273+instance (SupportsServantReflex t m,
274+ KnownSymbol sym,
275+ EndpointR t m sublayout f,
276+ Applicative f
277+ ) => EndpointR t m (sym :> sublayout) f where
278+
279+ type EInputs t m (sym :> sublayout) f = EInputs t m sublayout f
280+ type EOutput t m (sym :> sublayout) f = EOutput t m sublayout f
281+
282+ mkReq r = over (field @"reqRPathParts") (T.pack (symbolVal (Proxy @sym)) :) $ mkReq @t @m @sublayout @f r
283+
284+ getResp = getResp @t @m @sublayout @f
285+
286+instance (SupportsServantReflex t m,
287+ ToHttpApiData a,
288+ EndpointR t m sublayout f,
289+ KnownSymbol sym,
290+ Applicative f
291+ ) => EndpointR t m (QueryParam sym a :> sublayout) f where
292+
293+ type EInputs t m (QueryParam sym a :> sublayout) f = Maybe a ': EInputs t m sublayout f
294+ type EOutput t m (QueryParam sym a :> sublayout) f = EOutput t m sublayout f
295+
296+ mkReq (HCons x xs) = over (field @"reqRParams") ((T.pack $ symbolVal (Proxy @sym),
297+ QueryPartParam $ fmap (toQueryParam) x) : ) $
298+ mkReq @t @m @sublayout @f xs
299+
300+
301+ getResp = getResp @t @m @sublayout @f
302+
303+instance (SupportsServantReflex t m,
304+ ToHttpApiData a,
305+ EndpointR t m sublayout f,
306+ KnownSymbol sym,
307+ Applicative f
308+ ) => EndpointR t m (QueryParams sym a :> sublayout) f where
309+
310+ type EInputs t m (QueryParams sym a :> sublayout) f = [a] ': EInputs t m sublayout f
311+ type EOutput t m (QueryParams sym a :> sublayout) f = EOutput t m sublayout f
312+
313+ mkReq (HCons x xs) =
314+ let newParams = (T.pack (symbolVal (Proxy @sym)), QueryPartParams (toQueryParam <$> x))
315+ in over (field @"reqRParams") (newParams :) $ mkReq @t @m @sublayout @f xs
316+
317+ getResp = getResp @t @m @sublayout @f
318+
319+instance (SupportsServantReflex t m,
320+ EndpointR t m sublayout f,
321+ KnownSymbol sym,
322+ Applicative f
323+ ) => EndpointR t m (QueryFlag sym :> sublayout) f where
324+
325+ type EInputs t m (QueryFlag sym :> sublayout) f = Bool ': EInputs t m sublayout f
326+ type EOutput t m (QueryFlag sym :> sublayout) f = EOutput t m sublayout f
327+
328+ mkReq (HCons x xs) =
329+ let newParam = (T.pack (symbolVal (Proxy @sym)), QueryPartFlag x)
330+ in over (field @"reqRParams") (newParam :) $ mkReq @t @m @sublayout @f xs
331+
332+ getResp = getResp @t @m @sublayout @f
333+
334+instance (SupportsServantReflex t m,
335+ EndpointR t m sublayout f,
336+ MimeRender ct a,
337+ Applicative f
338+ ) => EndpointR t m (ReqBody (ct ': cts) a :> sublayout) f where
339+
340+
341+ type EInputs t m (ReqBody (ct ': cts) a :> sublayout) f = a ': EInputs t m sublayout f
342+ type EOutput t m (ReqBody (ct ': cts) a :> sublayout) f = EOutput t m sublayout f
343+
344+ mkReq (HCons x xs) =
345+ set (field @"reqRBody") (Just (mimeRender (Proxy @ct) x, T.pack (show (contentType (Proxy @ct))))) $ mkReq @t @m @sublayout @f xs
346+
347+ getResp = getResp @t @m @sublayout @f
348+
349+
350+instance (SupportsServantReflex t m,
351+ EndpointR t m sublayout f,
352+ KnownSymbol sym,
353+ ToHttpApiData a,
354+ Applicative f
355+ ) => EndpointR t m (Header sym a :> sublayout) f where
356+
357+
358+ type EInputs t m (Header sym a :> sublayout) f = a ': EInputs t m sublayout f
359+ type EOutput t m (Header sym a :> sublayout) f = EOutput t m sublayout f
360+
361+ mkReq (HCons x xs) =
362+ over (field @"reqRHeaders")
363+ -- ((symbolVal (Proxy @sym), (mimeRender (Proxy @a) x)) :)
364+ ((T.pack $ symbolVal (Proxy @sym), E.decodeUtf8 $ toHeader x) :)
365+ $ mkReq @t @m @sublayout @f xs
366+
367+ getResp = getResp @t @m @sublayout @f
368+
369+#if MIN_VERSION_servant(0,13,0)
370+-- TODO: Untested
371+instance (SupportsServantReflex t m,
372+ EndpointR t m sublayout f,
373+ KnownSymbol sym,
374+ ToHttpApiData a,
375+ Applicative f
376+ ) => EndpointR t m (Summary desc :> sublayout) f where
377+
378+ type EInputs t m (Summary desc :> sublayout) f = EInputs t m sublayout f
379+ type EOutput t m (Summary desc :> sublayout) f = EOutput t m sublayout f
380+
381+ mkReq = mkReq @t @m @sublayout @f
382+
383+ getResp = getResp @t @m @sublayout @f
384+#endif
385+
386+
387+#if MIN_VERSION_servant(0,13,0)
388+-- TODO: Untested
389+instance (SupportsServantReflex t m,
390+ EndpointR t m sublayout f,
391+ KnownSymbol sym,
392+ ToHttpApiData a,
393+ Applicative f
394+ ) => EndpointR t m (Description desc :> sublayout) f where
395+
396+ type EInputs t m (Descriptiok desc :> sublayout) f = EInputs t m sublayout f
397+ type EOutput t m (Description desc :> sublayout) f = EOutput t m sublayout f
398+
399+ mkReq = mkReq @t @m @sublayout @f
400+
401+ getResp = getResp @t @m @sublayout @f
402+#endif
403+
404+instance (SupportsServantReflex t m,
405+ EndpointR t m sublayout f,
406+ KnownSymbol sym,
407+ ToHttpApiData a,
408+ Applicative f
409+ ) => EndpointR t m (IsSecure :> sublayout) f where
410+
411+
412+ type EInputs t m (IsSecure :> sublayout) f = EInputs t m sublayout f
413+ type EOutput t m (IsSecure :> sublayout) f = EOutput t m sublayout f
414+
415+ mkReq = mkReq @t @m @sublayout @f
416+
417+ getResp = getResp @t @m @sublayout @f
418+
419+instance (SupportsServantReflex t m,
420+ EndpointR t m sublayout f,
421+ KnownSymbol sym,
422+ ToHttpApiData a,
423+ Applicative f
424+ ) => EndpointR t m (Vault :> sublayout) f where
425+
426+
427+ type EInputs t m (Vault :> sublayout) f = EInputs t m sublayout f
428+ type EOutput t m (Vault :> sublayout) f = EOutput t m sublayout f
429+
430+ mkReq = mkReq @t @m @sublayout @f
431+
432+ getResp = getResp @t @m @sublayout @f
433+
434+instance (SupportsServantReflex t m,
435+ EndpointR t m sublayout f,
436+ Applicative f
437+ ) => EndpointR t m (BasicAuth realm usr :> sublayout) f where
438+
439+ type EInputs t m (BasicAuth realm usr :> sublayout) f = BasicAuthData ': EInputs t m sublayout f
440+ type EOutput t m (BasicAuth realm usr :> sublayout) f = EOutput t m sublayout f
441+
442+ mkReq (HCons x xs) =
443+ set (field @"reqRAuthData") (Just x) $ mkReq @t @m @sublayout @f xs
444+
445+ getResp = getResp @t @m @sublayout @f
446+
447+
448+instance ToTuple (HList '[]) where
449+ type Tuple (HList '[]) = ()
450+ toTuple _ = ()
451+ fromTuple _ = HNil
452+
453+instance ToTuple (HList '[a]) where
454+ type Tuple (HList '[a]) = a
455+ toTuple (HCons a HNil) = a
456+ fromTuple a = HCons a HNil
457+
458+instance ToTuple (HList '[a,b]) where
459+ type Tuple (HList '[a,b]) = (a,b)
460+ toTuple (HCons a (HCons b HNil)) = (a,b)
461+ fromTuple (a,b) = HCons a (HCons b HNil)
462+
463+instance ToTuple (HList '[a,b,c]) where
464+ type Tuple (HList '[a,b,c]) = (a,b,c)
465+ toTuple (HCons a (HCons b (HCons c HNil))) = (a,b,c)
466+ fromTuple (a,b,c) = HCons a (HCons b (HCons c HNil))
467+
468+type MyAPI = Header "hi" Int :> Capture "hello" Int :> Capture "hello2" Bool :> Get '[JSON] (Headers '[Header "hi" Int] Int)
469+ :<|> Get '[JSON] Bool
470+
471+type MyAPI2 = Raw
472+
473+
474+m :: forall t m.MonadWidget t m => m ()
475+m = do
476+ let (a :<|> b) = clientR (Proxy @MyAPI) (Proxy :: Proxy m) (Proxy :: Proxy t)
477+ (Proxy @[]) undefined
478+ btn <- button "Hello"
479+ resA <- a (fmap (:[]) ((2, 5,True) <$ btn))
480+ resB <- b (fmap (:[]) (() <$ btn))
481+ display =<< holdDyn "waiting" (leftmost [show <$> resB ])
482+ -- [show <$> resA
483+ -- , show <$> resB
484+ -- ])
485+
486+ let rawR = clientR (Proxy @MyAPI2) (Proxy @m) (Proxy @t) (Proxy @[]) undefined
487+ return ()
488+
489+data ReqR = ReqR
490+ { reqRMethod :: T.Text
491+ , reqRPathParts :: [T.Text]
492+ , reqRParams :: [(T.Text, QueryPart)]
493+ , reqRBody :: Maybe (BL.ByteString, T.Text)
494+ , reqRHeaders :: [(T.Text, T.Text)]
495+ , reqRRespHeaders :: XhrResponseHeaders
496+ , reqRAuthData :: Maybe BasicAuthData
497+ } deriving (Generic)
498+
499+instance Show ReqR where
500+ show (ReqR m pp ps b hs hs' a) = concat $ L.intersperse "\n" [
501+ "ReqR {"
502+ , ("reqRMethod = " <> show m)
503+ , ("reqRPathParts = " <> show pp)
504+ , ("reqRParams = " <> show ps)
505+ , ("reqRBody = " <> show b)
506+ , ("reqRHeaders = " <> show hs)
507+ , ("reqRRespHeaders = " <> show hs')
508+ , ("reqRAuthData = " <> maybe "Nothing" (const "Just <<redacted>>") a)
509+ ]
510+
511+emptyReqR :: T.Text -> ReqR
512+emptyReqR method = ReqR method [] [] Nothing [] (OnlyHeaders mempty) Nothing
513+
514+data QueryPart = QueryPartParam (Maybe Text)
515+ | QueryPartParams [Text]
516+ | QueryPartFlag Bool
517+ deriving (Show)
518+
519+mkXhrRequest :: BaseUrl -> ReqR -> XhrRequest T.Text
520+mkXhrRequest reqHost req =
521+ let path = T.intercalate "/" $ reqRPathParts req
522+
523+ queryPartString :: (Text, QueryPart) -> Maybe Text
524+ queryPartString (pName, qp) = case qp of
525+
526+ QueryPartParam Nothing -> Nothing
527+ QueryPartParam (Just a) -> Just (pName <> "=" <> escape a)
528+
529+ QueryPartParams ps -> Just . T.intercalate "&"
530+ $ fmap (\p -> pName <> "=" <> escape p)
531+ ps
532+
533+ QueryPartFlag True -> Just pName
534+ QueryPartFlag False -> Nothing
535+
536+ (</>) :: Text -> Text -> Text
537+ x </> y | ("/" `T.isSuffixOf` x) || ("/" `T.isPrefixOf` y) = x <> y
538+ | otherwise = x <> "/" <> y
539+
540+ queryString = T.intercalate "&" . catMaybes . map queryPartString $ reqRParams req
541+ url = showBaseUrl reqHost </> path <> if T.null queryString then "" else (T.cons '?' queryString)
542+
543+ (headers, body) =
544+ let headers0 = M.fromList $ reqRHeaders req
545+ in case reqRBody req of
546+ Nothing -> (headers0, "")
547+ Just (rb,ct) -> (M.insert "Content-Type" ct headers0,
548+ E.decodeUtf8 $ BL.toStrict rb)
549+
550+ xhrReqConfig = def
551+ { _xhrRequestConfig_headers = headers
552+ , _xhrRequestConfig_user = E.decodeUtf8 . basicAuthUsername <$> reqRAuthData req
553+ , _xhrRequestConfig_password = E.decodeUtf8 . basicAuthPassword <$> reqRAuthData req
554+ , _xhrRequestConfig_responseType = Just XhrResponseType_ArrayBuffer
555+ , _xhrRequestConfig_sendData = body
556+ , _xhrRequestConfig_responseHeaders = reqRRespHeaders req
557+ , _xhrRequestConfig_withCredentials = False
558+ }
559+ xhrReq = XhrRequest (reqRMethod req) url xhrReqConfig
560+ in xhrReq
561+
562+transformExample :: MonadWidget t m => ((Int, Char) -> Performable m Bool) -> Event t (Int, Char) -> m (Event t Bool)
563+transformExample f = \triggers -> performEvent (f <$> triggers)
564+-- transformExample = undefined -- let x = performEvent :: _ in undefined
565+
566+transform :: MonadWidget t m => forall a. (inp -> IO outp) -> (Event t inp -> m (Event t outp))
567+transform = undefined
testdriver/default.nixnew file+16
@@ -0,0 +1,16 @@
1+{ mkDerivation, base, hspec, hspec-webdriver, stdenv, text
2+, webdriver
3+}:
4+mkDerivation {
5+ pname = "testdriver";
6+ version = "0.2";
7+ src = ./.;
8+ isLibrary = false;
9+ isExecutable = true;
10+ executableHaskellDepends = [
11+ base hspec hspec-webdriver text webdriver
12+ ];
13+ description = "Selenium test driver for Servant reflex";
14+ license = stdenv.lib.licenses.bsd3;
15+ hydraPlatforms = stdenv.lib.platforms.none;
16+}
testdriver/shell.nixnew file+1
@@ -0,0 +1 @@
1+(import ../release3.nix {}).testdriver.env
testdriver/test/Servant/ReflexSpec.hs+1−1
@@ -28,7 +28,7 @@ spec :: Spec
2828spec = do
2929 describe "servant-reflex tests" $ do
3030
31− session "test page" $ using Chrome $ do
31+ session "test page" $ using [chromeCaps] $ do
3232
3333 it "opens the page" $ runWD $
3434 openPage "http://localhost:8000"
testserver/API.hsmode 120000 → 100644+72−1
@@ -1 +0,0 @@
1−../exec/API.hs
@@ -0,0 +1,72 @@
1+{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE TypeOperators #-}
4+
5+module API where
6+
7+import Data.Aeson
8+import Data.Aeson.Types (typeMismatch)
9+import Data.Text (Text)
10+import Servant.API
11+
12+newtype Question = Question { unQuestion :: Text } deriving (Show)
13+
14+instance ToJSON Question where
15+ toJSON (Question txt) = object ["question" .= txt]
16+
17+instance FromJSON Question where
18+ parseJSON (Object v) = Question <$> v .: "question"
19+ parseJSON x = typeMismatch "Couldn't find key 'question'" x
20+
21+newtype Answer = Answer { unAnswer :: Text } deriving (Show)
22+
23+instance ToJSON Answer where
24+ toJSON (Answer txt) = object ["answer" .= txt]
25+
26+instance FromJSON Answer where
27+ parseJSON (Object v) = Answer <$> v .: "answer"
28+ parseJSON x = typeMismatch "Couldn't find key 'answer'" x
29+
30+
31+-- | API spec for server, client, and docs
32+type API = "getunit" :> Get '[JSON] ()
33+ :<|> "getint" :> Get '[JSON] Int
34+ :<|> "dblint" :> Capture "anint" Int :> Get '[JSON] Int
35+ :<|> "sayhi" :> QueryParam "username" Text
36+ :> QueryParams "greetings" Text
37+ :> QueryFlag "gusto"
38+ :> Get '[JSON] Text
39+ :<|> "double" :> ReqBody '[JSON] Double
40+ :> Post '[JSON] Double
41+ :<|> "a" :> "b" :> QueryFlag "gusto" :> Get '[JSON] Text
42+ :<|> "qna" :> ReqBody '[JSON] Question
43+ :> Header "qnum" Int
44+ :> Header "is-favorite" Bool
45+ :> Post '[JSON] (Headers '[Header "anum" Int, Header "was-favorite" Bool] Answer)
46+ :<|> "secret" :> BasicAuth "realm" () :> Get '[JSON] Int
47+ :<|> Raw
48+
49+type GET = Get '[JSON] ()
50+
51+-- Imported the comprehensive API example for testing.
52+-- https://github.com/haskell-servant/servant/blob/master/servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs
53+type ComprehensiveAPI =
54+ GET :<|>
55+ Get '[JSON] Int :<|>
56+ Capture "foo" Int :> GET :<|>
57+ Header "foo" Int :> GET :<|>
58+ HttpVersion :> GET :<|>
59+ IsSecure :> GET :<|>
60+ QueryParam "foo" Int :> GET :<|>
61+ QueryParams "foo" Int :> GET :<|>
62+ QueryFlag "foo" :> GET :<|>
63+-- Raw :<|>
64+ RemoteHost :> GET :<|>
65+ ReqBody '[JSON] Int :> GET :<|>
66+ Get '[JSON] (Headers '[Header "foo" Int] ()) :<|>
67+ "foo" :> GET :<|>
68+ Vault :> GET :<|>
69+ Verb 'POST 204 '[JSON] () :<|>
70+ Verb 'POST 204 '[JSON] Int
71+-- This one isn't in scope
72+-- :<|> WithNamedContext "foo" '[] GET
testserver/Main.hs+16−10
@@ -11,6 +11,7 @@ import Data.Aeson
1111import Data.Bool
1212import Data.Char (toUpper)
1313import qualified Data.List as L
14+import Data.Maybe (fromMaybe)
1415import Data.Monoid
1516import Data.Proxy
1617import Data.Text hiding (head, length, map,
@@ -18,15 +19,15 @@ import Data.Text hiding (head, length, map,
1819import qualified Data.Text as T
1920import qualified Data.Text.IO as T
2021import GHC.Generics
21−import Servant.Server.Internal.SnapShims
22−import Snap.Core
22+import Snap.Core hiding (addHeader)
2323import Snap.Http.Server
2424
2525import Servant
26−import Servant.Server
26+import Servant.Server ()
27+import System.Directory
2728-- import Snap.Util.FileServe
2829import API
29−import Snap
30+import Snap hiding (addHeader)
3031
3132-- * Example
3233
@@ -49,9 +50,8 @@ data App = App
4950--
5051-- Each handler runs in the 'ExceptT ServantErr IO' monad.
5152server :: Server API '[BasicAuthCheck (Handler App App) ()] (Handler App App)
52−server = return () :<|> return 100 :<|> sayhi :<|> dbl
53− :<|> multi :<|> qna :<|> serveSecret
54− :<|> serveDirectory "static"
53+server = return () :<|> return 100 :<|> dblint :<|> sayhi :<|> dbl
54+ :<|> multi :<|> qna :<|> serveSecret :<|> serveDirectory "static"
5555 where sayhi :: Maybe Text -> [Text] -> Bool -> Handler App App Text
5656 sayhi nm greetings withGusto = case nm of
5757 Nothing -> return ("Sorry, who are you?" :: Text)
@@ -63,15 +63,16 @@ server = return () :<|> return 100 :<|> sayhi :<|> dbl
6363 | otherwise = T.intercalate ", " (L.init greetings)
6464 <> ", and " <> L.last greetings <> ", "
6565 return . modifier $ greetPart <> n
66+ dblint = return . (* 2)
6667 dbl x = if x `elem` [4,13]
6768 then throwError $ err500 { errBody = "No unlucky numbers please" }
6869 else return $ x * 2
6970 multi = return . bool "Box unchecked" "Box Checked"
70− qna q = do
71+ qna q nm fav = do
7172 liftIO $ do
7273 putStrLn $ "qna got: " ++ show q
7374 T.putStrLn $ unQuestion q
74− return $ Answer $ unQuestion q
75+ return $ addHeader (fromMaybe 10 nm) $ addHeader (fromMaybe False fav) $ (Answer $ unQuestion q)
7576 serveSecret _ = do
7677 req <- getRequest
7778 liftIO $ putStrLn (show req)
@@ -85,6 +86,8 @@ test = serveSnapWithContext testApi
8586
8687initApp :: SnapletInit App App
8788initApp = makeSnaplet "myapp" "example" Nothing $ do
89+ liftIO $ print =<< listDirectory "."
90+ liftIO $ print =<< listDirectory "static"
8891 addRoutes [("", test)
8992 ,("", serveDirectory "static")
9093 ]
@@ -92,4 +95,7 @@ initApp = makeSnaplet "myapp" "example" Nothing $ do
9295
9396-- Put this all to work!
9497main :: IO ()
95−main = serveSnaplet mempty initApp
98+main = commandLineConfig emptyConfig >>= \cfg -> print cfg >> serveSnaplet cfg initApp
99+-- main = serveSnaplet (defaultConfig { accessLog = "/tmp/log/testserver-access.log"
100+-- , errorLog = "/tmp/log/testserver-error.log"
101+-- }) initApp
testserver/default.nixnew file+14
@@ -0,0 +1,14 @@
1+{ mkDerivation, aeson, base, servant, servant-snap, snap, snap-core
2+, snap-server, stdenv, text
3+}:
4+mkDerivation {
5+ pname = "testserver";
6+ version = "0.1.0.0";
7+ src = ./.;
8+ isLibrary = false;
9+ isExecutable = true;
10+ executableHaskellDepends = [
11+ aeson base servant servant-snap snap snap-core snap-server text
12+ ];
13+ license = stdenv.lib.licenses.bsd3;
14+}
testserver/shell.nixnew file+1
@@ -0,0 +1 @@
1+(import ../release.nix {}).testserver.env
testserver/testserver.cabal+1
@@ -21,6 +21,7 @@ executable back
2121 -- other-extensions:
2222 build-depends: aeson >= 0.9 && < 1.4
2323 , base >=4.8 && <4.11
24+ , directory >= 1.2 && < 1.4
2425 , snap >= 1.0 && < 1.2
2526 , snap-server >= 1.0 && < 1.1
2627 , snap-core >= 1.0 && < 1.1