Skip to content

Revert Maybe codec change #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2017
Merged

Revert Maybe codec change #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions src/Data/Argonaut/Decode/Class.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,9 @@ class DecodeJson a where
decodeJson :: Json -> Either String a

instance decodeJsonMaybe :: DecodeJson a => DecodeJson (Maybe a) where
decodeJson j =
case decode j of
Right x -> Right x
Left x -> backwardsCompat
where
decode =
decodeJObject >=> lookupJust >=> decodeJson
lookupJust =
maybe (Left "Missing property 'just'") Right <<< SM.lookup "just"
backwardsCompat
| isNull j = pure Nothing
| otherwise = Just <$> decodeJson j
decodeJson j
| isNull j = pure Nothing
| otherwise = Just <$> decodeJson j

instance decodeJsonTuple :: (DecodeJson a, DecodeJson b) => DecodeJson (Tuple a b) where
decodeJson j = decodeJson j >>= f
Expand Down
8 changes: 4 additions & 4 deletions src/Data/Argonaut/Encode/Class.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module Data.Argonaut.Encode.Class where

import Prelude

import Data.Argonaut.Core (Json(), jsonNull, fromBoolean, fromNumber, fromString, fromArray, fromObject, jsonEmptyObject, jsonSingletonObject)
import Data.Either (Either(), either)
import Data.Argonaut.Core (Json, fromArray, fromBoolean, fromNumber, fromObject, fromString, jsonNull)
import Data.Either (Either, either)
import Data.Int (toNumber)
import Data.List (List(..), (:), toUnfoldable)
import Data.Map as M
Expand All @@ -16,8 +16,8 @@ class EncodeJson a where
encodeJson :: a -> Json

instance encodeJsonMaybe :: EncodeJson a => EncodeJson (Maybe a) where
encodeJson Nothing = jsonEmptyObject
encodeJson (Just a) = jsonSingletonObject "just" (encodeJson a)
encodeJson Nothing = jsonNull
encodeJson (Just a) = encodeJson a

instance encodeJsonTuple :: (EncodeJson a, EncodeJson b) => EncodeJson (Tuple a b) where
encodeJson (Tuple a b) = encodeJson [encodeJson a, encodeJson b]
Expand Down