Merge branch 'develop' into develop

Ericson2314 · web-flow · commit 632c55c0dba1 · 2019-12-22T13:01:29.000-08:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,10 +1,15 @@
 # Revision history for reflex
 
-## Unreleased
+## 0.6.3
 
-* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
-  renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
-  respectively.
+* `Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
+  They are replaced with `Data.WeakBag.traverse_` and `Data.FastWeakBag.traverse_`, respectively.
+
+* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
+
+* Add missing `NotReady` instances:
+   - `instance NotReady (SpiderTimeline x) (SpiderHost x)`
+   - `instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x))`
 
 ## 0.6.2.4
 
@@ -17,7 +22,9 @@
 ## 0.6.2.2
 
 * Support these >= 1. Add `split-these` flag to control whether to use new these/semialign combination or not.
+
 * Update version bounds to fix some CI failures
+
 * Add travis CI configuration
 
 ## 0.6.2.1
@@ -32,32 +39,42 @@
     * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
 
 * Generalize merging functions:
-  `merge` to `mergeG`, 
-  `mergeIncremental` to `mergeIncrementalG`, 
-  `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.  
+  `merge` to `mergeG`,
+  `mergeIncremental` to `mergeIncrementalG`,
+  `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
 
 * Generalize distribute function:
     `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
 
 ## 0.6.2.0
 
-* Fix `holdDyn` so that it is lazy in its event argument  
+* Fix `holdDyn` so that it is lazy in its event argument
   These produce `DMap`s  whose values needn't be `Identity`.
+
 * Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).
+
 * Fix `holdDyn` so that it is lazy in its event argument.
 
 ## 0.6.1.0
 
 * Re-export all of `Data.Map.Monoidal`
+
 * Fix `QueryT` and `RequesterT` tests
 
 ## 0.6.0.0 -- 2019-03-20
 
 * Deprecate `FunctorMaybe` in favor of `Data.Witherable.Filterable`. We still export `fmapMaybe`, `ffilter`, etc., but they all rely on `Filterable` now.
+
 * Rename `MonadDynamicWriter` to `DynamicWriter` and add a deprecation for the old name.
+
 * Remove many deprecated functions.
+
 * Add a `Num` instance for `Dynamic`.
+
 * Add `matchRequestsWithResponses` to make it easier to use `Requester` with protocols that don't do this matching for you.
+
 * Add `withRequesterT` to map functions over the request and response of a `RequesterT`.
+
 * Suppress nil patches in `QueryT` as an optimization. The `Query` type must now have an `Eq` instance.
+
 * Add `throttleBatchWithLag` to `Reflex.Time`. See that module for details.
diff --git a/Quickref.md b/Quickref.md
@@ -198,15 +198,15 @@ For Events, the returned Event fires whenever the latest Event supplied by the w
 The functions mentioned above are used to create a static FRP network.
 There are additional typeclasses that can be used to modify the FRP network, to have it interact with IO action, or to introspect the building of the network.
 
-Th typeclasses and their associated annotations include:
+The typeclasses and their associated annotations include:
 
 - `PostBuild`
     Fire an Event when an FRP network has been set up.
     ```haskell
     [B]   -- Function runs in any monad supporting PostBuild
     ```
 
-- `Adjustable` 
+- `Adjustable`
     Use Events to add or remove pieces of an FRP network.
     ```haskell
     [A]   -- Function runs in any monad supporting Adjustable
@@ -271,7 +271,7 @@ Th typeclasses and their associated annotations include:
 ```haskell
 -- Run side-effecting actions in Event when it occurs; returned Event contains
 -- results. Side effects run in the (Performable m) monad which is associated with
--- the (PerformEvent t m) typeclass constraint. 
+-- the (PerformEvent t m) typeclass constraint.
 -- This allows for working with IO when a ((MonadIO (Performable m)) constraint is available.
 [P]   performEvent        :: Event (Performable m a )                 -> m (Event a)
 
@@ -295,17 +295,20 @@ Th typeclasses and their associated annotations include:
 ## Networks
 
 ```haskell
--- Functions from Reflex.Network used to deal with Dynamics/Events carrying (m a)
+-- Functions from Reflex.Adjustable / Reflex.Network used to deal with Dynamics/Events carrying (m a)
 
--- Given a Dynamic of network-creating actions, create a network that is recreated whenever the Dynamic updates. 
--- The returned Event of network results occurs when the Dynamic does. Note: Often, the type a is an Event, 
+[A]     runWithReplace :: m a -> Event t (m b) -> m (a, Event t b)
+
+-- Given a Dynamic of network-creating actions, create a network that is recreated whenever the Dynamic updates.
+-- The returned Event of network results occurs when the Dynamic does. Note: Often, the type a is an Event,
 -- in which case the return value is an Event-of-Events that would typically be flattened (via switchHold).
-[P,A]   networkView :: Dynamic (m a) -> m (Event a) 
+[P,A]   networkView :: Dynamic (m a) -> m (Event a)
 
--- Given an initial network and an Event of network-creating actions, create a network that is recreated whenever the 
--- Event fires. The returned Dynamic of network results occurs when the Event does. Note: Often, the type a is an 
+-- Given an initial network and an Event of network-creating actions, create a network that is recreated whenever the
+-- Event fires. The returned Dynamic of network results occurs when the Event does. Note: Often, the type a is an
 -- Event, in which case the return value is a Dynamic-of-Events that would typically be flattened.
-[H,A]   networkHold :: m a -> Event (m a) -> m (Dynamic a) 
+[H,A]   networkHold :: m a -> Event (m a) -> m (Dynamic a)
 
 -- Render a placeholder network to be shown while another network is not yet done building
-[P,A]   untilReady :: m a -> m b -> m (a, Event b) 
+[P,A]   untilReady :: m a -> m b -> m (a, Event b)
+```
diff --git a/default.nix b/default.nix
diff --git a/dep/reflex-platform/github.json b/dep/reflex-platform/github.json
@@ -1,7 +1,7 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "jailbreakTheselens",
-  "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
-  "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
+  "branch": "develop",
+  "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",
+  "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"
 }
diff --git a/reflex.cabal b/reflex.cabal
@@ -1,5 +1,5 @@
 Name: reflex
-Version: 0.6.2.4
+Version: 0.6.3
 Synopsis: Higher-order Functional Reactive Programming
 Description: Reflex is a high-performance, deterministic, higher-order Functional Reactive Programming system
 License: BSD3
@@ -58,13 +58,12 @@ library
     data-default >= 0.5 && < 0.8,
     dependent-map >= 0.3 && < 0.4,
     exception-transformers == 0.4.*,
-    profunctors >= 5.3 && < 5.5,
     lens >= 4.7 && < 5,
     monad-control >= 1.0.1 && < 1.1,
     mtl >= 2.1 && < 2.3,
     prim-uniq >= 0.1.0.1 && < 0.2,
     primitive >= 0.5 && < 0.8,
-    profunctors,
+    profunctors >= 5.3 && < 5.5,
     random == 1.1.*,
     ref-tf == 0.4.*,
     reflection == 2.1.*,
diff --git a/release.nix b/release.nix
@@ -17,19 +17,36 @@ let
     ] ++ lib.optionals (reflex-platform.iosSupport) [
       "ghcIosAarch64"
     ];
-    hsPkgs = lib.genAttrs compilers (ghc: let
-      ghc' = reflex-platform.${ghc}.override {
-        overrides = self: super: {
-          reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };
-          reflex = self.callPackage ./. { useTemplateHaskell = true; };
+    variations = map (v: "reflex" + v) [
+      "-dontUseTemplateHaskell"
+      ""
+    ];
+    compilerPkgs = lib.genAttrs compilers (ghc: let
+      variationPkgs = lib.genAttrs variations (variation: let
+        reflex-platform = reflex-platform-fun {
+          inherit system;
+          __useTemplateHaskell = variation == "reflex"; # TODO hack
+          haskellOverlays = [
+            # Use this package's source for reflex
+            (self: super: {
+              _dep = super._dep // {
+                reflex = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
+                  "release.nix"
+                  ".git"
+                  "dist"
+                ])) ./.;
+              };
+            })
+          ];
         };
-      };
-    in {
-      inherit (ghc') reflex reflex-dontUseTemplateHaskell;
+      in reflex-platform.${ghc}.reflex);
+    in variationPkgs // {
+      cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
+        (builtins.attrValues variationPkgs);
     });
-  in hsPkgs // {
+  in compilerPkgs // {
     cache = reflex-platform.pinBuildInputs "reflex-${system}"
-      (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
+      (map (a: a.cache) (builtins.attrValues compilerPkgs));
   });
 
   metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"
diff --git a/src/Control/Monad/ReaderIO.hs b/src/Control/Monad/ReaderIO.hs
@@ -37,7 +37,7 @@ instance Applicative (ReaderIO e) where
 #if MIN_VERSION_base(4,10,0)
   liftA2 = liftM2
   {-# INLINE liftA2 #-}
-#endif  
+#endif
   (*>) = (>>)
   {-# INLINE (*>) #-}
 
diff --git a/src/Data/AppendMap.hs b/src/Data/AppendMap.hs
@@ -20,7 +20,7 @@ module Data.AppendMap
   , module Data.Map.Monoidal
   ) where
 
-import Prelude hiding (map, null)
+import Prelude hiding (null)
 
 import Data.Coerce
 import Data.Default
diff --git a/src/Reflex/Collection.hs b/src/Reflex/Collection.hs
@@ -130,7 +130,7 @@ listWithKeyShallowDiff initialVals valsChanged mkChild = do
         Nothing -> Just Nothing
 
         -- We don't want to let spurious re-creations of items through
-        Just _  -> Nothing 
+        Just _  -> Nothing
   listHoldWithKey
       initialVals
       (attachWith (flip (Map.differenceWith relevantPatch))
diff --git a/src/Reflex/DynamicWriter/Class.hs b/src/Reflex/DynamicWriter/Class.hs
@@ -26,4 +26,3 @@ class (Monad m, Monoid w) => DynamicWriter t w m | m -> t w where
 
 instance DynamicWriter t w m => DynamicWriter t w (ReaderT r m) where
   tellDyn = lift . tellDyn
-
diff --git a/src/Reflex/Network.hs b/src/Reflex/Network.hs
@@ -20,7 +20,7 @@ import Reflex.NotReady.Class
 import Reflex.PostBuild.Class
 
 -- | A 'Dynamic' "network": Takes a 'Dynamic' of network-creating actions and replaces the network whenever the 'Dynamic' updates.
--- The returned Event of network results fires when the 'Dynamic' updates.
+-- The returned Event of network results fires at post-build time and when the 'Dynamic' updates.
 -- Note:  Often, the type 'a' is an Event, in which case the return value is an Event-of-Events, where the outer 'Event' fires
 -- when switching networks. Such an 'Event' would typically be flattened (via 'switchPromptly').
 networkView :: (NotReady t m, Adjustable t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
diff --git a/src/Reflex/Patch/MapWithMove.hs b/src/Reflex/Patch/MapWithMove.hs
@@ -155,7 +155,7 @@ patchThatSortsMapWith cmp m = PatchMapWithMove $ Map.fromList $ catMaybes $ zipW
           Just (from, to)
         reverseMapping = Map.fromList $ catMaybes $ zipWith f unsorted sorted
         g (to, _) (from, _) = if to == from then Nothing else
-          let Just movingTo = Map.lookup from reverseMapping
+          let Just movingTo = Map.lookup to reverseMapping
           in Just (to, NodeInfo (From_Move from) $ Just movingTo)
 
 -- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
diff --git a/src/Reflex/PerformEvent/Base.hs b/src/Reflex/PerformEvent/Base.hs
@@ -141,7 +141,7 @@ hostPerformEventT a = do
           case mToPerform of
             Nothing -> return [result']
             Just toPerform -> do
-              responses <- runHostFrame $ traverseRequesterData (Identity <$>) toPerform
+              responses <- runHostFrame $ traverseRequesterData (fmap Identity) toPerform
               mrt <- readRef responseTrigger
               let followupEventTriggers = case mrt of
                     Just rt -> [rt :=> Identity responses]
diff --git a/src/Reflex/Spider/Internal.hs b/src/Reflex/Spider/Internal.hs
@@ -103,6 +103,7 @@ import qualified Reflex.Host.Class
 import Reflex.NotReady.Class
 import Reflex.Patch
 import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
+import Reflex.PerformEvent.Base (PerformEventT)
 
 #ifdef DEBUG_TRACE_EVENTS
 import qualified Data.ByteString.Char8 as BS8
@@ -2705,3 +2706,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
 instance PrimMonad (SpiderHostFrame x) where
   type PrimState (SpiderHostFrame x) = PrimState IO
   primitive = SpiderHostFrame . EventM . primitive
+
+instance NotReady (SpiderTimeline x) (SpiderHost x) where
+  notReadyUntil _ = return ()
+  notReady = return ()
+
+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
+  notReadyUntil _ = return ()
+  notReady = return ()
diff --git a/src/Reflex/Workflow.hs b/src/Reflex/Workflow.hs
@@ -34,7 +34,7 @@ workflow w0 = do
   rec eResult <- networkHold (unWorkflow w0) $ fmap unWorkflow $ switch $ snd <$> current eResult
   return $ fmap fst eResult
 
--- | Similar to 'workflow', but outputs an 'Event' that fires whenever the current 'Workflow' is replaced by the next 'Workflow'.
+-- | Similar to 'workflow', but outputs an 'Event' that fires at post-build time and whenever the current 'Workflow' is replaced by the next 'Workflow'.
 workflowView :: forall t m a. (Reflex t, NotReady t m, Adjustable t m, MonadFix m, MonadHold t m, PostBuild t m) => Workflow t m a -> m (Event t a)
 workflowView w0 = do
   rec eResult <- networkView . fmap unWorkflow =<< holdDyn w0 eReplace
diff --git a/test/Reflex/Bench/Focused.hs b/test/Reflex/Bench/Focused.hs
@@ -134,7 +134,7 @@ holdDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynami
 holdDynChain = iterM (\d -> sample (current d) >>= flip holdDyn (updated d))
 
 buildDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynamic t Word)
-buildDynChain = iterM (\d -> do 
+buildDynChain = iterM (\d -> do
     let b = fmap (+1) (current d)
         e = fmap (*2) (updated d)
     buildDynamic (sample b) e)
diff --git a/test/hlint.hs b/test/hlint.hs
@@ -30,16 +30,9 @@ main = do
         ]
       matchFile = and <$> sequence
         [ extension ==? ".hs"
-        , let notElem' = liftOp notElem
-          in filePath `notElem'` filePathExceptions pwd
         ]
   files <- find recurseInto matchFile (pwd </> "src") --TODO: Someday fix all hints in tests, etc.
   ideas <- fmap concat $ forM files $ \f -> do
     putStr $ "linting file " ++ drop (length pwd + 1) f ++ "... "
     runHlint f
   if null ideas then exitSuccess else exitFailure
-
-filePathExceptions :: FilePath -> [FilePath]
-filePathExceptions pwd = map (pwd </>) $
-  [ "src/Data/AppendMap.hs" -- parse error when hlint runs
-  ]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"owner": "reflex-frp",`
`3`	`3`	`"repo": "reflex-platform",`
`4`		`- "branch": "jailbreakTheselens",`
`5`		`- "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",`
`6`		`- "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"`
	`4`	`+ "branch": "develop",`
	`5`	`+ "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",`
	`6`	`+ "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,3 @@ class (Monad m, Monoid w) => DynamicWriter t w m \| m -> t w where`
`26`	`26`
`27`	`27`	`instance DynamicWriter t w m => DynamicWriter t w (ReaderT r m) where`
`28`	`28`	`tellDyn = lift . tellDyn`
`29`		`-`