Accumulate NonEmpty errors

Author: bergmark

Data/Aeson/Types/FromJSON.hs

@@ -1414,7 +1414,7 @@ parseVersionText = go . readP_to_S parseVersion . unpack
 
 instance FromJSON1 NonEmpty where
     liftParseJSON p _ = withArray "NonEmpty a" $
-        (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
+        (>>= ne) . accSequence . zipWith (parseIndexedJSON p) [0..] . V.toList
       where
         ne []     = fail "Expected a NonEmpty but got an empty list"
         ne (x:xs) = pure (x :| xs)

tests/UnitTests/AccErrors.hs

@@ -21,8 +21,9 @@ import qualified Data.Sequence as Seq
 
 tests :: Test
 tests = testGroup "Error accumulation" [
-      testCase "seq" seq
-    , testCase "vector" vector
+      testCase "Seq" seq
+    , testCase "Vector" vector
+    , testCase "NonEmpty" nonEmpty
     ]
 
 decoder :: FromJSON a
@@ -41,3 +42,9 @@ vector = do
     let res = decoder "[true, null]" :: Either (NonEmpty (JSONPath, String)) (Vector Int)
     let message i s = ([Index i], "expected Int, encountered " <> s)
     res @=? Left (NL.fromList [message 0 "Boolean", message 1 "Null"])
+
+nonEmpty :: Assertion
+nonEmpty = do
+    let res = decoder "[true, null]" :: Either (NonEmpty (JSONPath, String)) (NL.NonEmpty Int)
+    let message i s = ([Index i], "expected Int, encountered " <> s)
+    res @=? Left (NL.fromList [message 0 "Boolean", message 1 "Null"])