38e791b · reflex · git.iko.soy

git.iko.soy/reflex

Merge branch 'develop' into fix-nixpkgs-tests

commit38e791b351a81ae0bf6640f75dc98526312698f1 authorAli Abrar <aliabrar@gmail.com> dateThu 5 Nov 2020, 23:01 (6 years ago) parent7b5df7b 9ea217c

15 files changed+98−33

compare with develop

unifiedsplit

Quickref.md+1 reflex.cabal+10−1 src/Reflex/Adjustable/Class.hs+2−1 src/Reflex/BehaviorWriter/Base.hs+13−4 src/Reflex/Class.hs+2−1 src/Reflex/DynamicWriter/Base.hs+13−4 src/Reflex/EventWriter/Base.hs+14−5 src/Reflex/Host/Headless.hs+11−9 src/Reflex/Profiled.hs+2−1 src/Reflex/Pure.hs+2−1 src/Reflex/Query/Base.hs+9−3 src/Reflex/Requester/Base.hs+6−1 src/Reflex/Spider/Internal.hs+2−1 test/Headless.hs+10 test/Reflex/Test/CrossImpl.hs+1−1

Quickref.md+1

@@ -54,6 +54,7 @@ Since MonadHold depends on MonadSample, any [S] function also runs in [H] contex

5454[ ] difference :: Event a -> Event b -> Event a

5555[ ] align :: Event a -> Event b -> Event (These a b)

5656[ ] alignWith :: (These a b -> c) -> Event a -> Event b -> Event c

57+ -- Note align functions from Data.Align in semialign package

5758[ ] mergeWith :: (a -> a -> a) -> [Event a] -> Event a

5859[ ] leftmost :: [Event a] -> Event a

5960[ ] mergeList :: [Event a] -> Event (NonEmpty a)

reflex.cabal+10−1

@@ -77,9 +77,10 @@ library

7777 constraints-extras >= 0.3 && < 0.4,

7878 containers >= 0.6 && < 0.7,

7979 data-default >= 0.5 && < 0.8,

80− dependent-map >= 0.3 && < 0.4,

80+ dependent-map >= 0.3 && < 0.5,

8181 exception-transformers == 0.4.*,

8282 lens >= 4.7 && < 5,

83+ mmorph >= 1.0 && < 1.2,

8384 monad-control >= 1.0.1 && < 1.1,

8485 mtl >= 2.1 && < 2.3,

8586 patch >= 0.0.1 && < 0.1,

@@ -344,6 +345,14 @@ test-suite RequesterT

344345 Reflex.Plan.Pure

345346 Test.Run

346347

348+test-suite Headless

349+ default-language: Haskell2010

350+ type: exitcode-stdio-1.0

351+ main-is: Headless.hs

352+ hs-source-dirs: test

353+ build-depends: base

354+ , reflex

355+

347356test-suite Adjustable

348357 default-language: Haskell2010

349358 type: exitcode-stdio-1.0

src/Reflex/Adjustable/Class.hs+2−1

@@ -30,7 +30,8 @@ module Reflex.Adjustable.Class

3030

3131import Control.Monad.Identity

3232import Control.Monad.Reader

33−import Data.Dependent.Map (DMap, GCompare (..))

33+import Data.Dependent.Map (DMap)

34+import Data.GADT.Compare (GCompare(..))

3435import qualified Data.Dependent.Map as DMap

3536import Data.Functor.Constant

3637import Data.Functor.Misc

src/Reflex/BehaviorWriter/Base.hs+13−4

@@ -24,6 +24,7 @@ module Reflex.BehaviorWriter.Base

2424import Control.Monad.Exception

2525import Control.Monad.Identity

2626import Control.Monad.IO.Class

27+import Control.Monad.Morph

2728import Control.Monad.Reader

2829import Control.Monad.Ref

2930import Control.Monad.State.Strict

@@ -48,7 +49,18 @@ import Reflex.TriggerEvent.Class

4849

4950-- | A basic implementation of 'BehaviorWriter'.

5051newtype BehaviorWriterT t w m a = BehaviorWriterT { unBehaviorWriterT :: StateT [Behavior t w] m a }

51− deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadAsyncException, MonadException) -- The list is kept in reverse order

52+ -- The list is kept in reverse order

53+ deriving

54+ ( Functor

55+ , Applicative

56+ , Monad

57+ , MonadTrans

58+ , MFunctor

59+ , MonadIO

60+ , MonadFix

61+ , MonadAsyncException

62+ , MonadException

63+ )

5264

5365-- | Run a 'BehaviorWriterT' action. The behavior writer output will be provided

5466-- along with the result of the action.

@@ -73,9 +85,6 @@ withBehaviorWriterT f dw = do

7385deriving instance MonadHold t m => MonadHold t (BehaviorWriterT t w m)

7486deriving instance MonadSample t m => MonadSample t (BehaviorWriterT t w m)

7587

76−instance MonadTrans (BehaviorWriterT t w) where

77− lift = BehaviorWriterT . lift

78−

7988instance MonadRef m => MonadRef (BehaviorWriterT t w m) where

8089 type Ref (BehaviorWriterT t w m) = Ref m

8190 newRef = lift . newRef

src/Reflex/Class.hs+2−1

@@ -196,7 +196,8 @@ import Data.Align

196196import Data.Bifunctor

197197import Data.Coerce

198198import Data.Default

199−import Data.Dependent.Map (DMap, DSum (..))

199+import Data.Dependent.Map (DMap)

200+import Data.Dependent.Sum (DSum (..))

200201import qualified Data.Dependent.Map as DMap

201202import Data.Functor.Compose

202203import Data.Functor.Product

src/Reflex/DynamicWriter/Base.hs+13−4

@@ -22,6 +22,7 @@ module Reflex.DynamicWriter.Base

2222import Control.Monad.Exception

2323import Control.Monad.Identity

2424import Control.Monad.IO.Class

25+import Control.Monad.Morph

2526import Control.Monad.Primitive

2627import Control.Monad.Reader

2728import Control.Monad.Ref

@@ -51,9 +52,6 @@ import Reflex.Query.Class

5152import Reflex.Requester.Class

5253import Reflex.TriggerEvent.Class

5354

54−instance MonadTrans (DynamicWriterT t w) where

55− lift = DynamicWriterT . lift

56−

5755mapIncrementalMapValues :: (Reflex t, Patch (p v), Patch (p v'), PatchTarget (p v) ~ f v, PatchTarget (p v') ~ f v', Functor p, Functor f) => (v -> v') -> Incremental t (p v) -> Incremental t (p v')

5856mapIncrementalMapValues f = unsafeMapIncremental (fmap f) (fmap f)

5957

@@ -90,7 +88,18 @@ mergeDynIncrementalWithMove a = unsafeBuildIncremental (mapM (sample . current)

9088

9189-- | A basic implementation of 'DynamicWriter'.

9290newtype DynamicWriterT t w m a = DynamicWriterT { unDynamicWriterT :: StateT [Dynamic t w] m a }

93− deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadAsyncException, MonadException) -- The list is kept in reverse order

91+ -- The list is kept in reverse order

92+ deriving

93+ ( Functor

94+ , Applicative

95+ , Monad

96+ , MonadTrans

97+ , MFunctor

98+ , MonadIO

99+ , MonadFix

100+ , MonadAsyncException

101+ , MonadException

102+ )

94103

95104deriving instance MonadHold t m => MonadHold t (DynamicWriterT t w m)

96105deriving instance MonadSample t m => MonadSample t (DynamicWriterT t w m)

src/Reflex/EventWriter/Base.hs+14−5

@@ -35,12 +35,14 @@ import Reflex.TriggerEvent.Class

3535

3636import Control.Monad.Exception

3737import Control.Monad.Identity

38+import Control.Monad.Morph

3839import Control.Monad.Primitive

3940import Control.Monad.Reader

4041import Control.Monad.Ref

4142import Control.Monad.State.Strict

42−import Data.Dependent.Map (DMap, DSum (..))

43+import Data.Dependent.Map (DMap)

4344import qualified Data.Dependent.Map as DMap

45+import Data.Dependent.Sum (DSum (..))

4446import Data.Functor.Compose

4547import Data.Functor.Misc

4648import Data.GADT.Compare (GCompare (..), GEq (..), GOrdering (..))

@@ -96,7 +98,17 @@ data EventWriterState t w = EventWriterState

9698

9799-- | A basic implementation of 'EventWriter'.

98100newtype EventWriterT t w m a = EventWriterT { unEventWriterT :: StateT (EventWriterState t w) m a }

99− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException, MonadAsyncException)

101+ deriving

102+ ( Functor

103+ , Applicative

104+ , Monad

105+ , MonadTrans

106+ , MFunctor

107+ , MonadFix

108+ , MonadIO

109+ , MonadException

110+ , MonadAsyncException

111+ )

100112

101113-- | Run a 'EventWriterT' action.

102114runEventWriterT :: forall t m w a. (Reflex t, Monad m, Semigroup w) => EventWriterT t w m a -> m (a, Event t w)

@@ -116,9 +128,6 @@ instance (Reflex t, Monad m, Semigroup w) => EventWriter t w (EventWriterT t w m

116128 , _eventWriterState_told = (tellId myId :=> w) : _eventWriterState_told old

117129 }

118130

119−instance MonadTrans (EventWriterT t w) where

120− lift = EventWriterT . lift

121−

122131instance MonadSample t m => MonadSample t (EventWriterT t w m) where

123132 sample = lift . sample

124133

src/Reflex/Host/Headless.hs+11−9

@@ -7,6 +7,7 @@

77module Reflex.Host.Headless where

99import Control.Concurrent.Chan (newChan, readChan)

10+import Control.Monad (unless)

1011import Control.Monad.Fix (MonadFix, fix)

1112import Control.Monad.IO.Class (MonadIO, liftIO)

1213import Control.Monad.Primitive (PrimMonad)

@@ -15,7 +16,7 @@ import Data.Dependent.Sum (DSum (..), (==>))

1516import Data.Foldable (for_)

1617import Data.Functor.Identity (Identity(..))

1718import Data.IORef (IORef, readIORef)

18−import Data.Maybe (catMaybes)

19+import Data.Maybe (catMaybes, fromMaybe)

1920import Data.Traversable (for)

2021

2122import Reflex

@@ -82,32 +83,33 @@ runHeadlessApp guest =

8283 -- 'Nothing' if the guest application hasn't subscribed to this event.

8384 mPostBuildTrigger <- readRef postBuildTriggerRef

8485

85− -- When there is a subscriber to the post-build event, fire the event.

86− for_ mPostBuildTrigger $ \postBuildTrigger ->

87− fire [postBuildTrigger :=> Identity ()] $ pure ()

88−

8986 -- Subscribe to an 'Event' of that the guest application can use to

9087 -- request application shutdown. We'll check whether this 'Event' is firing

9188 -- to determine whether to terminate.

9289 shutdown <- subscribeEvent result

9390

91+ -- When there is a subscriber to the post-build event, fire the event.

92+ soa <- for mPostBuildTrigger $ \postBuildTrigger ->

93+ fire [postBuildTrigger :=> Identity ()] $ isFiring shutdown

94+

9495 -- The main application loop. We wait for new events and fire those that

9596 -- have subscribers. If we detect a shutdown request, the application

9697 -- terminates.

97− fix $ \loop -> do

98+ unless (or (fromMaybe [] soa)) $ fix $ \loop -> do

9899 -- Read the next event (blocking).

99100 ers <- liftIO $ readChan events

100101 stop <- do

101102 -- Fire events that have subscribers.

102103 fireEventTriggerRefs fc ers $

103104 -- Check if the shutdown 'Event' is firing.

104− readEvent shutdown >>= \case

105− Nothing -> pure False

106− Just _ -> pure True

105+ isFiring shutdown

107106 if or stop

108107 then pure ()

109108 else loop

110109 where

110+ isFiring ev = readEvent ev >>= \case

111+ Nothing -> pure False

112+ Just _ -> pure True

111113 -- Use the given 'FireCommand' to fire events that have subscribers

112114 -- and call the callback for the 'TriggerInvocation' of each.

113115 fireEventTriggerRefs

src/Reflex/Profiled.hs+2−1

@@ -28,7 +28,8 @@ import Control.Monad.Ref

2828import Control.Monad.State.Strict (StateT, execStateT, modify)

2929import Data.Bifunctor

3030import Data.Coerce

31−import Data.Dependent.Map (DMap, GCompare)

31+import Data.Dependent.Map (DMap)

32+import Data.GADT.Compare (GCompare)

3233import Data.FastMutableIntMap

3334import Data.IORef

3435import Data.List

src/Reflex/Pure.hs+2−1

@@ -32,7 +32,8 @@ module Reflex.Pure

3232 ) where

3333

3434import Control.Monad

35−import Data.Dependent.Map (DMap, GCompare)

35+import Data.Dependent.Map (DMap)

36+import Data.GADT.Compare (GCompare)

3637import qualified Data.Dependent.Map as DMap

3738import Data.IntMap (IntMap)

3839import qualified Data.IntMap as IntMap

src/Reflex/Query/Base.hs+9−3

@@ -22,16 +22,19 @@ module Reflex.Query.Base

2222import Control.Applicative (liftA2)

2323import Control.Monad.Exception

2424import Control.Monad.Fix

25+import Control.Monad.Morph

2526import Control.Monad.Primitive

2627import Control.Monad.Reader

2728import Control.Monad.Ref

2829import Control.Monad.State.Strict

2930import Data.Align

30−import Data.Dependent.Map (DMap, DSum (..))

31+import Data.Dependent.Map (DMap)

3132import qualified Data.Dependent.Map as DMap

33+import Data.Dependent.Sum (DSum(..))

3234import Data.Foldable

3335import Data.Functor.Compose

3436import Data.Functor.Misc

37+import Data.GADT.Compare (GCompare)

3538import Data.IntMap (IntMap)

3639import qualified Data.IntMap as IntMap

3740import Data.Map (Map)

@@ -135,7 +138,7 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t

135138 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch

136139 return (liftedResult0, liftedResult')

137140

138− traverseDMapWithKeyWithAdjust :: forall (k :: * -> *) v v'. (DMap.GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> QueryT t q m (DMap k v', Event t (PatchDMap k v'))

141+ traverseDMapWithKeyWithAdjust :: forall (k :: * -> *) v v'. (GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> QueryT t q m (DMap k v', Event t (PatchDMap k v'))

139142 traverseDMapWithKeyWithAdjust f dm0 dm' = do

140143 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)

141144 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v

@@ -180,7 +183,7 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t

180183 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch

181184 return (liftedResult0, liftedResult')

182185

183− traverseDMapWithKeyWithAdjustWithMove :: forall (k :: * -> *) v v'. (DMap.GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMapWithMove k v) -> QueryT t q m (DMap k v', Event t (PatchDMapWithMove k v'))

186+ traverseDMapWithKeyWithAdjustWithMove :: forall (k :: * -> *) v v'. (GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMapWithMove k v) -> QueryT t q m (DMap k v', Event t (PatchDMapWithMove k v'))

184187 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = do

185188 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)

186189 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v

@@ -237,6 +240,9 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t

237240instance MonadTrans (QueryT t q) where

238241 lift = QueryT . lift . lift . lift

239242

243+instance MFunctor (QueryT t q) where

244+ hoist = mapQueryT

245+

240246instance PrimMonad m => PrimMonad (QueryT t q m) where

241247 type PrimState (QueryT t q m) = PrimState m

242248 primitive = lift . primitive

src/Reflex/Requester/Base.hs+6−1

@@ -49,14 +49,16 @@ import Reflex.TriggerEvent.Class

4949import Control.Applicative (liftA2)

5050import Control.Monad.Exception

5151import Control.Monad.Identity

52+import Control.Monad.Morph

5253import Control.Monad.Primitive

5354import Control.Monad.Reader

5455import Control.Monad.Ref

5556import Control.Monad.State.Strict

5657import Data.Bits

5758import Data.Coerce

58−import Data.Dependent.Map (DMap, DSum (..))

59+import Data.Dependent.Map (DMap)

5960import qualified Data.Dependent.Map as DMap

61+import Data.Dependent.Sum (DSum (..))

6062import Data.Functor.Compose

6163import Data.Functor.Misc

6264import Data.IntMap.Strict (IntMap)

@@ -316,6 +318,9 @@ responseFromTag (MyTagWrap t) = do

316318instance MonadTrans (RequesterT t request response) where

317319 lift = RequesterT . lift . lift

318320

321+instance MFunctor (RequesterT t request response) where

322+ hoist f = RequesterT . hoist (hoist f) . unRequesterT

323+

319324instance PerformEvent t m => PerformEvent t (RequesterT t request response m) where

320325 type Performable (RequesterT t request response m) = Performable m

321326 performEvent_ = lift . performEvent_

src/Reflex/Spider/Internal.hs+2−1

@@ -46,8 +46,9 @@ import Control.Monad.Fail (MonadFail)

4646import qualified Control.Monad.Fail as MonadFail

4747import Data.Align

4848import Data.Coerce

49−import Data.Dependent.Map (DMap, DSum (..))

49+import Data.Dependent.Map (DMap)

5050import qualified Data.Dependent.Map as DMap

51+import Data.Dependent.Sum (DSum (..))

5152import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))

5253import qualified Data.FastMutableIntMap as FastMutableIntMap

5354import Data.Foldable hiding (concat, elem, sequence_)

test/Headless.hsnew file+10

@@ -0,0 +1,10 @@

1+module Main where

3+import Reflex

4+import Reflex.Host.Headless (runHeadlessApp)

6+main :: IO ()

7+main = do

8+ runHeadlessApp $ do

9+ pb <- getPostBuild

10+ performEvent (pure <$> pb)

test/Reflex/Test/CrossImpl.hs+1−1

@@ -26,7 +26,7 @@ import qualified Reflex.Profiled as Prof

2626import Control.Arrow (second, (&&&))

2727import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

2828import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

29−import Data.Dependent.Map (DSum (..))

29+import Data.Dependent.Sum (DSum (..))

3030import Data.Foldable

3131import Data.Map.Strict (Map)

3232import qualified Data.Map.Strict as Map