@@ -1,96 +1,151 @@
1{-# LANGUAGE DeriveTraversable #-}
2{-# LANGUAGE DeriveTraversable #-}
2{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4{-# LANGUAGE LambdaCase #-}
6{-# LANGUAGE LambdaCase #-}
5{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
6{-# LANGUAGE PatternGuards #-}
8{-# LANGUAGE PatternGuards #-}
9+{-# LANGUAGE PatternSynonyms #-}
7{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE StandaloneDeriving #-}
8{-# LANGUAGE TemplateHaskell #-}
12{-# LANGUAGE TemplateHaskell #-}
9{-# LANGUAGE TypeApplications #-}
13{-# LANGUAGE TypeApplications #-}
10{-# LANGUAGE TypeFamilies #-}
14{-# LANGUAGE TypeFamilies #-}
15+{-# LANGUAGE ViewPatterns #-}
12-- | 'Patch'es on 'Map' that can insert, delete, and move values from one key to
17-- | 'Patch'es on 'Map' that can insert, delete, and move values from one key to
14−module Data.Patch.MapWithMove where
19+module Data.Patch.MapWithMove
26+ , patchMapWithMoveInsertAll
31+ , unsafePatchMapWithMove
32+ , patchMapWithMoveNewElements
33+ , patchMapWithMoveNewElementsMap
34+ , patchThatSortsMapWith
35+ , patchThatChangesAndSortsMapWith
36+ , patchThatChangesMap
64+import Data.Kind (Type)
16import Data.Patch.Class
65import Data.Patch.Class
66+import Data.Patch.MapWithPatchingMove (PatchMapWithPatchingMove(..), To)
67+import qualified Data.Patch.MapWithPatchingMove as PM -- already a transparent synonym
18−import Control.Arrow
69+import Control.Lens
19−import Control.Lens hiding (from, to)
20−import Control.Monad.Trans.State
23import Data.List
70import Data.List
24import Data.Map (Map)
71import Data.Map (Map)
25import qualified Data.Map as Map
72import qualified Data.Map as Map
26−import Data.Maybe
73+import Data.Proxy
74+#if !MIN_VERSION_base(4,11,0)
27−import Data.Semigroup (Semigroup (..), (<>))
75+import Data.Semigroup (Semigroup (..))
28−import qualified Data.Set as Set
76+#endif
29−import Data.These (These(..))
77+import Data.Traversable (foldMapDefault)
32-- | Patch a Map with additions, deletions, and moves. Invariant: If key @k1@
79-- | Patch a Map with additions, deletions, and moves. Invariant: If key @k1@
33-- is coming from @From_Move k2@, then key @k2@ should be going to @Just k1@,
80-- is coming from @From_Move k2@, then key @k2@ should be going to @Just k1@,
34-- and vice versa. There should never be any unpaired From/To keys.
81-- and vice versa. There should never be any unpaired From/To keys.
35−newtype PatchMapWithMove k v = PatchMapWithMove
82+newtype PatchMapWithMove k (v :: Type) = PatchMapWithMove'
36− { -- | Extract the internal representation of the 'PatchMapWithMove'
83+ { -- | Extract the underlying 'PatchMapWithPatchingMove k (Proxy v)'
37− unPatchMapWithMove :: Map k (NodeInfo k v)
84+ unPatchMapWithMove' :: PatchMapWithPatchingMove k (Proxy v)
39 deriving ( Show, Read, Eq, Ord
86 deriving ( Show, Read, Eq, Ord
40− , Functor, Foldable, Traversable
87+-- Haddock cannot handle documentation here before GHC 8.6
89+#if __GLASGOW_HASKELL__ >= 806
90+ -- | Compose patches having the same effect as applying the
91+ -- patches in turn: @'applyAlways' (p <> q) == 'applyAlways' p .
43−-- | Holds the information about each key: where its new value should come from,
98+pattern Coerce :: Coercible a b => a -> b
44−-- and where its old value should go to
99+pattern Coerce x <- (coerce -> x)
45−data NodeInfo k v = NodeInfo
100+ where Coerce x = coerce x
46− { _nodeInfo_from :: !(From k v)
47− -- ^ Where do we get the new value for this key?
48− , _nodeInfo_to :: !(To k)
49− -- ^ If the old value is being kept (i.e. moved rather than deleted or
50− -- replaced), where is it going?
52− deriving (Show, Read, Eq, Ord, Functor, Foldable, Traversable)
54−-- | Describe how a key's new value should be produced
102+{-# COMPLETE PatchMapWithMove #-}
55−data From k v
103+pattern PatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
56− = From_Insert v -- ^ Insert the given value here
104+-- | Extract the representation of the 'PatchMapWithMove' as a map of
57− | From_Delete -- ^ Delete the existing value, if any, from here
105+-- 'NodeInfo'.
58− | From_Move !k -- ^ Move the value here from the given key
106+unPatchMapWithMove :: PatchMapWithMove k v -> Map k (NodeInfo k v)
59− deriving (Show, Read, Eq, Ord, Functor, Foldable, Traversable)
107+pattern PatchMapWithMove { unPatchMapWithMove } = PatchMapWithMove' (PatchMapWithPatchingMove (Coerce unPatchMapWithMove))
61−-- | Describe where a key's old value will go. If this is 'Just', that means
109+_PatchMapWithMove
62−-- the key's old value will be moved to the given other key; if it is 'Nothing',
110+ :: Iso
63−-- that means it will be deleted.
111+ (PatchMapWithMove k0 v0)
64−type To = Maybe
112+ (PatchMapWithMove k1 v1)
113+ (Map k0 (NodeInfo k0 v0))
114+ (Map k1 (NodeInfo k1 v1))
115+_PatchMapWithMove = iso unPatchMapWithMove PatchMapWithMove
117+instance Functor (PatchMapWithMove k) where
118+ fmap f = runIdentity . traverse (Identity . f)
120+instance Foldable (PatchMapWithMove k) where
121+ foldMap = foldMapDefault
66−makeWrapped ''PatchMapWithMove
123+instance Traversable (PatchMapWithMove k) where
68instance FunctorWithIndex k (PatchMapWithMove k)
129instance FunctorWithIndex k (PatchMapWithMove k)
69instance FoldableWithIndex k (PatchMapWithMove k)
130instance FoldableWithIndex k (PatchMapWithMove k)
70instance TraversableWithIndex k (PatchMapWithMove k) where
131instance TraversableWithIndex k (PatchMapWithMove k) where
71 itraverse = itraversed . Indexed
132 itraverse = itraversed . Indexed
72− itraversed = _Wrapped .> itraversed <. traversed
133+ itraversed =
134+ _PatchMapWithMove .>
74-- | Create a 'PatchMapWithMove', validating it
138-- | Create a 'PatchMapWithMove', validating it
75patchMapWithMove :: Ord k => Map k (NodeInfo k v) -> Maybe (PatchMapWithMove k v)
139patchMapWithMove :: Ord k => Map k (NodeInfo k v) -> Maybe (PatchMapWithMove k v)
76−patchMapWithMove m = if valid then Just $ PatchMapWithMove m else Nothing
140+patchMapWithMove = fmap PatchMapWithMove' . PM.patchMapWithPatchingMove . coerce
77− where valid = forwardLinks == backwardLinks
78− forwardLinks = Map.mapMaybe _nodeInfo_to m
79− backwardLinks = Map.fromList $ catMaybes $ flip fmap (Map.toList m) $ \(to, v) ->
80− case _nodeInfo_from v of
81− From_Move from -> Just (from, to)
84-- | Create a 'PatchMapWithMove' that inserts everything in the given 'Map'
142-- | Create a 'PatchMapWithMove' that inserts everything in the given 'Map'
85patchMapWithMoveInsertAll :: Map k v -> PatchMapWithMove k v
143patchMapWithMoveInsertAll :: Map k v -> PatchMapWithMove k v
86−patchMapWithMoveInsertAll m = PatchMapWithMove $ flip fmap m $ \v -> NodeInfo
144+patchMapWithMoveInsertAll = PatchMapWithMove' . PM.patchMapWithPatchingMoveInsertAll
87− { _nodeInfo_from = From_Insert v
88− , _nodeInfo_to = Nothing
91-- | Make a @'PatchMapWithMove' k v@ which has the effect of inserting or updating a value @v@ to the given key @k@, like 'Map.insert'.
146-- | Make a @'PatchMapWithMove' k v@ which has the effect of inserting or updating a value @v@ to the given key @k@, like 'Map.insert'.
92insertMapKey :: k -> v -> PatchMapWithMove k v
147insertMapKey :: k -> v -> PatchMapWithMove k v
93−insertMapKey k v = PatchMapWithMove . Map.singleton k $ NodeInfo (From_Insert v) Nothing
148+insertMapKey k v = PatchMapWithMove' $ PM.insertMapKey k v
95-- |Make a @'PatchMapWithMove' k v@ which has the effect of moving the value from the first key @k@ to the second key @k@, equivalent to:
150-- |Make a @'PatchMapWithMove' k v@ which has the effect of moving the value from the first key @k@ to the second key @k@, equivalent to:
@@ -98,84 +153,53 @@ insertMapKey k v = PatchMapWithMove . Map.singleton k $ NodeInfo (From_Insert v)
98-- 'Map.delete' src (maybe map ('Map.insert' dst) (Map.lookup src map))
153-- 'Map.delete' src (maybe map ('Map.insert' dst) (Map.lookup src map))
100moveMapKey :: Ord k => k -> k -> PatchMapWithMove k v
155moveMapKey :: Ord k => k -> k -> PatchMapWithMove k v
101−moveMapKey src dst
156+moveMapKey src dst = PatchMapWithMove' $ PM.moveMapKey src dst
102− | src == dst = mempty
104− PatchMapWithMove $ Map.fromList
105− [ (dst, NodeInfo (From_Move src) Nothing)
106− , (src, NodeInfo From_Delete (Just dst))
109-- |Make a @'PatchMapWithMove' k v@ which has the effect of swapping two keys in the mapping, equivalent to:
158-- |Make a @'PatchMapWithMove' k v@ which has the effect of swapping two keys in the mapping, equivalent to:
112-- let aMay = Map.lookup a map
161-- let aMay = Map.lookup a map
113-- bMay = Map.lookup b map
162-- bMay = Map.lookup b map
114−-- in maybe id (Map.insert a) (bMay `mplus` aMay)
163+-- in maybe id (Map.insert a) (bMay <> aMay)
115−-- . maybe id (Map.insert b) (aMay `mplus` bMay)
164+-- . maybe id (Map.insert b) (aMay <> bMay)
116-- . Map.delete a . Map.delete b $ map
165-- . Map.delete a . Map.delete b $ map
118swapMapKey :: Ord k => k -> k -> PatchMapWithMove k v
167swapMapKey :: Ord k => k -> k -> PatchMapWithMove k v
119−swapMapKey src dst
168+swapMapKey src dst = PatchMapWithMove' $ PM.swapMapKey src dst
120− | src == dst = mempty
122− PatchMapWithMove $ Map.fromList
123− [ (dst, NodeInfo (From_Move src) (Just src))
124− , (src, NodeInfo (From_Move dst) (Just dst))
127-- |Make a @'PatchMapWithMove' k v@ which has the effect of deleting a key in the mapping, equivalent to 'Map.delete'.
170-- |Make a @'PatchMapWithMove' k v@ which has the effect of deleting a key in the mapping, equivalent to 'Map.delete'.
128deleteMapKey :: k -> PatchMapWithMove k v
171deleteMapKey :: k -> PatchMapWithMove k v
129−deleteMapKey k = PatchMapWithMove . Map.singleton k $ NodeInfo From_Delete Nothing
172+deleteMapKey = PatchMapWithMove' . PM.deleteMapKey
131-- | Wrap a @'Map' k (NodeInfo k v)@ representing patch changes into a @'PatchMapWithMove' k v@, without checking any invariants.
174-- | Wrap a @'Map' k (NodeInfo k v)@ representing patch changes into a @'PatchMapWithMove' k v@, without checking any invariants.
133-- __Warning:__ when using this function, you must ensure that the invariants of 'PatchMapWithMove' are preserved; they will not be checked.
176-- __Warning:__ when using this function, you must ensure that the invariants of 'PatchMapWithMove' are preserved; they will not be checked.
134unsafePatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
177unsafePatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
135−unsafePatchMapWithMove = PatchMapWithMove
178+unsafePatchMapWithMove = coerce PM.unsafePatchMapWithPatchingMove
137-- | Apply the insertions, deletions, and moves to a given 'Map'
180-- | Apply the insertions, deletions, and moves to a given 'Map'
138instance Ord k => Patch (PatchMapWithMove k v) where
181instance Ord k => Patch (PatchMapWithMove k v) where
139 type PatchTarget (PatchMapWithMove k v) = Map k v
182 type PatchTarget (PatchMapWithMove k v) = Map k v
140− apply (PatchMapWithMove p) old = Just $! insertions `Map.union` (old `Map.difference` deletions) --TODO: return Nothing sometimes --Note: the strict application here is critical to ensuring that incremental merges don't hold onto all their prerequisite events forever; can we make this more robust?
183+ apply (PatchMapWithMove' p) = apply p
141− where insertions = flip Map.mapMaybeWithKey p $ \_ ni -> case _nodeInfo_from ni of
142− From_Insert v -> Just v
143− From_Move k -> Map.lookup k old
144− From_Delete -> Nothing
145− deletions = flip Map.mapMaybeWithKey p $ \_ ni -> case _nodeInfo_from ni of
146− From_Delete -> Just ()
149-- | Returns all the new elements that will be added to the 'Map'.
185-- | Returns all the new elements that will be added to the 'Map'.
150patchMapWithMoveNewElements :: PatchMapWithMove k v -> [v]
186patchMapWithMoveNewElements :: PatchMapWithMove k v -> [v]
151−patchMapWithMoveNewElements = Map.elems . patchMapWithMoveNewElementsMap
187+patchMapWithMoveNewElements = PM.patchMapWithPatchingMoveNewElements . unPatchMapWithMove'
153-- | Return a @'Map' k v@ with all the inserts/updates from the given @'PatchMapWithMove' k v@.
189-- | Return a @'Map' k v@ with all the inserts/updates from the given @'PatchMapWithMove' k v@.
154patchMapWithMoveNewElementsMap :: PatchMapWithMove k v -> Map k v
190patchMapWithMoveNewElementsMap :: PatchMapWithMove k v -> Map k v
155−patchMapWithMoveNewElementsMap (PatchMapWithMove p) = Map.mapMaybe f p
191+patchMapWithMoveNewElementsMap = PM.patchMapWithPatchingMoveNewElementsMap . unPatchMapWithMove'
156− where f ni = case _nodeInfo_from ni of
157− From_Insert v -> Just v
158− From_Move _ -> Nothing
159− From_Delete -> Nothing
161-- | Create a 'PatchMapWithMove' that, if applied to the given 'Map', will sort
193-- | Create a 'PatchMapWithMove' that, if applied to the given 'Map', will sort
162-- its values using the given ordering function. The set keys of the 'Map' is
194-- its values using the given ordering function. The set keys of the 'Map' is
163-- not changed.
195-- not changed.
164patchThatSortsMapWith :: Ord k => (v -> v -> Ordering) -> Map k v -> PatchMapWithMove k v
196patchThatSortsMapWith :: Ord k => (v -> v -> Ordering) -> Map k v -> PatchMapWithMove k v
165−patchThatSortsMapWith cmp m = PatchMapWithMove $ Map.fromList $ catMaybes $ zipWith g unsorted sorted
197+patchThatSortsMapWith cmp = PatchMapWithMove' . PM.patchThatSortsMapWith cmp
166− where unsorted = Map.toList m
167− sorted = sortBy (cmp `on` snd) unsorted
168− f (to, _) (from, _) = if to == from then Nothing else
170− reverseMapping = Map.fromList $ catMaybes $ zipWith f unsorted sorted
171− g (to, _) (from, _) = if to == from then Nothing else
172− let Just movingTo = Map.lookup to reverseMapping
173− in Just (to, NodeInfo (From_Move from) $ Just movingTo)
175-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
199-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
176-- will produce a 'Map' with the same values as the second 'Map' but with the
200-- will produce a 'Map' with the same values as the second 'Map' but with the
177-- values sorted with the given ordering function.
201-- values sorted with the given ordering function.
178−patchThatChangesAndSortsMapWith :: forall k v. (Ord k, Ord v) => (v -> v -> Ordering) -> Map k v -> Map k v -> PatchMapWithMove k v
202+patchThatChangesAndSortsMapWith :: (Ord k, Ord v) => (v -> v -> Ordering) -> Map k v -> Map k v -> PatchMapWithMove k v
179patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatChangesMap oldByIndex newByIndex
203patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatChangesMap oldByIndex newByIndex
180 where newList = Map.toList newByIndexUnsorted
204 where newList = Map.toList newByIndexUnsorted
181 newByIndex = Map.fromList $ zip (fst <$> newList) $ sortBy cmp $ snd <$> newList
205 newByIndex = Map.fromList $ zip (fst <$> newList) $ sortBy cmp $ snd <$> newList
@@ -183,102 +207,106 @@ patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatCha
183-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
207-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
184-- will produce the second 'Map'.
208-- will produce the second 'Map'.
185patchThatChangesMap :: (Ord k, Ord v) => Map k v -> Map k v -> PatchMapWithMove k v
209patchThatChangesMap :: (Ord k, Ord v) => Map k v -> Map k v -> PatchMapWithMove k v
186−patchThatChangesMap oldByIndex newByIndex = patch
210+patchThatChangesMap oldByIndex newByIndex = PatchMapWithMove' $
187− where oldByValue = Map.fromListWith Set.union $ swap . first Set.singleton <$> Map.toList oldByIndex
211+ PM.patchThatChangesMap oldByIndex newByIndex
188− (insertsAndMoves, unusedValuesByValue) = flip runState oldByValue $ do
212+
189− let f k v = do
213+--
190− remainingValues <- get
214+-- NodeInfo
191− let putRemainingKeys remainingKeys = put $ if Set.null remainingKeys
215+--
192− then Map.delete v remainingValues
216+
193− else Map.insert v remainingKeys remainingValues
217+-- | Holds the information about each key: where its new value should come from,
194− case Map.lookup v remainingValues of
218+-- and where its old value should go to
195− Nothing -> return $ NodeInfo (From_Insert v) $ Just undefined -- There's no existing value we can take
219+newtype NodeInfo k (v :: Type) = NodeInfo' { unNodeInfo' :: PM.NodeInfo k (Proxy v) }
197− if k `Set.member` fromKs
221+deriving instance (Show k, Show p) => Show (NodeInfo k p)
198− then do
222+deriving instance (Read k, Read p) => Read (NodeInfo k p)
199− putRemainingKeys $ Set.delete k fromKs
223+deriving instance (Eq k, Eq p) => Eq (NodeInfo k p)
200− return $ NodeInfo (From_Move k) $ Just undefined -- There's an existing value, and it's here, so no patch necessary
224+deriving instance (Ord k, Ord p) => Ord (NodeInfo k p)
202− (fromK, remainingKeys) <- return . fromJust $ Set.minView fromKs -- There's an existing value, but it's not here; move it here
226+{-# COMPLETE NodeInfo #-}
203− putRemainingKeys remainingKeys
227+pattern NodeInfo :: To k -> From k v -> NodeInfo k v
204− return $ NodeInfo (From_Move fromK) $ Just undefined
228+_nodeInfo_to :: NodeInfo k v -> To k
205− Map.traverseWithKey f newByIndex
229+_nodeInfo_from :: NodeInfo k v -> From k v
206− unusedOldKeys = fold unusedValuesByValue
230+pattern NodeInfo { _nodeInfo_to, _nodeInfo_from } = NodeInfo'
207− pointlessMove k = \case
231+ PM.NodeInfo
208− From_Move k' | k == k' -> True
232+ { PM._nodeInfo_to = _nodeInfo_to
209− _ -> False
233+ , PM._nodeInfo_from = Coerce _nodeInfo_from
210− keyWasMoved k = if k `Map.member` oldByIndex && not (k `Set.member` unusedOldKeys)
234+ }
211− then Just undefined
235+
212− else Nothing
236+_NodeInfo
213− patch = unsafePatchMapWithMove $ Map.filterWithKey (\k -> not . pointlessMove k . _nodeInfo_from) $ Map.mergeWithKey (\k a _ -> Just $ nodeInfoSetTo (keyWasMoved k) a) (Map.mapWithKey $ \k -> nodeInfoSetTo $ keyWasMoved k) (Map.mapWithKey $ \k _ -> NodeInfo From_Delete $ keyWasMoved k) insertsAndMoves oldByIndex
237+ :: Iso
240+ (PM.NodeInfo k0 (Proxy v0))
241+ (PM.NodeInfo k1 (Proxy v1))
242+_NodeInfo = iso unNodeInfo' NodeInfo'
244+instance Functor (NodeInfo k) where
245+ fmap f = runIdentity . traverse (Identity . f)
247+instance Foldable (NodeInfo k) where
248+ foldMap = foldMapDefault
250+instance Traversable (NodeInfo k) where
251+ traverse = bitraverseNodeInfo pure
257+ -> NodeInfo k0 v0 -> f (NodeInfo k1 v1)
258+bitraverseNodeInfo fk fv = fmap NodeInfo'
259+ . PM.bitraverseNodeInfo fk (\ ~Proxy -> pure Proxy) fv
215-- | Change the 'From' value of a 'NodeInfo'
262-- | Change the 'From' value of a 'NodeInfo'
216nodeInfoMapFrom :: (From k v -> From k v) -> NodeInfo k v -> NodeInfo k v
263nodeInfoMapFrom :: (From k v -> From k v) -> NodeInfo k v -> NodeInfo k v
217−nodeInfoMapFrom f ni = ni { _nodeInfo_from = f $ _nodeInfo_from ni }
264+nodeInfoMapFrom f = coerce $ PM.nodeInfoMapFrom (unFrom' . f . From')
219-- | Change the 'From' value of a 'NodeInfo', using a 'Functor' (or
266-- | Change the 'From' value of a 'NodeInfo', using a 'Functor' (or
220-- 'Applicative', 'Monad', etc.) action to get the new value
267-- 'Applicative', 'Monad', etc.) action to get the new value
270+ => (From k v -> f (From k v))
221−nodeInfoMapMFrom :: Functor f => (From k v -> f (From k v)) -> NodeInfo k v -> f (NodeInfo k v)
271+ -> NodeInfo k v -> f (NodeInfo k v)
222−nodeInfoMapMFrom f ni = fmap (\result -> ni { _nodeInfo_from = result }) $ f $ _nodeInfo_from ni
272+nodeInfoMapMFrom f = fmap NodeInfo'
273+ . PM.nodeInfoMapMFrom (fmap unFrom' . f . From')
224-- | Set the 'To' field of a 'NodeInfo'
276-- | Set the 'To' field of a 'NodeInfo'
225nodeInfoSetTo :: To k -> NodeInfo k v -> NodeInfo k v
277nodeInfoSetTo :: To k -> NodeInfo k v -> NodeInfo k v
226−nodeInfoSetTo to ni = ni { _nodeInfo_to = to }
278+nodeInfoSetTo = coerce . PM.nodeInfoSetTo
228−-- |Helper data structure used for composing patches using the monoid instance.
280+--
229−data Fixup k v
281+-- From
230− = Fixup_Delete
282+--
231− | Fixup_Update (These (From k v) (To k))
283+
232−
284+-- | Describe how a key's new value should be produced
233−-- |Compose patches having the same effect as applying the patches in turn: @'applyAlways' (p <> q) == 'applyAlways' p . 'applyAlways' q@
285+newtype From k (v :: Type) = From' { unFrom' :: PM.From k (Proxy v) }
234−instance Ord k => Semigroup (PatchMapWithMove k v) where
286+
235− PatchMapWithMove ma <> PatchMapWithMove mb = PatchMapWithMove m
287+{-# COMPLETE From_Insert, From_Delete, From_Move #-}
237− connections = Map.toList $ Map.intersectionWithKey (\_ a b -> (_nodeInfo_to a, _nodeInfo_from b)) ma mb
289+-- | Insert the given value here
238− h :: (k, (Maybe k, From k v)) -> [(k, Fixup k v)]
290+pattern From_Insert :: v -> From k v
239− h (_, (mToAfter, editBefore)) = case (mToAfter, editBefore) of
291+pattern From_Insert v = From' (PM.From_Insert v)
240− (Just toAfter, From_Move fromBefore)
292+
241− | fromBefore == toAfter
293+-- | Delete the existing value, if any, from here
242− -> [(toAfter, Fixup_Delete)]
294+pattern From_Delete :: From k v
243− | otherwise
295+pattern From_Delete = From' PM.From_Delete
244− -> [ (toAfter, Fixup_Update (This editBefore))
296+
245− , (fromBefore, Fixup_Update (That mToAfter))
297+-- | Move the value here from the given key
246− ]
298+pattern From_Move :: k -> From k v
247− (Nothing, From_Move fromBefore) -> [(fromBefore, Fixup_Update (That mToAfter))] -- The item is destroyed in the second patch, so indicate that it is destroyed in the source map
299+pattern From_Move k = From' (PM.From_Move k Proxy)
248− (Just toAfter, _) -> [(toAfter, Fixup_Update (This editBefore))]
300+
249− (Nothing, _) -> []
301+bitraverseFrom
250− mergeFixups _ Fixup_Delete Fixup_Delete = Fixup_Delete
302+ :: Applicative f
251− mergeFixups _ (Fixup_Update a) (Fixup_Update b)
303+ => (k0 -> f k1)
252− | This x <- a, That y <- b
304+ -> (v0 -> f v1)
253− = Fixup_Update $ These x y
305+ -> From k0 v0 -> f (From k1 v1)
254− | That y <- a, This x <- b
306+bitraverseFrom fk fv = fmap From'
255− = Fixup_Update $ These x y
307+ . PM.bitraverseFrom fk (\ ~Proxy -> pure Proxy) fv
256− mergeFixups _ _ _ = error "PatchMapWithMove: incompatible fixups"
308+ . coerce
257− fixups = Map.fromListWithKey mergeFixups $ concatMap h connections
309+
258− combineNodeInfos _ nia nib = NodeInfo
310+makeWrapped ''PatchMapWithMove
259− { _nodeInfo_from = _nodeInfo_from nia
311+makeWrapped ''NodeInfo
260− , _nodeInfo_to = _nodeInfo_to nib
312+makeWrapped ''From
262− applyFixup _ ni = \case
263− Fixup_Delete -> Nothing
264− Fixup_Update u -> Just $ NodeInfo
265− { _nodeInfo_from = fromMaybe (_nodeInfo_from ni) $ getHere u
266− , _nodeInfo_to = fromMaybe (_nodeInfo_to ni) $ getThere u
268− m = Map.differenceWithKey applyFixup (Map.unionWithKey combineNodeInfos ma mb) fixups
269− getHere :: These a b -> Maybe a
274− getThere :: These a b -> Maybe b
280−--TODO: Figure out how to implement this in terms of PatchDMapWithMove rather than duplicating it here
281−-- |Compose patches having the same effect as applying the patches in turn: @'applyAlways' (p <> q) == 'applyAlways' p . 'applyAlways' q@
282−instance Ord k => Monoid (PatchMapWithMove k v) where
283− mempty = PatchMapWithMove mempty