Updates for PS 0.14 (#11)

* Updates for PS 0.14

* Update workflow versions

* Add missing period

Author: robertdp

.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
 
       - uses: thomashoneyman/setup-purescript@main
         with:
-          purescript: "0.13.8"
-          spago: "0.18.1"
+          purescript: "0.14.0"
+          spago: "0.19.1"
 
       - name: Cache PureScript dependencies
         uses: actions/cache@v2

bower.json

@@ -14,12 +14,12 @@
     "output"
   ],
   "dependencies": {
-    "purescript-aff": "^v5.1.2",
-    "purescript-event": "^v1.3.0",
-    "purescript-free": "^v5.2.0",
-    "purescript-freeap": "^v5.0.1",
-    "purescript-react-basic-hooks": "^v6.2.0",
-    "purescript-refs": "^v4.1.0",
-    "purescript-unsafe-reference": "^v3.1.0"
+    "purescript-aff": "^v6.0.0",
+    "purescript-free": "^v6.0.0",
+    "purescript-freeap": "^v6.0.0",
+    "purescript-halogen-subscriptions": "^v1.0.0",
+    "purescript-react-basic-hooks": "^v7.0.0",
+    "purescript-refs": "^v5.0.0",
+    "purescript-unsafe-reference": "^v4.0.0"
   }
 }

package-lock.json

@@ -11,12 +11,12 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "bower": "^1.8.8",
+    "bower": "^1.8.12",
     "pulp": "^15.0.0",
-    "purescript": "^0.13.8",
-    "purescript-psa": "^0.8.0",
-    "purty": "^6.3.0",
+    "purescript": "^0.14.0",
+    "purescript-psa": "^0.8.2",
+    "purty": "^7.0.0",
     "rimraf": "^3.0.2",
-    "spago": "^0.18.1"
+    "spago": "^0.19.1"
   }
 }

package.json

@@ -116,10 +116,8 @@ let additions =
   }
 -------------------------------
 -}
-
-
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201223/packages.dhall sha256:a1a8b096175f841c4fef64c9b605fb0d691229241fd2233f6cf46e213de8a185
+      https://raw.githubusercontent.com/purescript/package-sets/master/src/packages.dhall sha256:5bfea0ec14831c81482d72ffdcaf476e317d69d0788f49a08f05b619a4f70b47
 
 let overrides = {=}
 

packages.dhall

@@ -6,7 +6,7 @@ You can edit this file as you like.
 , license = "BSD-3-Clause"
 , repository = "https://github.com/robertdp/purescript-react-halo.git"
 , dependencies =
-  [ "aff", "event", "free", "freeap", "react-basic-hooks", "refs", "unsafe-reference" ]
+  [ "aff", "free", "freeap", "halogen-subscriptions", "react-basic-hooks", "refs", "unsafe-reference" ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs" ]
 }

spago.dhall

@@ -14,7 +14,7 @@ import Data.Bifunctor (lmap)
 import Data.Tuple (Tuple)
 import Effect.Aff.Class (class MonadAff, liftAff)
 import Effect.Class (class MonadEffect, liftEffect)
-import FRP.Event (Event)
+import Halogen.Subscription (Emitter)
 import React.Halo.Internal.Types (ForkId, SubscriptionId)
 
 -- | The Halo evaluation algebra
@@ -29,7 +29,7 @@ data HaloF props ctx state action (m :: Type -> Type) a
   = Props (props -> a)
   | Context (ctx -> a)
   | State (state -> Tuple a state)
-  | Subscribe (SubscriptionId -> Event action) (SubscriptionId -> a)
+  | Subscribe (SubscriptionId -> Emitter action) (SubscriptionId -> a)
   | Unsubscribe SubscriptionId a
   | Lift (m a)
   | Par (HaloAp props ctx state action m a)
@@ -150,16 +150,16 @@ props = HaloM (liftF (Props identity))
 context :: forall props ctx state action m. HaloM props ctx state action m ctx
 context = HaloM (liftF (Context identity))
 
--- | Subscribe to new actions from an `Event`. Subscriptions will be automatically cancelled when the component
+-- | Subscribe to new actions from an `Emitter`. Subscriptions will be automatically cancelled when the component
 -- | unmounts.
 -- |
 -- | Returns a `SubscriptionId` which can be used with `unsubscribe` to manually cancel a subscription.
-subscribe :: forall props ctx state action m. Event action -> HaloM props ctx state action m SubscriptionId
+subscribe :: forall props ctx state action m. Emitter action -> HaloM props ctx state action m SubscriptionId
 subscribe = subscribe' <<< const
 
 -- | Same as `subscribe` but the event-producing logic is also passed the `SuscriptionId`. This is useful when events
 -- | need to unsubscribe themselves.
-subscribe' :: forall props ctx state action m. (SubscriptionId -> Event action) -> HaloM props ctx state action m SubscriptionId
+subscribe' :: forall props ctx state action m. (SubscriptionId -> Emitter action) -> HaloM props ctx state action m SubscriptionId
 subscribe' event = HaloM (liftF (Subscribe event identity))
 
 -- | Cancels the event subscription belonging to the `SubscriptionId`.

src/React/Halo/Internal/Control.purs

@@ -4,7 +4,7 @@ import Prelude
 import Control.Applicative.Free (foldFreeAp)
 import Control.Monad.Free (foldFree)
 import Data.Either (either)
-import Data.Foldable (sequence_, traverse_)
+import Data.Foldable (traverse_)
 import Data.Map as Map
 import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(..))
@@ -13,7 +13,7 @@ import Effect.Aff (Aff, ParAff, finally, parallel, sequential, throwError)
 import Effect.Aff as Aff
 import Effect.Class (liftEffect)
 import Effect.Ref as Ref
-import FRP.Event as Event
+import Halogen.Subscription (subscribe, unsubscribe)
 import React.Halo.Internal.Control (HaloAp(..), HaloF(..), HaloM(..))
 import React.Halo.Internal.State (HaloState(..))
 import React.Halo.Internal.State as State
@@ -53,13 +53,13 @@ evalHaloF hs@(HaloState s) = case _ of
     liftEffect do
       sid <- State.fresh SubscriptionId hs
       unlessM (Ref.read s.finalized) do
-        canceller <- Event.subscribe (sub sid) (handleAction hs)
+        canceller <- subscribe (sub sid) (handleAction hs)
         Ref.modify_ (Map.insert sid canceller) s.subscriptions
       pure (k sid)
   Unsubscribe sid a ->
     liftEffect do
-      canceller <- Map.lookup sid <$> Ref.read s.subscriptions
-      sequence_ canceller
+      subscription <- Map.lookup sid <$> Ref.read s.subscriptions
+      traverse_ unsubscribe subscription
       pure a
   Lift m -> m
   Par p -> sequential (evalHaloAp hs p)
@@ -143,7 +143,7 @@ runFinalize :: forall props ctx state action. HaloState props ctx state action -
 runFinalize hs@(HaloState s) = do
   Ref.write true s.finalized
   subscriptions <- Ref.modify' (\s' -> { state: Map.empty, value: s' }) s.subscriptions
-  sequence_ (Map.values subscriptions)
+  traverse_ unsubscribe (Map.values subscriptions)
   forks <- Ref.modify' (\s' -> { state: Map.empty, value: s' }) s.forks
   traverse_ (runAff <<< Aff.killFiber (Aff.error "Cancelled")) (Map.values forks)
   runAff $ evalHaloM hs $ s.eval Finalize

src/React/Halo/Internal/Eval.purs

@@ -7,6 +7,7 @@ import Effect (Effect)
 import Effect.Aff (Aff, Fiber)
 import Effect.Ref (Ref)
 import Effect.Ref as Ref
+import Halogen.Subscription (Subscription)
 import React.Halo.Internal.Control (HaloM)
 import React.Halo.Internal.Types (ForkId, Lifecycle, SubscriptionId)
 
@@ -20,7 +21,7 @@ newtype HaloState props ctx state action
   , context :: Ref ctx
   , state :: Ref state
   , fresh :: Ref Int
-  , subscriptions :: Ref (Map SubscriptionId (Effect Unit))
+  , subscriptions :: Ref (Map SubscriptionId Subscription)
   , forks :: Ref (Map ForkId (Fiber Unit))
   }
 

src/React/Halo/Internal/State.purs

@@ -7,7 +7,7 @@ import Prelude
 -- | - `Initialize` contains the initial props. It occurs when the component mounts, and only once per component.
 -- | - `Update` contains the previous and new props. It occurs when the component re-renders and the props have changes.
 -- | - `Action` contains the dispatched action. It occurs each time an action is dispatched to be eval'd, up until the
--- |   `Finalize` event
+-- |   `Finalize` event.
 -- | - `Finalize` occurs when the component unmounts.
 data Lifecycle props ctx action
   = Initialize { props :: props, context :: ctx }