Skip to content

Update project documentation to account for typed errors #80

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.

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
Jun 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
134 changes: 72 additions & 62 deletions README.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/Data/Argonaut/Decode.purs
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
module Data.Argonaut.Decode
( module Data.Argonaut.Decode.Class
, module Data.Argonaut.Decode.Combinators
, module Data.Argonaut.Decode.Error
, module Data.Argonaut.Decode.Parser
) where

import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
import Data.Argonaut.Decode.Combinators (getField, getFieldDeprecated, getFieldOptional, getFieldOptionalDeprecated, getFieldOptional', defaultField, defaultFieldDeprecated, (.:), (.?), (.:!), (.:?), (.??), (.!=), (.?=))
import Data.Argonaut.Decode.Error (JsonDecodeError(..), printJsonDecodeError)
import Data.Argonaut.Decode.Parser (parseJson)
2 changes: 1 addition & 1 deletion src/Data/Argonaut/Decode/Class.purs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module Data.Argonaut.Decode.Class where
import Prelude (class Ord, Unit, Void, bind, ($), (<<<))

import Data.Argonaut.Core (Json, toObject)
import Data.Argonaut.Decode.Errors (JsonDecodeError(..))
import Data.Argonaut.Decode.Error (JsonDecodeError(..))
import Data.Array.NonEmpty (NonEmptyArray)
import Data.Either (Either(..))
import Data.Bifunctor (lmap)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Argonaut/Decode/Combinators.purs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module Data.Argonaut.Decode.Combinators
import Prelude ((<$>))

import Data.Argonaut.Core (Json)
import Data.Argonaut.Decode.Errors (JsonDecodeError)
import Data.Argonaut.Decode.Error (JsonDecodeError)
import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
import Data.Either (Either)
import Data.Maybe (Maybe, fromMaybe)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Argonaut/Decode/Decoders.purs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module Data.Argonaut.Decode.Decoders where
import Prelude

import Data.Argonaut.Core (Json, caseJsonBoolean, caseJsonNull, caseJsonNumber, caseJsonString, isNull, toArray, toObject, toString, fromString)
import Data.Argonaut.Decode.Errors (JsonDecodeError(..))
import Data.Argonaut.Decode.Error (JsonDecodeError(..))
import Data.Array as Arr
import Data.Array.NonEmpty (NonEmptyArray)
import Data.Array.NonEmpty as NEA
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- | Originally implemented in:
-- | https://github.com/garyb/purescript-codec-argonaut
module Data.Argonaut.Decode.Errors where
module Data.Argonaut.Decode.Error where

import Prelude

Expand Down
14 changes: 14 additions & 0 deletions src/Data/Argonaut/Decode/Parser.purs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module Data.Argonaut.Decode.Parser where

import Prelude

import Data.Argonaut.Core (Json)
import Data.Argonaut.Decode.Error (JsonDecodeError(..))
import Data.Argonaut.Parser (jsonParser)
import Data.Bifunctor (lmap)
import Data.Either (Either)

-- | Attempt to parse a string as `Json`, failing with a typed error if the
-- | JSON string is malformed.
parseJson :: String -> Either JsonDecodeError Json
parseJson = lmap (\_ -> TypeMismatch "JSON") <<< jsonParser
2 changes: 1 addition & 1 deletion test/Test/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Control.Monad.Gen.Common (genMaybe)
import Control.Monad.Reader (ReaderT, ask, local, runReaderT)
import Data.Argonaut.Core (Json, isObject, stringify, toObject)
import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:), (.:!), (.:?), (.!=))
import Data.Argonaut.Decode.Errors (JsonDecodeError, printJsonDecodeError)
import Data.Argonaut.Decode.Error (JsonDecodeError, printJsonDecodeError)
import Data.Argonaut.Encode (encodeJson, (:=), (:=?), (~>), (~>?))
import Data.Argonaut.Gen (genJson)
import Data.Argonaut.Parser (jsonParser)
Expand Down