Merge pull request #6 from rintcius/purescript-0.12

rintcius · web-flow · commit 1f63639131de · 2019-01-09T17:06:32.000+01:00
Upgrade to PureScript 0.12
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 /node_modules/
 npm-debug.log*
 .psc-ide-port
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: stable
 install:
   - npm install -g bower
   - npm install && bower install
diff --git a/bower.json b/bower.json
@@ -20,15 +20,15 @@
     "example"
   ],
   "dependencies": {
-    "purescript-enums": "^3.2.0",
-    "purescript-formatters": "^3.0.0",
-    "purescript-datetime": "^3.3.0",
-    "purescript-halogen": "^3.0.1",
-    "purescript-halogen-css": "^7.0.0",
-    "purescript-generics-rep": "^5.0.0",
-    "purescript-validation": "^3.1.0",
-    "purescript-profunctor": "^3.1.0",
-    "purescript-numbers": "^5.0.0",
-    "purescript-these": "^3.0.0"
+    "purescript-enums": "^4.0.0",
+    "purescript-formatters": "^4.0.0",
+    "purescript-datetime": "^4.1.0",
+    "purescript-halogen": "^4.0.0",
+    "purescript-halogen-css": "^8.0.0",
+    "purescript-generics-rep": "^6.1.0",
+    "purescript-validation": "^4.0.0",
+    "purescript-profunctor": "^4.0.0",
+    "purescript-numbers": "^6.0.0",
+    "purescript-these": "^4.0.0"
   }
 }
diff --git a/example/src/Main.purs b/example/src/Main.purs
@@ -2,7 +2,6 @@ module Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
 import Data.Bitraversable (bitraverse)
 import Data.Date (Date, canonicalDate)
 import Data.DateTime (DateTime(..))
@@ -18,8 +17,8 @@ import Data.Interval.Duration.Iso (IsoDuration, mkIsoDuration)
 import Data.Map (Map, lookup, insert)
 import Data.Maybe (Maybe(..), fromJust)
 import Data.Maybe.Last (Last(..))
-import Data.Monoid (mempty)
 import Data.Time (Time, setHour, setMinute)
+import Effect (Effect)
 import Halogen as H
 import Halogen.Aff as HA
 import Halogen.Component.ChildPath as CP
@@ -101,7 +100,7 @@ cpInterval = CP.cp5
 type HTML m = H.ParentHTML Query ChildQuery Slot m
 type DSL m = H.ParentDSL State Query ChildQuery Slot Void m
 
-main ∷ Eff (HA.HalogenEffects ()) Unit
+main ∷ Effect Unit
 main = HA.runHalogenAff do
   body ← HA.awaitBody
   runUI example unit body
@@ -270,15 +269,15 @@ example =
   eval (HandleMessage payload next) = do
     case payload of
       MsgTime idx (NotifyChange val) →
-        H.modify \s → s{ times = insert idx (show val) s.times }
+        H.modify_ \s → s{ times = insert idx (show val) s.times }
       MsgDate idx (NotifyChange val) →
-        H.modify \s → s{ dates = insert idx (show val) s.dates }
+        H.modify_ \s → s{ dates = insert idx (show val) s.dates }
       MsgDateTime idx (NotifyChange val) →
-        H.modify \s → s{ dateTimes = insert idx (show val) s.dateTimes }
+        H.modify_ \s → s{ dateTimes = insert idx (show val) s.dateTimes }
       MsgDuration idx (NotifyChange val) →
-        H.modify \s → s{ durations = insert idx (show val) s.durations }
+        H.modify_ \s → s{ durations = insert idx (show val) s.durations }
       MsgInterval idx (NotifyChange val) →
-        H.modify \s → s{ intervals = insert idx (show val) s.intervals }
+        H.modify_ \s → s{ intervals = insert idx (show val) s.intervals }
     pure next
 
 
@@ -318,7 +317,7 @@ renderExample c items idx fmt' value'= unEither $ do
     [ HE.onClick $ HE.input_ $ c.setter idx val]
     [ HH.text txt]
   unEither ∷ StrOr (Array (HTML m)) → Array (HTML m)
-  unEither = either (HH.text >>> pure >>> HH.div_ >>> pure) id
+  unEither = either (HH.text >>> pure >>> HH.div_ >>> pure) identity
 
 timeConfig ∷ ∀ m. ExampleConfig
   String
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
   "private": true,
   "scripts": {
+    "refresh": "rimraf bower_components && rimraf output && bower i && npm run build",
     "watch": "pulp --watch build --include example/src --to example/example.js",
     "build": "pulp build --include example/src --to example/example.js"
   },
   "devDependencies": {
-    "pulp": "^11.0.0",
-    "purescript": "^0.11.0",
-    "purescript-psa": "^0.5.0"
+    "pulp": "^12.3.1",
+    "purescript": "0.12.0",
+    "purescript-psa": "^0.7.3"
   }
 }
diff --git a/src/Halogen/DatePicker/Component/Date.purs b/src/Halogen/DatePicker/Component/Date.purs
@@ -13,7 +13,6 @@ import Data.Functor.Coproduct.Nested (Coproduct2)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..), maybe)
-import Data.Monoid (mempty)
 import Data.Newtype (unwrap)
 import Data.Profunctor.Join (Join(..))
 import Data.Profunctor.Star (Star(..))
diff --git a/src/Halogen/DatePicker/Component/DateTime.purs b/src/Halogen/DatePicker/Component/DateTime.purs
@@ -14,7 +14,6 @@ import Data.Functor.Coproduct (Coproduct, coproduct, right)
 import Data.Functor.Coproduct.Nested (Coproduct2)
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Maybe.Last (Last(..))
-import Data.Monoid (mempty)
 import Data.Monoid.Additive (Additive(..))
 import Data.Newtype (unwrap)
 import Data.Profunctor.Join (Join(..))
diff --git a/src/Halogen/DatePicker/Component/Duration.purs b/src/Halogen/DatePicker/Component/Duration.purs
@@ -11,7 +11,6 @@ import Data.Generic.Rep.Show (genericShow)
 import Data.Interval (Duration)
 import Data.Interval.Duration.Iso (IsoDuration, mkIsoDuration, unIsoDuration, Errors)
 import Data.Maybe (Maybe(..), fromMaybe)
-import Data.Monoid (mempty)
 import Data.Monoid.Endo (Endo(..))
 import Data.Newtype (unwrap)
 import Data.String (take)
@@ -88,7 +87,7 @@ evalDuration format (UpdateCommand cmd val next) = do
     _  → buildDuration format
   pure next
 
-type BuildStep = Maybe (Endo Duration)
+type BuildStep = Maybe (Endo (->) Duration)
 buildDuration ∷ ∀ m
   . F.Format
   → DSL m (Either (Tuple Boolean DurationError) IsoDuration)
diff --git a/src/Halogen/DatePicker/Component/Time.purs b/src/Halogen/DatePicker/Component/Time.purs
@@ -13,7 +13,6 @@ import Data.Functor.Coproduct.Nested (Coproduct2)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(Nothing, Just), maybe)
-import Data.Monoid (mempty)
 import Data.Newtype (unwrap)
 import Data.Profunctor.Join (Join(..))
 import Data.Profunctor.Star (Star(..))
diff --git a/src/Halogen/DatePicker/Config.purs b/src/Halogen/DatePicker/Config.purs
@@ -7,7 +7,6 @@ import Data.Generic.Rep.Monoid (genericMempty)
 import Data.Generic.Rep.Semigroup (genericAppend)
 import Data.Maybe (Maybe(..))
 import Data.Maybe.Last (Last(..))
-import Data.Monoid (class Monoid)
 import Data.Newtype (class Newtype)
 import Halogen.HTML (ClassName(..))
 
diff --git a/src/Halogen/DatePicker/Internal/Choice.purs b/src/Halogen/DatePicker/Internal/Choice.purs
@@ -84,7 +84,7 @@ evalChoice (Update value next) = do
   s ← H.get
   -- there wouldn't be case when value is Nothing so it's fine to do `for_`
   for_ value \value' → do
-    H.modify _{value = value'}
+    H.modify_ _{value = value'}
     when (value' /= s.value) $ H.raise (NotifyChange $ value')
   pure next
 
@@ -93,7 +93,7 @@ evalPicker ∷ ∀ val m . Eq val ⇒ Config val → HasChoiceInputVal val → Q
 evalPicker {values} hasChoiceInputVal (SetValue value next) = do
   if (value == head values || elem value (tail values))
     then do
-      H.modify _{value = value}
+      H.modify_ _{value = value}
       pure $ next Nothing
     else do
       pure $ next (Just ValueIsNotInValues)
@@ -109,8 +109,8 @@ type HasChoiceInputVal a =
 stringHasChoiceInputVal ∷ HasChoiceInputVal String
 stringHasChoiceInputVal =
   { fromString: pure
-  , toValue: id
-  , toTitle: id
+  , toValue: identity
+  , toTitle: identity
   }
 numberHasChoiceInputVal ∷ HasChoiceInputVal Number
 numberHasChoiceInputVal =
diff --git a/src/Halogen/DatePicker/Internal/Num.purs b/src/Halogen/DatePicker/Internal/Num.purs
@@ -18,17 +18,16 @@ import CSS as CSS
 import Control.Alternative (class Alternative, empty)
 import Control.Monad.Except (runExcept)
 import Control.MonadPlus (guard)
-import DOM.Event.Event (Event)
 import Data.Bifunctor (lmap)
 import Data.Enum (class BoundedEnum, fromEnum, toEnum)
-import Data.Foreign (readBoolean, readString, toForeign)
-import Data.Foreign.Index (readProp)
 import Data.Functor.Coproduct (Coproduct, coproduct, right)
 import Data.Int as Int
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Number as N
 import Data.String (Pattern(..), length, stripSuffix)
 import Data.Tuple (Tuple(..), fst)
+import Foreign (readBoolean, readString, unsafeToForeign)
+import Foreign.Index (readProp)
 import Halogen as H
 import Halogen.Datepicker.Component.Types (BasePickerQuery(..), PickerMessage(..))
 import Halogen.Datepicker.Internal.Range (Range(..), isInRange, rangeMax, rangeMin)
@@ -38,6 +37,7 @@ import Halogen.HTML.CSS as HCSS
 import Halogen.HTML.Core (ClassName)
 import Halogen.HTML.Events as HE
 import Halogen.HTML.Properties as HP
+import Web.Event.Event (Event)
 
 
 type State val = InputValue val
@@ -188,7 +188,7 @@ inputValueFromEvent event = let val = validValueFromEvent event
 
 validValueFromEvent ∷ Event → Maybe String
 validValueFromEvent event = join $ asRight $ runExcept $ do
-  target ← readProp "target" $ toForeign event
+  target ← readProp "target" $ unsafeToForeign event
   validity ← readProp "validity" target
   badInput ← readProp "badInput" validity >>= readBoolean
   value ← readProp "value" target >>= readString
@@ -204,7 +204,7 @@ numberHasNumberInputVal ∷ HasNumberInputVal Number
 numberHasNumberInputVal =
   { fromString: N.fromString
   , toValue: showNum
-  , toNumber: id
+  , toNumber: identity
   }
 
 intHasNumberInputVal ∷ HasNumberInputVal Int
diff --git a/src/Halogen/DatePicker/Internal/Utils.purs b/src/Halogen/DatePicker/Internal/Utils.purs
@@ -8,7 +8,6 @@ import Data.Bifunctor (bimap, lmap)
 import Data.Either (Either(..), either)
 import Data.Foldable (fold)
 import Data.Maybe (Maybe(..))
-import Data.Monoid (class Monoid)
 import Data.Traversable (sequence)
 import Data.Tuple (Tuple(..))
 import Halogen as H

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"scripts": {`
	`4`	`+ "refresh": "rimraf bower_components && rimraf output && bower i && npm run build",`
`4`	`5`	`"watch": "pulp --watch build --include example/src --to example/example.js",`
`5`	`6`	`"build": "pulp build --include example/src --to example/example.js"`
`6`	`7`	`},`
`7`	`8`	`"devDependencies": {`
`8`		`- "pulp": "^11.0.0",`
`9`		`- "purescript": "^0.11.0",`
`10`		`- "purescript-psa": "^0.5.0"`
	`9`	`+ "pulp": "^12.3.1",`
	`10`	`+ "purescript": "0.12.0",`
	`11`	`+ "purescript-psa": "^0.7.3"`
`11`	`12`	`}`
`12`	`13`	`}`