@@ -3,75 +3,37 @@
33{-# LANGUAGE OverloadedStrings #-}
44{-# LANGUAGE TemplateHaskell #-}
55{-# LANGUAGE TypeFamilies #-}
6−{-# LANGUAGE UndecidableInstances #-}
76
8−module Control.Monad.Validation
9− ( ValidationT(..)
10− , runValidationT
11− , runValidationTEither
12− , handleValidationT
13− , vError
14− , vWarning
15− , vErrorL
16− , vWarningL
17− , vZoom
18− , vZoomL
19− , vPromote
20− , mmSingleton
21− , setMempty
22− , neConcat
23− , textErrors
24− , _MonoidMap
25− , MonoidMap(..)
26− ) where
7+module Control.Monad.Validation where
278
28−import Control.Applicative
299import Control.Lens hiding ((.=))
3010import Control.Monad.Base
3111import Control.Monad.Catch
3212import Control.Monad.Except
33−import Control.Monad.Fail
3413import Control.Monad.State.Strict
35−import Control.Monad.Trans.Control
3614import Data.Aeson
3715import Data.Foldable as F
38−import Data.Functor
3916import Data.List as L
4017import Data.Map.Strict as M
18+import Data.Monoid
4119import Data.Text as T
4220import Data.Vector as V
4321import Test.QuickCheck
4422
45−#if MIN_VERSION_mtl(2,3,0)
46−import Control.Monad
47−import Control.Monad.Fix
48−#endif
49−
50−-- | Collects all thrown warnings in 'StateT' and errors
51−-- in 'ExceptT' into a single value using 'Monoid'.
23+-- | Collects all throwed "warnings" throwed through StateT and "errors" throwed
24+-- through ExceptT to single value using Monoid
25+-- FIXME: give more instances like HReaderT and MonadBaseControl/MonadMask
5226newtype ValidationT e m a = ValidationT
5327 { unValidationT :: ExceptT e (StateT e m) a
5428 } deriving ( Functor, Applicative, Monad, MonadThrow, MonadCatch
55− , MonadBase b, Alternative, MonadFix, MonadFail, Contravariant
56− , MonadIO, MonadPlus, MonadBaseControl b, MonadMask )
29+ , MonadBase b )
5730
5831instance MonadTrans (ValidationT e) where
5932 lift = ValidationT . lift . lift
6033
6134-- | Map with 'Monoid' instance which 'mappend' its values
62−--
63−-- This can be used as the `e` in `ValidationT e m a` to provide different
64−-- sets of errors and warnings for different keys.
65−--
66−-- >>> :{
67−-- mconcat
68−-- [ MonoidMap $ M.fromList [(1, "foo"), (2, "hello, "), (3, "oh no")]
69−-- , MonoidMap $ M.fromList [(1, "bar"), (2, "world")]
70−-- ]
71−-- :}
72−-- MonoidMap (fromList [(1,"foobar"),(2,"hello, world"),(3,"oh no")])
7335newtype MonoidMap k v = MonoidMap (Map k v)
74− deriving (Eq, Ord, Show, Arbitrary, Foldable)
36+ deriving (Eq, Ord, Show, Arbitrary)
7537
7638makePrisms ''MonoidMap
7739
@@ -89,7 +51,7 @@ instance (Ord k, Semigroup v) => Semigroup (MonoidMap k v) where
8951
9052instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where
9153 mempty = MonoidMap M.empty
92− mappend = (<>)
54+ mappend = mmAppend
9355
9456instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where
9557 toJSON (MonoidMap m) = toJSON $ L.map toObj $ M.toList m
@@ -99,7 +61,7 @@ instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where
9961 , "value" .= v ]
10062
10163instance (Ord k, FromJSON k, FromJSON v) => FromJSON (MonoidMap k v) where
102− parseJSON = withArray "MonoidMap" go
64+ parseJSON v = withArray "MonoidMap" go v
10365 where
10466 go arr = do
10567 keyvals <- traverse fromObj arr
@@ -116,60 +78,35 @@ mmAppend :: (Ord k, Monoid v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v
11678#endif
11779mmAppend (MonoidMap a) (MonoidMap b) = MonoidMap $ M.unionWith (<>) a b
11880
119−-- | Convenient for 'vZoom' as first argument. Will prevent generation
120−-- of map with 'mempty' values.
81+-- | Convenient for 'vZoom' as first artument. Will prevent generation
82+-- of map with 'mempty' values
12183mmSingleton :: (Eq v, Monoid v, Ord k) => k -> v -> MonoidMap k v
122−mmSingleton k v
123− | v == mempty = mempty
124− | otherwise = MonoidMap . M.singleton k $ v
84+mmSingleton k = memptyWrap mempty $ MonoidMap . M.singleton k
12585
126−-- | Sets given value to 'mempty'.
86+-- | Set given value to 'mempty'
12787setMempty :: (Monoid s) => ASetter' s a -> a -> s
12888setMempty setter a = set setter a mempty
12989
130−neConcat :: Foldable f => (a -> a -> a) -> f a -> Maybe a
131−neConcat f a
132− | F.null a = Nothing
133− | otherwise = Just $ F.foldr1 f a
90+memptyWrap :: (Eq a, Monoid a) => b -> (a -> b) -> a -> b
91+memptyWrap b f a
92+ | a == mempty = b
93+ | otherwise = f a
94+
95+-- | If given container is not 'mempty', then use given function to
96+-- append all its elements and return 'Just' result
97+neConcat
98+ :: (Foldable f, Eq (f a), Monoid a, Monoid (f a))
99+ => (a -> a -> a)
100+ -> f a
101+ -> Maybe a
102+neConcat f = memptyWrap Nothing (Just . F.foldl' f mempty)
134103
135−-- | Returns the strings, concatanated with @", "@ if the list is not empty.
136−--
137−-- Returns Nothing if the list is empty
138−--
139−-- >>> textErrors ["foo", "bar"]
140−-- Just "foo, bar"
141−--
142−-- >>> textErrors ["foo"]
143−-- Just "foo"
144−--
145−-- >>> textErrors []
146−-- Nothing
147104textErrors :: [Text] -> Maybe Text
148105textErrors = neConcat (\a b -> a <> ", " <> b)
149106
150−-- | Returns 'mempty' instead of error if no warnings have occurred.
151−-- Returns 'Nothing' as the second element of tuple if computation was
152−-- interrupted by 'vError'.
153−--
154−-- Returns all concatenated errors and warnings and the result if no
155−-- errors have occurred (warnings could have occurred).
156−--
157−-- >>> :{
158−-- runValidationT $ do
159−-- vWarning ["warning1"]
160−-- vError ["error"]
161−-- vWarning ["warning2"]
162−-- return 8
163−-- :}
164−-- (["error","warning1"],Nothing)
165−--
166−-- >>> :{
167−-- runValidationT $ do
168−-- vWarning ["warning1"]
169−-- vWarning ["warning2"]
170−-- return 8
171−-- :}
172−-- (["warning1","warning2"],Just 8)
107+-- | Returns `mempty` instead of error if no warnings was occured. So, your
108+-- error should have `Eq` instance to detect that any error was occured. Returns
109+-- Nothing for second element of tuple if compuration was interruped by 'vError'
173110runValidationT :: (Monoid e, Monad m) => ValidationT e m a -> m (e, Maybe a)
174111runValidationT (ValidationT m) = do
175112 (res, warnings) <- runStateT (runExceptT m) mempty
@@ -177,25 +114,6 @@ runValidationT (ValidationT m) = do
177114 Left err -> (err <> warnings, Nothing)
178115 Right a -> (warnings, Just a)
179116
180−-- | Like 'runValidationT' but doesn't return the result
181−-- if any warning has occurred.
182−--
183−-- >>> :{
184−-- runValidationTEither $ do
185−-- vWarning ["warning1"]
186−-- vError ["error"]
187−-- vWarning ["warning2"]
188−-- return 8
189−-- :}
190−-- Left ["error","warning1"]
191−--
192−-- >>> :{
193−-- runValidationTEither $ do
194−-- vWarning ["warning1"]
195−-- vWarning ["warning2"]
196−-- return 8
197−-- :}
198−-- Left ["warning1","warning2"]
199117runValidationTEither
200118 :: (Monoid e, Eq e, Monad m)
201119 => ValidationT e m a
@@ -206,71 +124,28 @@ runValidationTEither action = do
206124 Just a | err == mempty -> Right a
207125 _ -> Left err
208126
209−-- | Like 'runValidationTEither', but takes an error handler instead of
210−-- returning errors and warnings.
211−--
212−-- >>> :{
213−-- handleValidationT (\_ -> return 11) $ do
214−-- vWarning ["warning1"]
215−-- vError ["error"]
216−-- vWarning ["warning2"]
217−-- return 8
218−-- :}
219−-- 11
220−--
221−-- >>> :{
222−-- handleValidationT (\_ -> return 11) $ do
223−-- vWarning ["warning1"]
224−-- vWarning ["warning2"]
225−-- return 8
226−-- :}
227−-- 11
228127handleValidationT
229128 :: (Monoid e, Monad m, Eq e)
230129 => (e -> m a)
231130 -> ValidationT e m a
232131 -> m a
233−handleValidationT handler action =
132+handleValidationT handler action = do
234133 runValidationTEither action >>= either handler return
235134
236−-- | Stops further execution and appends the given error.
135+-- | Stops further execution of validation
237136vError :: (Monad m) => e -> ValidationT e m a
238137vError e = ValidationT $ throwError e
239138
240−-- | Does not stop further execution and appends the given warning.
139+-- | Does not stop further execution, append warning to
241140vWarning :: (Monad m, Monoid e) => e -> ValidationT e m ()
242141vWarning e = ValidationT $ modify' (<> e)
243142
244−-- | Like 'vError' but allows you to use a setter to insert an error somewhere
245−-- deeper into an empty ('mempty') "e" from "ValidationT e m x", which is then
246−-- combined with all gathered warnings.
247143vErrorL :: (Monad m, Monoid e) => ASetter' e a -> a -> ValidationT e m x
248144vErrorL l a = vError $ setMempty l a
249145
250−-- | Like 'vWarning' but allows you to use a setter to insert an error somewhere
251−-- deeper into an empty ('mempty') "e" from "ValidationT e m x", which is then
252−-- combined with all gathered warnings.
253146vWarningL :: (Monad m, Monoid e) => ASetter' e a -> a -> ValidationT e m ()
254147vWarningL l a = vWarning $ setMempty l a
255148
256−-- | Allows you apply a transformation to the "e" in "ValidationT e m x".
257−--
258−-- >>> :{
259−--runValidationT . vZoom (Data.Map.singleton "password errors") $ do
260−-- vWarning ["warning1"]
261−-- vError ["error"]
262−-- vWarning ["warning2"]
263−-- return 8
264−-- :}
265−-- (fromList [("password errors",["error","warning1"])],Nothing)
266−--
267−-- >>> :{
268−-- runValidationT . vZoom (Data.Map.singleton "password errors") $ do
269−-- vWarning ["warning1"]
270−-- vWarning ["warning2"]
271−-- return 8
272−-- :}
273−-- (fromList [("password errors",["warning1","warning2"])],Just 8)
274149vZoom
275150 :: (Monad m, Monoid a, Monoid b)
276151 => (a -> b)
@@ -280,21 +155,11 @@ vZoom up action = do
280155 (err, res) <- lift $ runValidationT action
281156 case res of
282157 Nothing -> vError $ up err
283− Just a -> vWarning (up err) $> a
158+ Just a -> vWarning (up err) *> return a
284159
285−-- | Like 'vZoom' but takes a setter instead of a function.
286160vZoomL
287161 :: (Monad m, Monoid a, Monoid b)
288162 => ASetter' b a
289163 -> ValidationT a m x
290164 -> ValidationT b m x
291−vZoomL l = vZoom (setMempty l)
292−
293−-- | Turn any warnings the have occurred into errors.
294−vPromote
295− :: (Monad m, Monoid a, Eq a)
296− => ValidationT a m x
297− -> ValidationT a m x
298−vPromote m = do
299− err <- lift $ runValidationTEither m
300− either vError return err
165+vZoomL l action = vZoom (setMempty l) action