7dcbec5 · typeable/aeson

git.iko.soy/typeable/aeson

Merge pull request #360 from neongreen/master

Track JSONPath in the FromJSON instance for Either

commit7dcbec5eab55f3b226bf896e924f21e78910682d authorAdam Bergmark <adam@bergmark.nl> dateMon 8 Feb 2016, 10:52 (11 years ago) parentc6ee242 8d3dd5b

2 files changed+8−3

unifiedsplit

Data/Aeson/Types/Instances.hs+2−2

@@ -166,8 +166,8 @@ instance (ToJSON a, ToJSON b) => ToJSON (Either a b) where

166166

167167instance (FromJSON a, FromJSON b) => FromJSON (Either a b) where

168168 parseJSON (Object (H.toList -> [(key, value)]))

169− | key == left = Left <$> parseJSON value

170− | key == right = Right <$> parseJSON value

169+ | key == left = Left <$> parseJSON value <?> Key left

170+ | key == right = Right <$> parseJSON value <?> Key right

171171 parseJSON _ = fail $

172172 "expected an object with a single property " ++

173173 "where the property key should be either " ++

tests/UnitTests.hs+6−1

@@ -239,8 +239,13 @@ jsonDecoding = [

239239

240240jsonPath :: [Assertion]

241241jsonPath = [

242+ -- issue #356

243+ assertEqual "Either"

244+ (Left "Error in $[1].Left[1]: expected Bool, encountered Number")

245+ (eitherDecode "[1,{\"Left\":[2,3]}]"

246+ :: Either String (Int, Either (Int, Bool) ()))

242247 -- issue #358

243− assertEqual "Seq a"

248+ , assertEqual "Seq a"

244249 (Left "Error in $[2]: expected Int, encountered Boolean")

245250 (eitherDecode "[0,1,true]" :: Either String (Seq Int))

246251 ]