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