Skip to content

Commit 9010b5b

Browse files
authored
Merge pull request #21 from cryogenian/10-updates
0.10-updates
2 parents 16e37d8 + b66faf2 commit 9010b5b

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

bower.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"package.json"
2828
],
2929
"dependencies": {
30-
"purescript-ace": "^2.0.0",
31-
"purescript-halogen": "^0.11.0",
32-
"purescript-now": "^1.0.0",
33-
"purescript-random": "^1.0.0",
34-
"purescript-refs": "^1.0.0"
30+
"purescript-ace": "^3.0.0",
31+
"purescript-halogen": "^0.12.0",
32+
"purescript-now": "^2.0.0",
33+
"purescript-random": "^2.0.0",
34+
"purescript-refs": "^2.0.0"
3535
}
3636
}

example/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"pulp": "^9.0.1",
12-
"purescript": "^0.9.1",
13-
"rimraf": "^2.5.2"
12+
"purescript": "^0.10.1",
13+
"rimraf": "^2.5.4"
1414
}
1515
}

example/src/Main.purs

+11-11
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ data Query a
2525
= UpdateText a
2626

2727
type State =
28-
{ text :: String
28+
{ text String
2929
}
3030

31-
initialState :: State
31+
initialState State
3232
initialState =
3333
{ text : "Name: Ace Editor"
3434
}
@@ -38,38 +38,38 @@ type AceSlot = Unit
3838
type StateP g = H.ParentState State AceState Query AceQuery g AceSlot
3939
type QueryP = Coproduct Query (H.ChildF AceSlot AceQuery)
4040
type MainHtml g = H.ParentHTML AceState Query AceQuery g AceSlot
41-
type MainEffects = H.HalogenEffects (random :: RANDOM, now :: NOW, ref :: REF, ace :: ACE)
41+
type MainEffects = H.HalogenEffects (random RANDOM, now NOW, ref REF, ace ACE)
4242
type MainAff = Aff MainEffects
4343
type MainDSL = H.ParentDSL State AceState Query AceQuery MainAff AceSlot
4444

45-
ui :: H.Component (StateP MainAff) QueryP MainAff
45+
ui H.Component (StateP MainAff) QueryP MainAff
4646
ui = H.parentComponent { render, eval, peek: Just (peek <<< H.runChildF) }
4747
where
4848

49-
render :: State -> MainHtml MainAff
49+
render State MainHtml MainAff
5050
render state =
5151
HH.div_
5252
[ HH.Slot $ aceConstructor unit (initEditor state) Nothing
5353
, HH.div_ [ HH.text state.text ]
5454
]
5555

56-
initEditor :: State -> Editor -> MainAff Unit
56+
initEditor State Editor MainAff Unit
5757
initEditor state editor = liftEff $ do
58-
session <- Editor.getSession editor
58+
session Editor.getSession editor
5959
Session.setMode "ace/mode/yaml" session
6060
Editor.setValue state.text Nothing editor
6161
pure unit
6262

63-
eval :: Query ~> MainDSL
63+
eval Query ~> MainDSL
6464
eval (UpdateText next) =
6565
pure next
6666

67-
peek :: forall x. AceQuery x -> MainDSL Unit
67+
peek forall x. AceQuery x MainDSL Unit
6868
peek (TextChanged _) = do
69-
text <- H.query unit $ H.request GetText
69+
text H.query unit $ H.request GetText
7070
H.modify (_ { text = fromMaybe "" text })
7171
peek _ =
7272
pure unit
7373

74-
main :: Eff MainEffects Unit
74+
main Eff MainEffects Unit
7575
main = runHalogenAff $ H.runUI ui (H.parentState initialState) =<< awaitBody

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
},
88
"devDependencies": {
99
"jscs": "^3.0.7",
10-
"jshint": "^2.9.2",
10+
"jshint": "^2.9.4",
1111
"pulp": "^9.0.1",
12-
"purescript": "^0.9.2",
12+
"purescript": "^0.10.1",
1313
"purescript-psa": "^0.3.9",
1414
"rimraf": "^2.5.4"
1515
}

src/Ace/Halogen/Component.purs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import Control.Monad.Eff.Ref (Ref, REF, readRef, writeRef, modifyRef)
2222
import Data.DateTime.Instant (unInstant)
2323
import Data.Foldable (traverse_, for_)
2424
import Data.Maybe (Maybe(..), maybe)
25+
import Data.Newtype (unwrap)
2526
import Data.StrMap (StrMap)
2627
import Data.StrMap as Sm
27-
import Data.Time.Duration (unMilliseconds)
2828

2929
import Ace as Ace
3030
import Ace.Editor as Editor
@@ -103,7 +103,7 @@ genKey = do
103103
rn1 ← random
104104
rn2 ← random
105105
instant ← now
106-
pure $ show rn1 <> show (unMilliseconds (unInstant instant)) <> show rn2
106+
pure $ show rn1 <> show (unwrap (unInstant instant)) <> show rn2
107107

108108
data Autocomplete = Live | Basic
109109

@@ -146,7 +146,7 @@ data AceQuery a
146146
-- | The type for autocomplete function s. Takes editor, session, text position,
147147
-- | prefix, and returns array of possible completions in the `Aff` monad.
148148
type CompleteFn eff
149-
= Editor
149+
= Editor
150150
EditSession
151151
Position
152152
String
@@ -172,7 +172,7 @@ initialAceState =
172172
-- | The Ace component.
173173
aceComponent
174174
eff g
175-
. (Monad g, Affable (AceEffects eff) g)
175+
. (Monad g, Affable (AceEffects eff) g)
176176
(Editor g Unit)
177177
Maybe Autocomplete
178178
H.Component AceState AceQuery g

0 commit comments

Comments
 (0)