Skip to content

Commit aedde42

Browse files
committed
Use consistent formating
1 parent 8394ba6 commit aedde42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2675
-2371
lines changed

.tidyrc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"importWrap": "source",
3+
"indent": 6,
4+
"operatorsFile": null,
5+
"ribbon": 1,
6+
"typeArrowPlacement": "last",
7+
"unicode": "always",
8+
"width": null
9+
}

examples/Affjax/Affjax.purs

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,54 +12,55 @@ import Flame as F
1212
import Flame.Html.Attribute as HA
1313
import Flame.Html.Element as HE
1414

15-
type Model = {
16-
url :: String,
17-
result :: Result
18-
}
15+
type Model =
16+
{ url String
17+
, result Result
18+
}
1919

2020
data Message = UpdateUrl String | Fetch | Fetched Result
2121

2222
data Result = NotFetched | Fetching | Ok String | Error String
2323

24-
derive instance eqResult :: Eq Result
24+
derive instance eqResult Eq Result
2525

26-
init :: Model
27-
init = {
28-
url: "https://httpbin.org/get",
29-
result: NotFetched
30-
}
26+
init Model
27+
init =
28+
{ url: "https://httpbin.org/get"
29+
, result: NotFetched
30+
}
3131

32-
update :: ListUpdate Model Message
32+
update ListUpdate Model Message
3333
update model =
3434
case _ of
35-
UpdateUrl url -> F.noMessages $ model { url = url, result = NotFetched }
36-
Fetch -> model { result = Fetching } :> [ do
37-
response <- A.get AR.string model.url
38-
pure <<< Just <<< Fetched $ case response of
39-
Left error -> Error $ A.printError error
40-
Right payload -> Ok payload.body
35+
UpdateUrl url → F.noMessages $ model { url = url, result = NotFetched }
36+
Fetch → model { result = Fetching } :>
37+
[ do
38+
response ← A.get AR.string model.url
39+
pure <<< Just <<< Fetched $ case response of
40+
Left error → Error $ A.printError error
41+
Right payload → Ok payload.body
4142
]
42-
Fetched result -> F.noMessages $ model { result = result }
43+
Fetched result F.noMessages $ model { result = result }
4344

44-
view :: Model -> Html Message
45-
view { url, result } = HE.main "main" [
46-
HE.input [HA.onInput UpdateUrl, HA.value url, HA.type' "text"],
47-
HE.button [HA.onClick Fetch, HA.disabled $ result == Fetching] "Fetch",
48-
case result of
49-
NotFetched ->
50-
HE.div_ "Not Fetched..."
51-
Fetching ->
52-
HE.div_ "Fetching..."
53-
Ok ok ->
54-
HE.pre_ <<< HE.code_ $ "Ok: " <> ok
55-
Error error ->
56-
HE.div_ $ "Error: " <> error
57-
]
45+
view Model Html Message
46+
view { url, result } = HE.main "main"
47+
[ HE.input [ HA.onInput UpdateUrl, HA.value url, HA.type' "text" ]
48+
, HE.button [ HA.onClick Fetch, HA.disabled $ result == Fetching ] "Fetch"
49+
, case result of
50+
NotFetched
51+
HE.div_ "Not Fetched..."
52+
Fetching
53+
HE.div_ "Fetching..."
54+
Ok ok
55+
HE.pre_ <<< HE.code_ $ "Ok: " <> ok
56+
Error error
57+
HE.div_ $ "Error: " <> error
58+
]
5859

59-
main :: Effect Unit
60-
main = F.mount_ (QuerySelector "body") {
61-
init: F.noMessages init,
62-
subscribe: [],
63-
update,
64-
view
65-
}
60+
main Effect Unit
61+
main = F.mount_ (QuerySelector "body")
62+
{ init: F.noMessages init
63+
, subscribe: []
64+
, update
65+
, view
66+
}

examples/Counter/Counter.purs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ type Model = Int
1616
data Message = Increment | Decrement
1717

1818
-- | Initial state of the app
19-
init :: Model
19+
init Model
2020
init = 0
2121

2222
-- | `update` is called to handle events
23-
update :: Model -> Message -> Model
23+
update Model Message Model
2424
update model = case _ of
25-
Increment -> model + 1
26-
Decrement -> model - 1
25+
Increment model + 1
26+
Decrement model - 1
2727

2828
-- | `view` updates the app markup whenever the model is updated
29-
view :: Model -> Html Message
30-
view model = HE.main "main" [
31-
HE.button [HA.onClick Decrement] "-",
32-
HE.text $ show model,
33-
HE.button [HA.onClick Increment] "+"
34-
]
29+
view Model Html Message
30+
view model = HE.main "main"
31+
[ HE.button [ HA.onClick Decrement ] "-"
32+
, HE.text $ show model
33+
, HE.button [ HA.onClick Increment ] "+"
34+
]
3535

3636
-- | Mount the application on the given selector
37-
main :: Effect Unit
38-
main = FAN.mount_ (QuerySelector "body") {
39-
init,
40-
subscribe: [],
41-
update,
42-
view
43-
}
37+
main Effect Unit
38+
main = FAN.mount_ (QuerySelector "body")
39+
{ init
40+
, subscribe: []
41+
, update
42+
, view
43+
}

examples/Counters/Counters.purs

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,33 @@ type Model = Array ECM.Model
1717

1818
data Message = Add | Remove Int | CounterMessage Int ECM.Message
1919

20-
init :: Model
20+
init Model
2121
init = []
2222

23-
update :: Model -> Message -> Model
23+
update Model Message Model
2424
update model = case _ of
25-
Add -> DA.snoc model ECM.init
26-
Remove index -> DM.fromMaybe model $ DA.deleteAt index model
27-
CounterMessage index message ->
25+
Add DA.snoc model ECM.init
26+
Remove index DM.fromMaybe model $ DA.deleteAt index model
27+
CounterMessage index message
2828
case model !! index of
29-
Nothing -> model
30-
Just model' -> DM.fromMaybe model $ DA.updateAt index (ECM.update model' message) model
31-
32-
view :: Model -> Html Message
33-
view model = HE.main "main" [
34-
HE.button [HA.onClick Add] "Add",
35-
HE.div_ $ DA.mapWithIndex viewCounter model
36-
]
37-
where viewCounter index model' = HE.div [HA.style { display: "flex" }] [
38-
CounterMessage index <$> ECM.view model',
39-
HE.button [HA.onClick $ Remove index] "Remove"
29+
Nothing → model
30+
Just model' → DM.fromMaybe model $ DA.updateAt index (ECM.update model' message) model
31+
32+
view Model Html Message
33+
view model = HE.main "main"
34+
[ HE.button [ HA.onClick Add ] "Add"
35+
, HE.div_ $ DA.mapWithIndex viewCounter model
36+
]
37+
where
38+
viewCounter index model' = HE.div [ HA.style { display: "flex" } ]
39+
[ CounterMessage index <$> ECM.view model'
40+
, HE.button [ HA.onClick $ Remove index ] "Remove"
4041
]
4142

42-
main :: Effect Unit
43-
main = FAN.mount_ (QuerySelector "body") {
44-
init,
45-
subscribe: [],
46-
update,
47-
view
48-
}
43+
main Effect Unit
44+
main = FAN.mount_ (QuerySelector "body")
45+
{ init
46+
, subscribe: []
47+
, update
48+
, view
49+
}

examples/Dice/Dice.purs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ import Flame (QuerySelector(..), Html, (:>))
1111
import Flame as F
1212
import Flame.Html.Attribute as HA
1313
import Flame.Html.Element as HE
14-
import Data.Tuple(Tuple)
14+
import Data.Tuple (Tuple)
1515

1616
type Model = Maybe Int
1717

18-
init :: Model
18+
init Model
1919
init = Nothing
2020

2121
data Message = Roll | Update Int
2222

23-
update :: Model -> Message -> Tuple Model (Array (Aff (Maybe Message)))
23+
update Model Message Tuple Model (Array (Aff (Maybe Message)))
2424
update model = case _ of
25-
Roll -> model :> [
26-
Just <<< Update <$> liftEffect (ER.randomInt 1 6)
25+
Roll → model :>
26+
[ Just <<< Update <$> liftEffect (ER.randomInt 1 6)
27+
]
28+
Update int → Just int :> []
29+
30+
view Model Html Message
31+
view model = HE.main "main"
32+
[ HE.text (show model)
33+
, HE.button [ HA.onClick Roll ] "Roll"
2734
]
28-
Update int -> Just int :> []
29-
30-
view :: Model -> Html Message
31-
view model = HE.main "main" [
32-
HE.text (show model),
33-
HE.button [HA.onClick Roll] "Roll"
34-
]
35-
36-
main :: Effect Unit
37-
main = F.mount_ (QuerySelector "body") {
38-
init: init :> [],
39-
subscribe: [],
40-
update,
41-
view
42-
}
35+
36+
main Effect Unit
37+
main = F.mount_ (QuerySelector "body")
38+
{ init: init :> []
39+
, subscribe: []
40+
, update
41+
, view
42+
}

examples/EffectfulAffjax/Affjax.purs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,53 @@ import Flame.Application.Effectful as FAE
1313
import Flame.Html.Attribute as HA
1414
import Flame.Html.Element as HE
1515

16-
type Model = {
17-
url :: String,
18-
result :: Result
19-
}
16+
type Model =
17+
{ url String
18+
, result Result
19+
}
2020

2121
data Message = UpdateUrl String | Fetch
2222

2323
data Result = NotFetched | Fetching | Ok String | Error String
2424

25-
derive instance eqResult :: Eq Result
25+
derive instance eqResult Eq Result
2626

27-
init :: Model
28-
init = {
29-
url: "https://httpbin.org/get",
30-
result: NotFetched
31-
}
27+
init Model
28+
init =
29+
{ url: "https://httpbin.org/get"
30+
, result: NotFetched
31+
}
3232

33-
update :: AffUpdate Model Message
33+
update AffUpdate Model Message
3434
update { display, model, message } =
3535
case message of
36-
UpdateUrl url -> FAE.diff { url, result: NotFetched }
37-
Fetch -> do
36+
UpdateUrl url FAE.diff { url, result: NotFetched }
37+
Fetch do
3838
display $ FAE.diff' { result: Fetching }
39-
response <- A.get AR.string model.url
39+
response A.get AR.string model.url
4040
FAE.diff <<< { result: _ } $ case response of
41-
Left error -> Error $ A.printError error
42-
Right payload -> Ok payload.body
41+
Left error Error $ A.printError error
42+
Right payload Ok payload.body
4343

44-
view :: Model -> Html Message
45-
view { url, result } = HE.main "main" [
46-
HE.input [HA.onInput UpdateUrl, HA.value url, HA.type' "text"],
47-
HE.button [HA.onClick Fetch, HA.disabled $ result == Fetching] "Fetch",
48-
case result of
49-
NotFetched ->
50-
HE.div_ "Not Fetched..."
51-
Fetching ->
52-
HE.div_ "Fetching..."
53-
Ok ok ->
54-
HE.pre_ <<< HE.code_ $ "Ok: " <> ok
55-
Error error ->
56-
HE.div_ $ "Error: " <> error
57-
]
44+
view Model Html Message
45+
view { url, result } = HE.main "main"
46+
[ HE.input [ HA.onInput UpdateUrl, HA.value url, HA.type' "text" ]
47+
, HE.button [ HA.onClick Fetch, HA.disabled $ result == Fetching ] "Fetch"
48+
, case result of
49+
NotFetched
50+
HE.div_ "Not Fetched..."
51+
Fetching
52+
HE.div_ "Fetching..."
53+
Ok ok
54+
HE.pre_ <<< HE.code_ $ "Ok: " <> ok
55+
Error error
56+
HE.div_ $ "Error: " <> error
57+
]
5858

59-
main :: Effect Unit
60-
main = FAE.mount_ (QuerySelector "body") {
61-
init: init :> Nothing,
62-
subscribe: [],
63-
update,
64-
view
65-
}
59+
main Effect Unit
60+
main = FAE.mount_ (QuerySelector "body")
61+
{ init: init :> Nothing
62+
, subscribe: []
63+
, update
64+
, view
65+
}

examples/EffectfulDice/Dice.purs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ import Flame.Html.Element as HE
1414

1515
type Model = Maybe Int
1616

17-
init :: Model
17+
init Model
1818
init = Nothing
1919

2020
data Message = Roll
2121

22-
update :: AffUpdate Model Message
22+
update AffUpdate Model Message
2323
update { model } = map (const <<< Just) $ liftEffect $ ER.randomInt 1 6
2424

25-
view :: Model -> Html Message
26-
view model = HE.main "main" [
27-
HE.text (show model),
28-
HE.button [HA.onClick Roll] "Roll"
29-
]
30-
31-
main :: Effect Unit
32-
main = FAE.mount_ (QuerySelector "body") {
33-
init: init :> Nothing,
34-
subscribe: [],
35-
update,
36-
view
37-
}
25+
view Model Html Message
26+
view model = HE.main "main"
27+
[ HE.text (show model)
28+
, HE.button [ HA.onClick Roll ] "Roll"
29+
]
30+
31+
main Effect Unit
32+
main = FAE.mount_ (QuerySelector "body")
33+
{ init: init :> Nothing
34+
, subscribe: []
35+
, update
36+
, view
37+
}

0 commit comments

Comments
 (0)