Cleanup

Author: m-bock

src/Data/Codec/Argonaut/Sum.purs

@@ -319,7 +319,7 @@ parseNoFields encoding json expectedTag =
     EncodeNested {} → do
       obj ← lmap JErr $ CA.decode jobject json
       val ←
-        ( Obj.lookup expectedTag obj # note (JErr $ TypeMismatch ("Expecting a property `" <> expectedTag <> "`"))
+        ( Obj.lookup expectedTag obj # note NoCase
         ) ∷ _ Json
       fields ← lmap JErr $ CA.decode CA.jarray val ∷ _ (Array Json)
       when (fields /= [])
@@ -346,7 +346,7 @@ parseSingleField encoding json expectedTag = case encoding of
   EncodeNested { unwrapSingleArguments } → do
     obj ← lmap JErr $ CA.decode jobject json
     val ←
-      ( Obj.lookup expectedTag obj # note (JErr $ TypeMismatch ("Expecting a property `" <> expectedTag <> "`"))
+      ( Obj.lookup expectedTag obj # note NoCase
       ) ∷ _ Json
     if unwrapSingleArguments then
       pure val
@@ -472,8 +472,7 @@ instance gFlatCasesConstructorNoArg ∷
     let actualTag = Record.get (Proxy @tag) r ∷ String
 
     when (actualTag /= name)
-      $ Left
-          (JErr $ TypeMismatch ("Expecting tag `" <> name <> "`, got `" <> actualTag <> "`"))
+      $ Left NoCase
 
     pure (Constructor NoArguments)
 
@@ -507,8 +506,7 @@ instance gFlatCasesConstructorSingleArg ∷
 
     let actualTag = Record.get (Proxy @tag) r ∷ String
     when (actualTag /= name)
-      $ Left
-          (JErr $ TypeMismatch ("Expecting tag `" <> name <> "`, got `" <> actualTag <> "`"))
+      $ Left NoCase
 
     let r' = Record.delete (Proxy @tag) r ∷ Record rf
     pure (Constructor (Argument r'))

test/Test/Sum.purs

@@ -3,7 +3,7 @@ module Test.Sum where
 import Prelude
 
 import Control.Monad.Error.Class (liftEither)
-import Data.Argonaut.Core (stringifyWithIndent)
+import Data.Argonaut.Core (stringify, stringifyWithIndent)
 import Data.Argonaut.Decode (parseJson)
 import Data.Bifunctor (lmap)
 import Data.Codec (decode, encode)
@@ -87,14 +87,14 @@ check ∷ ∀ a. Show a ⇒ Eq a ⇒ JsonCodec a → a → String → Effect Uni
 check codec val expectEncoded = do
   let encodedStr = stringifyWithIndent 2 $ encode codec val
   when (encodedStr /= expectEncoded) $
-    throw ("check failed, expected: " <> expectEncoded <> ", got: " <> encodedStr)
+    throw ("encode check failed, expected: " <> expectEncoded <> ", got: " <> encodedStr)
 
   json ← liftEither $ lmap (show >>> error) $ parseJson encodedStr
 
-  decoded ← liftEither $ lmap (show >>> error) $ decode codec json
+  decoded ← liftEither $ lmap (\err -> error ("decode failed: " <> show err <> " JSON was: " <> stringify json)) $ decode codec json
 
   when (decoded /= val) $
-    throw ("check failed, expected: " <> show val <> ", got: " <> show decoded)
+    throw ("decode check failed, expected: " <> show val <> ", got: " <> show decoded)
 
 main ∷ Effect Unit
 main = do