d95d985 · typeable/aeson

Data/Aeson.hs+5−2

compare with master

unifiedsplit

@@ -63,6 +63,8 @@ module Data.Aeson

63 , fromJSON

64 , ToJSON(..)

65 , KeyValue(..)

66+ , (<?>)

67+ , JSONPath

66 -- ** Keys for maps

68 -- ** Keys for maps

67 , ToJSONKey(..)

69 , ToJSONKey(..)

68 , ToJSONKeyFunction(..)

70 , ToJSONKeyFunction(..)

@@ -129,15 +131,16 @@ module Data.Aeson

129 -- * Parsing

131 -- * Parsing

130 , json

132 , json

131 , json'

133 , json'

134+ , parseIndexedJSON

132 ) where

135 ) where

133

136

134import Prelude.Compat

137import Prelude.Compat

135

138

136−import Data.Aeson.Types.FromJSON (ifromJSON)

139+import Data.Aeson.Types.FromJSON (ifromJSON, parseIndexedJSON)

137import Data.Aeson.Encoding (encodingToLazyByteString)

140import Data.Aeson.Encoding (encodingToLazyByteString)

138import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')

141import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')

139import Data.Aeson.Types

142import Data.Aeson.Types

140−import Data.Aeson.Types.Internal (JSONPath, formatError)

143+import Data.Aeson.Types.Internal (JSONPath, formatError, (<?>))

141import qualified Data.ByteString as B

144import qualified Data.ByteString as B

142import qualified Data.ByteString.Lazy as L

145import qualified Data.ByteString.Lazy as L

143

146

Data/Aeson/Types/FromJSON.hs+1

@@ -68,6 +68,7 @@ module Data.Aeson.Types.FromJSON

68 , explicitParseField

69 , explicitParseFieldMaybe

70 , explicitParseFieldMaybe'

71+ , parseIndexedJSON

71 -- ** Operators

72 -- ** Operators

72 , (.:)

73 , (.:)

73 , (.:?)

74 , (.:?)

changelog.md+3

@@ -1,5 +1,8 @@

1For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).

2

3+## Upcoming

4+* Exposes internal helper functions like `<?>`, `JSONPath`, and `parseIndexedJSON` from `Data.Aeson` module. Does not include any breaking changes.

5+

3### 1.4.2.0

6### 1.4.2.0

4

7

5* Add `Data.Aeson.QQ.Simple` which is a simpler version of the `aeson-qq` package, it does not support interpolation, thanks to Oleg Grenrus.

8* Add `Data.Aeson.QQ.Simple` which is a simpler version of the `aeson-qq` package, it does not support interpolation, thanks to Oleg Grenrus.