32b060a · rowtype-yoga/purescript-lunapark

git.iko.soy/rowtype-yoga/purescript-lunapark

updated

commit32b060afdda86d45f905b422e76fe1de3ed27fac authorMaxim Zimaliev <zimaliev@gmail.com> dateTue 5 Jun 2018, 22:15 (8 years ago) parent4796f2d

7 files changed+33−24

compare with main

unifiedsplit

bower.json+7−6 package.json+3−4 src/Lunapark/API.purs+4−4 src/Lunapark/Endpoint.purs+9−6 src/Lunapark/Error.purs+3−1 src/Lunapark/LunaparkF.purs+1−1 src/Lunapark/Types.purs+6−2

bower.json+7−6

@@ -24,11 +24,12 @@

2424 "test"

2525 ],

2626 "dependencies": {

27− "purescript-affjax": "#compiler/0.12",

28− "purescript-argonaut": "cryogenian/purescript-argonaut#compiler/0.12",

29− "purescript-css": "justinwoo/purescript-css#compiler/0.12",

30− "purescript-node-fs-aff": "#compiler/0.12",

31− "purescript-run": "#compiler/0.12",

32− "purescript-xpath": "cryogenian/purescript-xpath#compiler/0.12"

27+ "purescript-xpath": "cryogenian/purescript-xpath#compiler/0.12",

28+ "purescript-argonaut-core": "^4.0.0",

29+ "purescript-argonaut-codecs": "^4.0.0",

30+ "purescript-affjax": "^6.0.0",

31+ "purescript-css": "^4.0.0",

32+ "purescript-node-fs-aff": "^6.0.0",

33+ "purescript-run": "cryogenian/purescript-run#compiler/0.12"

3334 }

3435}

package.json+3−4

@@ -2,16 +2,15 @@

22 "name": "purescript-lunapark",

33 "private": true,

44 "scripts": {

5− "build": "pulp build -- --censor-lib --strict --stash",

5+ "build": "pulp build -- --strict --stash",

66 "build:non-strict": "pulp build",

7− "bundle": "purs bundle \"output/**/*.js\" --output ./index.js --main Main --module Main",

87 "ide": "purs ide server"

98 },

109 "license": "Apache-2.0",

1110 "dependencies": {

1211 "chromedriver": "^2.37.0",

13− "pulp": "^12.0.1",

14− "purescript": "cryogenian/node-purescript-bin#master",

12+ "pulp": "^12.2.0",

13+ "purescript": "slamdata/node-purescript#0.12",

1514 "purescript-psa": "^0.6.0",

1615 "xhr2": "^0.1.4"

1716 }

src/Lunapark/API.purs+4−4

@@ -3,14 +3,14 @@ module Lunapark.API where

33import Prelude

55import Control.Monad.Rec.Class (class MonadRec)

6−import Data.Argonaut as J

6+import Data.Argonaut.Decode.Class as J

77import Data.Bifunctor (lmap)

88import Data.Either (Either(..), isRight)

99import Data.List (List(..), (:))

1010import Data.List as L

1111import Data.Map as Map

1212import Data.Maybe (Maybe(..))

13−import Data.String as Str

13+import Data.String.CodeUnits as Str

1414import Data.Time.Duration (Milliseconds(..))

1515import Data.Traversable as T

1616import Data.Variant as V

@@ -533,11 +533,11 @@ handleLunapark inp = case _ of

533533 let

534534 try' = do

535535 a ← try

536− R.liftEffect $ Ref.modify (Map.insert key true) inp.requestMapRef

536+ R.liftEffect $ Ref.modify_ (Map.insert key true) inp.requestMapRef

537537 pure a

538538 fallback' = do

539539 a ← fallback

540− R.liftEffect $ Ref.modify (Map.insert key false) inp.requestMapRef

540+ R.liftEffect $ Ref.modify_ (Map.insert key false) inp.requestMapRef

541541 pure a

542542 in catch try' \_ → fallback'

543543

src/Lunapark/Endpoint.purs+9−6

@@ -8,8 +8,9 @@ module Lunapark.Endpoint where

88import Prelude

1010import Effect.Aff (Aff)

11−import Data.Argonaut (Json)

12−import Data.Argonaut as J

11+import Data.Argonaut.Core (Json)

12+import Data.Argonaut.Decode.Combinators ((.?)) as J

13+import Data.Argonaut.Decode.Class (decodeJson) as J

1314import Data.Bifunctor (lmap)

1415import Data.Either (Either(..))

1516import Data.Foldable as F

@@ -18,6 +19,8 @@ import Data.Maybe (Maybe(..))

1819import Data.Newtype (un)

1920import Lunapark.Error as LE

2021import Lunapark.Types as LT

22+import Network.HTTP.Affjax.Response as NR

23+import Network.HTTP.Affjax.Request as NQ

2124import Network.HTTP.Affjax as N

2225import Network.HTTP.StatusCode (StatusCode(..))

2326

@@ -173,13 +176,13 @@ handleAPIError r = case r.status of

173176 code → Left $ LE.fromJson r.response

174177

175178get ∷ String → Endpoint → Aff (Either LE.Error Json)

176−get uri ep = map handleAPIError $ N.get (uri <> print ep)

179+get uri ep = map handleAPIError $ N.get NR.json (uri <> print ep)

177180

178181post ∷ String → Endpoint → Json → Aff (Either LE.Error Json)

179−post uri ep obj = map handleAPIError $ N.post (uri <> print ep) obj

182+post uri ep obj = map handleAPIError $ N.post NR.json (uri <> print ep) $ NQ.json obj

180183

181184post_ ∷ String → Endpoint → Aff (Either LE.Error Json)

182−post_ uri ep = map handleAPIError $ N.post' (uri <> print ep) (Nothing ∷ Maybe Unit)

185+post_ uri ep = map handleAPIError $ N.post' NR.json (uri <> print ep) Nothing

183186

184187delete ∷ String → Endpoint → Aff (Either LE.Error Json)

185−delete uri ep = map handleAPIError $ N.delete (uri <> print ep)

188+delete uri ep = map handleAPIError $ N.delete NR.json (uri <> print ep)

src/Lunapark/Error.purs+3−1

@@ -2,7 +2,9 @@ module Lunapark.Error where

33import Prelude

5−import Data.Argonaut as J

5+import Data.Argonaut.Core as J

6+import Data.Argonaut.Decode.Combinators ((.?)) as J

7+import Data.Argonaut.Decode.Class (decodeJson) as J

68import Data.Either (Either(..), either)

810data ErrorType

src/Lunapark/LunaparkF.purs+1−1

@@ -2,7 +2,7 @@ module Lunapark.LunaparkF where

33import Prelude

5−import Data.Argonaut as J

5+import Data.Argonaut.Core as J

66import Data.Symbol (SProxy(..))

77import Lunapark.Types as LT

88import Run as R

src/Lunapark/Types.purs+6−2

@@ -8,8 +8,12 @@ import Prelude

88import CSS.Render as CSSR

99import CSS.Selector as CSS

1010import Control.Alt ((<|>))

11−import Data.Argonaut (Json, (.?))

12−import Data.Argonaut as J

11+import Data.Argonaut.Core (Json)

12+import Data.Argonaut.Core as J

13+import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson) as J

14+import Data.Argonaut.Decode.Combinators ((.?))

15+import Data.Argonaut.Encode.Class (class EncodeJson, encodeJson) as J

16+import Data.Argonaut.Encode.Combinators (extend) as J

1317import Data.Array as A

1418import Data.Either (Either(..))

1519import Data.Map as Map