@@ -1,27 +1,30 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE BangPatterns #-}
3+{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE DefaultSignatures #-}
4+{-# LANGUAGE DefaultSignatures #-}
3−{-# LANGUAGE EmptyDataDecls #-}
4−{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleContexts #-}
5−{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE FunctionalDependencies #-}
7−{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE GADTs #-}
8−{-# LANGUAGE NoImplicitPrelude #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
9+{-# LANGUAGE NamedFieldPuns #-}
9−{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PatternGuards #-}
11+{-# LANGUAGE PatternGuards #-}
11−{-# LANGUAGE PolyKinds #-}
12−{-# LANGUAGE RecordWildCards #-}
12+{-# LANGUAGE RecordWildCards #-}
13−{-# LANGUAGE ScopedTypeVariables #-}
13+{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE TypeOperators #-}
14+{-# LANGUAGE TypeOperators #-}
15+{-# LANGUAGE TypeSynonymInstances #-}
15−{-# LANGUAGE UndecidableInstances #-}
16+{-# LANGUAGE UndecidableInstances #-}
18+#if __GLASGOW_HASKELL__ >= 706
19+{-# LANGUAGE PolyKinds #-}
17#include "overlapping-compat.h"
22#include "overlapping-compat.h"
18−#include "incoherent-compat.h"
20-- TODO: Drop this when we remove support for Data.Attoparsec.Number
24-- TODO: Drop this when we remove support for Data.Attoparsec.Number
21{-# OPTIONS_GHC -fno-warn-deprecations #-}
25{-# OPTIONS_GHC -fno-warn-deprecations #-}
23−module Data.Aeson.Types.ToJSON
27+module Data.Aeson.Types.ToJSON (
25 -- * Core JSON classes
28 -- * Core JSON classes
26 ToJSON(..)
29 ToJSON(..)
27 -- * Liftings to unary and binary type constructors
30 -- * Liftings to unary and binary type constructors
@@ -33,6 +36,7 @@ module Data.Aeson.Types.ToJSON
33 , toEncoding2
36 , toEncoding2
34 -- * Generic JSON classes
37 -- * Generic JSON classes
35 , GToJSON(..)
38 , GToJSON(..)
36 , ToArgs(..)
40 , ToArgs(..)
37 , genericToJSON
41 , genericToJSON
38 , genericToEncoding
42 , genericToEncoding
@@ -43,101 +47,87 @@ module Data.Aeson.Types.ToJSON
43 , ToJSONKeyFunction(..)
47 , ToJSONKeyFunction(..)
44 , toJSONKeyText
48 , toJSONKeyText
45 , contramapToJSONKeyFunction
49 , contramapToJSONKeyFunction
50 -- * Object key-value pairs
50 -- * Object key-value pairs
51 , KeyValue(..)
51 , KeyValue(..)
54 -- * Functions needed for documentation
52 -- * Functions needed for documentation
55 -- * Encoding functions
53 -- * Encoding functions
56 , listEncoding
54 , listEncoding
57 , listValue
55 , listValue
60import Prelude.Compat
59import Prelude.Compat
62−import Control.Applicative (Const(..))
63−import Control.Monad.ST (ST)
64−import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
61+import Data.Aeson.Encoding.Internal (Encoding, Encoding', Series, dict,
65−import Data.Aeson.Encoding.Internal ((>*<))
62+ emptyArray_, tuple, (>*<), (><))
66import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
63import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
67−import Data.Aeson.Types.Generic (AllNullary, False, IsRecord, One, ProductSize, Tagged2(..), True, Zero, productSize)
64+import Data.Aeson.Types.Generic
68import Data.Aeson.Types.Internal
65import Data.Aeson.Types.Internal
67+-- We need internal here for generic deriving
68+import qualified Data.Aeson.Encoding.Internal as E
70+import Control.Applicative (Const (..))
71+import Control.Monad.ST (ST)
69−import Data.Attoparsec.Number (Number(..))
72+import Data.Attoparsec.Number (Number (..))
70−import Data.Bits (unsafeShiftR)
73+import Data.Bits (unsafeShiftR)
71−import Data.DList (DList)
74+import Data.DList (DList)
72−import Data.Fixed (Fixed, HasResolution, Nano)
75+import Data.Fixed (Fixed, HasResolution)
73−import Data.Foldable (toList)
76+import Data.Foldable (toList)
74−import Data.Functor.Compose (Compose(..))
77+import Data.Functor.Compose (Compose (..))
75−import Data.Functor.Contravariant (Contravariant (..))
76−import Data.Functor.Identity (Identity(..))
78+import Data.Functor.Identity (Identity (..))
77−import Data.Functor.Product (Product(..))
79+import Data.Functor.Product (Product (..))
78−import Data.Functor.Sum (Sum(..))
80+import Data.Functor.Sum (Sum (..))
79−import Data.Int (Int16, Int32, Int64, Int8)
81+import Data.Int (Int16, Int32, Int64, Int8)
80−import Data.List (intersperse)
82+import Data.List (intersperse)
81−import Data.List.NonEmpty (NonEmpty(..))
83+import Data.List.NonEmpty (NonEmpty (..))
82−import Data.Semigroup ((<>))
84+import Data.Monoid (Dual (..), First (..), Last (..), (<>))
83−import Data.Proxy (Proxy(..))
85+import Data.Proxy (Proxy (..))
84−import Data.Ratio (Ratio, denominator, numerator)
86+import Data.Ratio (Ratio, denominator, numerator)
85−import Data.Scientific (Scientific)
87+import Data.Scientific (Scientific)
86−import Data.Tagged (Tagged(..))
88+import Data.Tagged (Tagged (..))
87−import Data.Text (Text, pack)
89+import Data.Text (Text, pack)
88−import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
90+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay,
89−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
91+ UTCTime, ZonedTime)
90−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
91−import Data.Time.Clock.System.Compat (SystemTime (..))
92−import Data.Time.Format.Compat (FormatTime, formatTime, defaultTimeLocale)
92+import Data.Time.Format (FormatTime, formatTime)
93+import Data.Time.Locale.Compat (defaultTimeLocale)
93−import Data.Vector (Vector)
94+import Data.Vector (Vector)
94−import Data.Version (Version, showVersion)
95+import Data.Version (Version, showVersion)
95−import Data.Void (Void, absurd)
96−import Data.Word (Word16, Word32, Word64, Word8)
96+import Data.Word (Word16, Word32, Word64, Word8)
97−import Foreign.Storable (Storable)
97+import Foreign.Storable (Storable)
98−import Foreign.C.Types (CTime (..))
99import GHC.Generics
98import GHC.Generics
100−import Numeric.Natural (Natural)
99+import Numeric.Natural (Natural)
101−import qualified Data.Aeson.Encoding as E
100+
102−import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
101+import qualified Data.ByteString as S
103−import qualified Data.ByteString.Lazy as L
102+import qualified Data.ByteString.Lazy as L
104−import qualified Data.DList as DList
103+import qualified Data.DList as DList
105−import qualified Data.HashMap.Strict as H
104+import qualified Data.HashMap.Strict as H
106−import qualified Data.HashSet as HashSet
105+import qualified Data.HashSet as HashSet
107−import qualified Data.IntMap as IntMap
106+import qualified Data.IntMap as IntMap
108−import qualified Data.IntSet as IntSet
107+import qualified Data.IntSet as IntSet
109−import qualified Data.List.NonEmpty as NE
108+import qualified Data.List.NonEmpty as NE
110−import qualified Data.Map as M
109+import qualified Data.Map as M
111−import qualified Data.Monoid as Monoid
112−import qualified Data.Scientific as Scientific
110+import qualified Data.Scientific as Scientific
113−import qualified Data.Semigroup as Semigroup
114−import qualified Data.Sequence as Seq
111+import qualified Data.Sequence as Seq
115−import qualified Data.Set as Set
112+import qualified Data.Set as Set
116−import qualified Data.Text as T
113+import qualified Data.Text as T
117−import qualified Data.Text.Encoding as T
114+import qualified Data.Text.Encoding as T
118−import qualified Data.Text.Lazy as LT
115+import qualified Data.Text.Lazy as LT
119−import qualified Data.Tree as Tree
116+import qualified Data.Tree as Tree
120−import qualified Data.UUID.Types as UUID
121−import qualified Data.Vector as V
117+import qualified Data.Vector as V
122−import qualified Data.Vector.Generic as VG
118+import qualified Data.Vector.Generic as VG
123−import qualified Data.Vector.Mutable as VM
119+import qualified Data.Vector.Mutable as VM
124import qualified Data.Vector.Primitive as VP
120import qualified Data.Vector.Primitive as VP
125−import qualified Data.Vector.Storable as VS
121+import qualified Data.Vector.Storable as VS
126−import qualified Data.Vector.Unboxed as VU
122+import qualified Data.Vector.Unboxed as VU
128−import qualified Data.Aeson.Encoding.Builder as EB
129−import qualified Data.ByteString.Builder as B
131−import qualified GHC.Exts as Exts
124+#if !(MIN_VERSION_bytestring(0,10,0))
132−import qualified Data.Primitive.Array as PM
125+import Foreign.ForeignPtr (withForeignPtr)
133−import qualified Data.Primitive.SmallArray as PM
126+import Foreign.Marshal.Utils (copyBytes)
134−import qualified Data.Primitive.Types as PM
127+import Foreign.Ptr (plusPtr)
136−#if MIN_VERSION_primitive(0,6,4)
137−#if !MIN_VERSION_primitive(0,7,0)
138−import qualified Data.Primitive.UnliftedArray as PM
129+import qualified Data.ByteString.Internal as S
140−import qualified Data.Primitive.PrimArray as PM
130+import qualified Data.ByteString.Lazy.Internal as L
143toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
133toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
@@ -156,16 +146,19 @@ realFloatToJSON d
157-- | Class of generic representation types that can be converted to
147-- | Class of generic representation types that can be converted to
159−class GToJSON enc arity f where
149+class GToJSON arity f where
160 -- | This method (applied to 'defaultOptions') is used as the
150 -- | This method (applied to 'defaultOptions') is used as the
161− -- default generic implementation of 'toJSON'
151+ -- default generic implementation of 'toJSON' (if the @arity@ is 'Zero')
162− -- (with @enc ~ 'Value'@ and @arity ~ 'Zero'@)
163− -- and 'liftToJSON' (if the @arity@ is 'One').
152+ -- or 'liftToJSON' (if the @arity@ is 'One').
164− --
153+ gToJSON :: Options -> ToArgs Value arity a -> f a -> Value
155+-- | Class of generic representation types that can be converted to
156+-- a JSON 'Encoding'.
157+class GToEncoding arity f where
158+ -- | This method (applied to 'defaultOptions') can be used as the
165− -- It also provides a generic implementation of 'toEncoding'
159+ -- default generic implementation of 'toEncoding' (if the @arity@ is 'Zero')
166− -- (with @enc ~ 'Encoding'@ and @arity ~ 'Zero'@)
167− -- and 'liftToEncoding' (if the @arity@ is 'One').
160+ -- or 'liftToEncoding' (if the @arity@ is 'One').
168− gToJSON :: Options -> ToArgs enc arity a -> f a -> enc
161+ gToEncoding :: Options -> ToArgs Encoding arity a -> f a -> Encoding
170-- | A 'ToArgs' value either stores nothing (for 'ToJSON') or it stores the two
163-- | A 'ToArgs' value either stores nothing (for 'ToJSON') or it stores the two
171-- function arguments that encode occurrences of the type parameter (for
164-- function arguments that encode occurrences of the type parameter (for
@@ -177,14 +170,14 @@ data ToArgs res arity a where
177-- | A configurable generic JSON creator. This function applied to
170-- | A configurable generic JSON creator. This function applied to
178-- 'defaultOptions' is used as the default for 'toJSON' when the type
171-- 'defaultOptions' is used as the default for 'toJSON' when the type
179-- is an instance of 'Generic'.
172-- is an instance of 'Generic'.
180−genericToJSON :: (Generic a, GToJSON Value Zero (Rep a))
173+genericToJSON :: (Generic a, GToJSON Zero (Rep a))
181 => Options -> a -> Value
174 => Options -> a -> Value
182genericToJSON opts = gToJSON opts NoToArgs . from
175genericToJSON opts = gToJSON opts NoToArgs . from
184-- | A configurable generic JSON creator. This function applied to
177-- | A configurable generic JSON creator. This function applied to
185-- 'defaultOptions' is used as the default for 'liftToJSON' when the type
178-- 'defaultOptions' is used as the default for 'liftToJSON' when the type
186-- is an instance of 'Generic1'.
179-- is an instance of 'Generic1'.
187−genericLiftToJSON :: (Generic1 f, GToJSON Value One (Rep1 f))
180+genericLiftToJSON :: (Generic1 f, GToJSON One (Rep1 f))
188 => Options -> (a -> Value) -> ([a] -> Value)
181 => Options -> (a -> Value) -> ([a] -> Value)
189 -> f a -> Value
182 -> f a -> Value
190genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
183genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
@@ -192,17 +185,17 @@ genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
192-- | A configurable generic JSON encoder. This function applied to
185-- | A configurable generic JSON encoder. This function applied to
193-- 'defaultOptions' is used as the default for 'toEncoding' when the type
186-- 'defaultOptions' is used as the default for 'toEncoding' when the type
194-- is an instance of 'Generic'.
187-- is an instance of 'Generic'.
195−genericToEncoding :: (Generic a, GToJSON Encoding Zero (Rep a))
188+genericToEncoding :: (Generic a, GToEncoding Zero (Rep a))
196 => Options -> a -> Encoding
189 => Options -> a -> Encoding
197−genericToEncoding opts = gToJSON opts NoToArgs . from
190+genericToEncoding opts = gToEncoding opts NoToArgs . from
199-- | A configurable generic JSON encoder. This function applied to
192-- | A configurable generic JSON encoder. This function applied to
200-- 'defaultOptions' is used as the default for 'liftToEncoding' when the type
193-- 'defaultOptions' is used as the default for 'liftToEncoding' when the type
201-- is an instance of 'Generic1'.
194-- is an instance of 'Generic1'.
202−genericLiftToEncoding :: (Generic1 f, GToJSON Encoding One (Rep1 f))
195+genericLiftToEncoding :: (Generic1 f, GToEncoding One (Rep1 f))
203 => Options -> (a -> Encoding) -> ([a] -> Encoding)
196 => Options -> (a -> Encoding) -> ([a] -> Encoding)
204 -> f a -> Encoding
197 -> f a -> Encoding
205−genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
198+genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
207-------------------------------------------------------------------------------
200-------------------------------------------------------------------------------
@@ -210,9 +203,6 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
211-- | A type that can be converted to JSON.
204-- | A type that can be converted to JSON.
213−-- Instances in general /must/ specify 'toJSON' and /should/ (but don't need
214−-- to) specify 'toEncoding'.
216-- An example type and instance:
206-- An example type and instance:
@@ -221,10 +211,10 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
222-- data Coord = Coord { x :: Double, y :: Double }
212-- data Coord = Coord { x :: Double, y :: Double }
224−-- instance 'ToJSON' Coord where
214+-- instance ToJSON Coord where
225−-- 'toJSON' (Coord x y) = 'object' [\"x\" '.=' x, \"y\" '.=' y]
215+-- toJSON (Coord x y) = 'object' [\"x\" '.=' x, \"y\" '.=' y]
227−-- 'toEncoding' (Coord x y) = 'pairs' (\"x\" '.=' x '<>' \"y\" '.=' y)
217+-- toEncoding (Coord x y) = 'pairs' (\"x\" '.=' x '<>' \"y\" '.=' y)
230-- Instead of manually writing your 'ToJSON' instance, there are two options
220-- Instead of manually writing your 'ToJSON' instance, there are two options
@@ -232,15 +222,17 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
233-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
223-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
234-- instance at compile time. The generated instance is optimized for your type
224-- instance at compile time. The generated instance is optimized for your type
235−-- so it will probably be more efficient than the following option.
225+-- so will probably be more efficient than the following two options:
237-- * The compiler can provide a default generic implementation for
227-- * The compiler can provide a default generic implementation for
238-- 'toJSON'.
228-- 'toJSON'.
240-- To use the second, simply add a @deriving 'Generic'@ clause to your
230-- To use the second, simply add a @deriving 'Generic'@ clause to your
241−-- datatype and declare a 'ToJSON' instance. If you require nothing other than
231+-- datatype and declare a 'ToJSON' instance for your datatype without giving
242−-- 'defaultOptions', it is sufficient to write (and this is the only
232+-- definitions for 'toJSON' or 'toEncoding'.
243−-- alternative where the default 'toJSON' implementation is sufficient):
233+--
234+-- For example, the previous example can be simplified to a more
246-- {-\# LANGUAGE DeriveGeneric \#-}
238-- {-\# LANGUAGE DeriveGeneric \#-}
@@ -249,46 +241,35 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
250-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
242-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
252−-- instance 'ToJSON' Coord where
244+-- instance ToJSON Coord where
253−-- 'toEncoding' = 'genericToEncoding' 'defaultOptions'
245+-- toEncoding = 'genericToEncoding' 'defaultOptions'
256−-- If on the other hand you wish to customize the generic decoding, you have
248+-- Why do we provide an implementation for 'toEncoding' here? The
257−-- to implement both methods:
249+-- 'toEncoding' function is a relatively new addition to this class.
250+-- To allow users of older versions of this library to upgrade without
251+-- having to edit all of their instances or encounter surprising
252+-- incompatibilities, the default implementation of 'toEncoding' uses
253+-- 'toJSON'. This produces correct results, but since it performs an
254+-- intermediate conversion to a 'Value', it will be less efficient
255+-- than directly emitting an 'Encoding'. Our one-liner definition of
256+-- 'toEncoding' above bypasses the intermediate 'Value'.
258+-- If @DefaultSignatures@ doesn't give exactly the results you want,
259+-- you can customize the generic encoding with only a tiny amount of
260+-- effort, using 'genericToJSON' and 'genericToEncoding' with your
261+-- preferred 'Options':
260−-- customOptions = 'defaultOptions'
261−-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
264−-- instance 'ToJSON' Coord where
264+-- instance ToJSON Coord where
265−-- 'toJSON' = 'genericToJSON' customOptions
265+-- toJSON = 'genericToJSON' 'defaultOptions'
266−-- 'toEncoding' = 'genericToEncoding' customOptions
266+-- toEncoding = 'genericToEncoding' 'defaultOptions'
269−-- Previous versions of this library only had the 'toJSON' method. Adding
270−-- 'toEncoding' had two reasons:
272−-- 1. toEncoding is more efficient for the common case that the output of
273−-- 'toJSON' is directly serialized to a @ByteString@.
274−-- Further, expressing either method in terms of the other would be
277−-- 2. The choice of defaults allows a smooth transition for existing users:
278−-- Existing instances that do not define 'toEncoding' still
279−-- compile and have the correct semantics. This is ensured by making
280−-- the default implementation of 'toEncoding' use 'toJSON'. This produces
281−-- correct results, but since it performs an intermediate conversion to a
282−-- 'Value', it will be less efficient than directly emitting an 'Encoding'.
283−-- (this also means that specifying nothing more than
284−-- @instance ToJSON Coord@ would be sufficient as a generically decoding
285−-- instance, but there probably exists no good reason to not specify
286−-- 'toEncoding' in new instances.)
287class ToJSON a where
268class ToJSON a where
288 -- | Convert a Haskell value to a JSON-friendly intermediate type.
269 -- | Convert a Haskell value to a JSON-friendly intermediate type.
289 toJSON :: a -> Value
270 toJSON :: a -> Value
291− default toJSON :: (Generic a, GToJSON Value Zero (Rep a)) => a -> Value
272+ default toJSON :: (Generic a, GToJSON Zero (Rep a)) => a -> Value
292 toJSON = genericToJSON defaultOptions
273 toJSON = genericToJSON defaultOptions
294 -- | Encode a Haskell value as JSON.
275 -- | Encode a Haskell value as JSON.
@@ -305,8 +286,8 @@ class ToJSON a where
305 -- extension, and then have GHC generate a method body as follows.
286 -- extension, and then have GHC generate a method body as follows.
308− -- instance 'ToJSON' Coord where
289+ -- instance ToJSON Coord where
309− -- 'toEncoding' = 'genericToEncoding' 'defaultOptions'
290+ -- toEncoding = 'genericToEncoding' 'defaultOptions'
312 toEncoding :: a -> Encoding
293 toEncoding :: a -> Encoding
@@ -338,13 +319,6 @@ instance KeyValue Pair where
338 name .= value = (name, toJSON value)
319 name .= value = (name, toJSON value)
339 {-# INLINE (.=) #-}
320 {-# INLINE (.=) #-}
341−-- | Constructs a singleton 'H.HashMap'. For calling functions that
342−-- demand an 'Object' for constructing objects. To be used in
343−-- conjunction with 'mconcat'. Prefer to use 'object' where possible.
344−instance KeyValue Object where
345− name .= value = H.singleton name (toJSON value)
348-------------------------------------------------------------------------------
322-------------------------------------------------------------------------------
349-- Classes and types for map keys
323-- Classes and types for map keys
350-------------------------------------------------------------------------------
324-------------------------------------------------------------------------------
@@ -402,7 +376,7 @@ instance KeyValue Object where
402-- newtype wrapper around 'Text'. The recommended approach is to use
376-- newtype wrapper around 'Text'. The recommended approach is to use
403-- generalized newtype deriving:
377-- generalized newtype deriving:
405−-- > newtype RecordId = RecordId { getRecordId :: Text }
379+-- > newtype RecordId = RecordId { getRecordId :: Text}
406-- > deriving (Eq,Ord,ToJSONKey)
380-- > deriving (Eq,Ord,ToJSONKey)
408-- Then we may write:
382-- Then we may write:
@@ -417,18 +391,8 @@ instance KeyValue Object where
418-- It is possible to get the 'ToJSONKey' instance for free as we did
392-- It is possible to get the 'ToJSONKey' instance for free as we did
419-- with 'Foo'. However, in this case, we have a natural way to go to
393-- with 'Foo'. However, in this case, we have a natural way to go to
420−-- and from 'Text' that does not require any escape sequences. So
394+-- and from 'Text' that does not require any escape sequences. So, in
421−-- 'ToJSONKeyText' can be used instead of 'ToJSONKeyValue' to encode maps
395+-- this example, 'ToJSONKeyText' will be used instead of 'ToJSONKeyValue'.
422−-- as objects instead of arrays of pairs. This instance may be
423−-- implemented using generics as follows:
426−-- instance 'ToJSONKey' Color where
427−-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'
430−-- === __Low-level implementations__
432-- The 'Show' instance can be used to help write 'ToJSONKey':
396-- The 'Show' instance can be used to help write 'ToJSONKey':
434-- > instance ToJSONKey Color where
398-- > instance ToJSONKey Color where
@@ -503,42 +467,16 @@ toJSONKeyTextEnc e = ToJSONKeyText tot e
503 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
467 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
504 tot = T.dropAround (== '"')
468 tot = T.dropAround (== '"')
505 . T.decodeLatin1
469 . T.decodeLatin1
506− . L.toStrict
470+ . lazyToStrictByteString
507 . E.encodingToLazyByteString
471 . E.encodingToLazyByteString
510−instance Contravariant ToJSONKeyFunction where
511− contramap = contramapToJSONKeyFunction
513-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
474-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
514contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
475contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
515contramapToJSONKeyFunction h x = case x of
476contramapToJSONKeyFunction h x = case x of
516 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
477 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
517 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
478 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
519−-- 'toJSONKey' for 'Generic' types.
520−-- Deriving is supported for enumeration types, i.e. the sums of nullary
521−-- constructors. The names of constructors will be used as keys for JSON
524−-- See also 'genericFromJSONKey'.
529−-- data Color = Red | Green | Blue
530−-- deriving 'Generic'
532−-- instance 'ToJSONKey' Color where
533−-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'
535−genericToJSONKey :: (Generic a, GToJSONKey (Rep a))
536− => JSONKeyOptions -> ToJSONKeyFunction a
537−genericToJSONKey opts = toJSONKeyText (pack . keyModifier opts . getConName . from)
539−class GetConName f => GToJSONKey f
540−instance GetConName f => GToJSONKey f
542-------------------------------------------------------------------------------
480-------------------------------------------------------------------------------
543-- Lifings of FromJSON and ToJSON to unary and binary type constructors
481-- Lifings of FromJSON and ToJSON to unary and binary type constructors
544-------------------------------------------------------------------------------
482-------------------------------------------------------------------------------
@@ -551,7 +489,7 @@ instance GetConName f => GToJSONKey f
552-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
490-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
553-- instance at compile time. The generated instance is optimized for your type
491-- instance at compile time. The generated instance is optimized for your type
554−-- so it will probably be more efficient than the following option.
492+-- so will probably be more efficient than the following two options:
556-- * The compiler can provide a default generic implementation for
494-- * The compiler can provide a default generic implementation for
557-- 'toJSON1'.
495-- 'toJSON1'.
@@ -569,29 +507,23 @@ instance GetConName f => GToJSONKey f
570-- data Pair = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
508-- data Pair = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
572−-- instance 'ToJSON' a => 'ToJSON1' (Pair a)
510+-- instance ToJSON a => ToJSON1 (Pair a)
575−-- If the default implementation doesn't give exactly the results you want,
513+-- If @DefaultSignatures@ doesn't give exactly the results you want,
576-- you can customize the generic encoding with only a tiny amount of
514-- you can customize the generic encoding with only a tiny amount of
577-- effort, using 'genericLiftToJSON' and 'genericLiftToEncoding' with
515-- effort, using 'genericLiftToJSON' and 'genericLiftToEncoding' with
578-- your preferred 'Options':
516-- your preferred 'Options':
581−-- customOptions = 'defaultOptions'
582−-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
585−-- instance 'ToJSON' a => 'ToJSON1' (Pair a) where
519+-- instance ToJSON a => ToJSON1 (Pair a) where
586−-- 'liftToJSON' = 'genericLiftToJSON' customOptions
520+-- liftToJSON = 'genericLiftToJSON' 'defaultOptions'
587−-- 'liftToEncoding' = 'genericLiftToEncoding' customOptions
521+-- liftToEncoding = 'genericLiftToEncoding' 'defaultOptions'
590−-- See also 'ToJSON'.
591class ToJSON1 f where
523class ToJSON1 f where
592 liftToJSON :: (a -> Value) -> ([a] -> Value) -> f a -> Value
524 liftToJSON :: (a -> Value) -> ([a] -> Value) -> f a -> Value
594− default liftToJSON :: (Generic1 f, GToJSON Value One (Rep1 f))
526+ default liftToJSON :: (Generic1 f, GToJSON One (Rep1 f))
595 => (a -> Value) -> ([a] -> Value) -> f a -> Value
527 => (a -> Value) -> ([a] -> Value) -> f a -> Value
596 liftToJSON = genericLiftToJSON defaultOptions
528 liftToJSON = genericLiftToJSON defaultOptions
@@ -600,7 +532,7 @@ class ToJSON1 f where
601 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding
533 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding
603− default liftToEncoding :: (Generic1 f, GToJSON Encoding One (Rep1 f))
535+ default liftToEncoding :: (Generic1 f, GToEncoding One (Rep1 f))
604 => (a -> Encoding) -> ([a] -> Encoding)
536 => (a -> Encoding) -> ([a] -> Encoding)
605 -> f a -> Encoding
537 -> f a -> Encoding
606 liftToEncoding = genericLiftToEncoding defaultOptions
538 liftToEncoding = genericLiftToEncoding defaultOptions
@@ -654,7 +586,7 @@ toEncoding2 = liftToEncoding2 toEncoding toEncodingList toEncoding toEncodingLis
655-- newtype F a = F [a]
587-- newtype F a = F [a]
657−-- -- This instance encodes 'String' as an array of chars
589+-- -- This instance encodes String as an array of chars
658-- instance 'ToJSON1' F where
590-- instance 'ToJSON1' F where
659-- 'liftToJSON' tj _ (F xs) = 'liftToJSON' tj ('listValue' tj) xs
591-- 'liftToJSON' tj _ (F xs) = 'liftToJSON' tj ('listValue' tj) xs
660-- 'liftToEncoding' te _ (F xs) = 'liftToEncoding' te ('listEncoding' te) xs
592-- 'liftToEncoding' te _ (F xs) = 'liftToEncoding' te ('listEncoding' te) xs
@@ -685,11 +617,6 @@ instance ToJSON1 [] where
685 {-# INLINE liftToEncoding #-}
617 {-# INLINE liftToEncoding #-}
687instance (ToJSON a) => ToJSON [a] where
619instance (ToJSON a) => ToJSON [a] where
688− {-# SPECIALIZE instance ToJSON String #-}
689− {-# SPECIALIZE instance ToJSON [String] #-}
690− {-# SPECIALIZE instance ToJSON [Array] #-}
691− {-# SPECIALIZE instance ToJSON [Object] #-}
693 toJSON = toJSON1
620 toJSON = toJSON1
694 {-# INLINE toJSON #-}
621 {-# INLINE toJSON #-}
@@ -700,80 +627,39 @@ instance (ToJSON a) => ToJSON [a] where
700-- Generic toJSON / toEncoding
627-- Generic toJSON / toEncoding
701-------------------------------------------------------------------------------
628-------------------------------------------------------------------------------
703−instance OVERLAPPABLE_ (GToJSON enc arity a) => GToJSON enc arity (M1 i c a) where
704− -- Meta-information, which is not handled elsewhere, is ignored:
705− gToJSON opts targs = gToJSON opts targs . unM1
706− {-# INLINE gToJSON #-}
708−instance GToJSON enc One Par1 where
709− -- Direct occurrences of the last type parameter are encoded with the
710− -- function passed in as an argument:
711− gToJSON _opts (To1Args tj _) = tj . unPar1
712− {-# INLINE gToJSON #-}
714−instance ( ConsToJSON enc arity a
715− , AllNullary (C1 c a) allNullary
716− , SumToJSON enc arity (C1 c a) allNullary
717− ) => GToJSON enc arity (D1 d (C1 c a)) where
718− -- The option 'tagSingleConstructors' determines whether to wrap
719− -- a single-constructor type.
721− | tagSingleConstructors opts = (unTagged :: Tagged allNullary enc -> enc)
722− . sumToJSON opts targs
724− | otherwise = consToJSON opts targs . unM1 . unM1
725− {-# INLINE gToJSON #-}
727−instance (ConsToJSON enc arity a) => GToJSON enc arity (C1 c a) where
728− -- Constructors need to be encoded differently depending on whether they're
729− -- a record or not. This distinction is made by 'consToJSON':
730− gToJSON opts targs = consToJSON opts targs . unM1
731− {-# INLINE gToJSON #-}
733−instance ( AllNullary (a :+: b) allNullary
734− , SumToJSON enc arity (a :+: b) allNullary
735− ) => GToJSON enc arity (a :+: b)
737− -- If all constructors of a sum datatype are nullary and the
738− -- 'allNullaryToStringTag' option is set they are encoded to
739− -- strings. This distinction is made by 'sumToJSON':
740− gToJSON opts targs = (unTagged :: Tagged allNullary enc -> enc)
741− . sumToJSON opts targs
742− {-# INLINE gToJSON #-}
744--------------------------------------------------------------------------------
630--------------------------------------------------------------------------------
745-- Generic toJSON
631-- Generic toJSON
747−-- Note: Refactoring 'ToJSON a' to 'ToJSON enc a' (and 'ToJSON1' similarly) is
748−-- possible but makes error messages a bit harder to understand for missing
751−instance GToJSON Value arity V1 where
633+instance OVERLAPPABLE_ (GToJSON arity a) => GToJSON arity (M1 i c a) where
752− -- Empty values do not exist, which makes the job of formatting them
634+ -- Meta-information, which is not handled elsewhere, is ignored:
753− -- rather easy:
635+ gToJSON opts targs = gToJSON opts targs . unM1
754− gToJSON _ _ x = x `seq` error "case: V1"
755− {-# INLINE gToJSON #-}
757−instance ToJSON a => GToJSON Value arity (K1 i a) where
637+instance (ToJSON a) => GToJSON arity (K1 i a) where
758 -- Constant values are encoded using their ToJSON instance:
638 -- Constant values are encoded using their ToJSON instance:
759 gToJSON _opts _ = toJSON . unK1
639 gToJSON _opts _ = toJSON . unK1
760− {-# INLINE gToJSON #-}
641+instance GToJSON One Par1 where
642+ -- Direct occurrences of the last type parameter are encoded with the
643+ -- function passed in as an argument:
644+ gToJSON _opts (To1Args tj _) = tj . unPar1
762−instance ToJSON1 f => GToJSON Value One (Rec1 f) where
646+instance (ToJSON1 f) => GToJSON One (Rec1 f) where
763 -- Recursive occurrences of the last type parameter are encoded using their
647 -- Recursive occurrences of the last type parameter are encoded using their
764 -- ToJSON1 instance:
648 -- ToJSON1 instance:
765 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
649 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
766− {-# INLINE gToJSON #-}
768−instance GToJSON Value arity U1 where
651+instance GToJSON arity U1 where
769 -- Empty constructors are encoded to an empty array:
652 -- Empty constructors are encoded to an empty array:
770 gToJSON _opts _ _ = emptyArray
653 gToJSON _opts _ _ = emptyArray
771− {-# INLINE gToJSON #-}
654+
655+instance (ConsToJSON arity a) => GToJSON arity (C1 c a) where
656+ -- Constructors need to be encoded differently depending on whether they're
657+ -- a record or not. This distinction is made by 'consToJSON':
658+ gToJSON opts targs = consToJSON opts targs . unM1
773instance ( WriteProduct arity a, WriteProduct arity b
660instance ( WriteProduct arity a, WriteProduct arity b
774 , ProductSize a, ProductSize b
661 , ProductSize a, ProductSize b
775− ) => GToJSON Value arity (a :*: b)
662+ ) => GToJSON arity (a :*: b) where
777 -- Products are encoded to an array. Here we allocate a mutable vector of
663 -- Products are encoded to an array. Here we allocate a mutable vector of
778 -- the same size as the product and write the product's elements to it using
664 -- the same size as the product and write the product's elements to it using
779 -- 'writeProduct':
665 -- 'writeProduct':
@@ -785,175 +671,230 @@ instance ( WriteProduct arity a, WriteProduct arity b
786 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
672 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
787 productSize
673 productSize
788− {-# INLINE gToJSON #-}
790−instance ( ToJSON1 f
675+instance ( AllNullary (a :+: b) allNullary
791− , GToJSON Value One g
676+ , SumToJSON arity (a :+: b) allNullary
792− ) => GToJSON Value One (f :.: g)
677+ ) => GToJSON arity (a :+: b) where
793− where
678+ -- If all constructors of a sum datatype are nullary and the
679+ -- 'allNullaryToStringTag' option is set they are encoded to
680+ -- strings. This distinction is made by 'sumToJSON':
681+ gToJSON opts targs = (unTagged :: Tagged allNullary Value -> Value)
682+ . sumToJSON opts targs
684+instance (ToJSON1 f, GToJSON One g) => GToJSON One (f :.: g) where
794 -- If an occurrence of the last type parameter is nested inside two
685 -- If an occurrence of the last type parameter is nested inside two
795 -- composed types, it is encoded by using the outermost type's ToJSON1
686 -- composed types, it is encoded by using the outermost type's ToJSON1
796 -- instance to generically encode the innermost type:
687 -- instance to generically encode the innermost type:
797 gToJSON opts targs =
688 gToJSON opts targs =
798 let gtj = gToJSON opts targs in
689 let gtj = gToJSON opts targs in
799 liftToJSON gtj (listValue gtj) . unComp1
690 liftToJSON gtj (listValue gtj) . unComp1
800− {-# INLINE gToJSON #-}
802--------------------------------------------------------------------------------
692--------------------------------------------------------------------------------
803-- Generic toEncoding
693-- Generic toEncoding
695+instance OVERLAPPABLE_ (GToEncoding arity a) => GToEncoding arity (M1 i c a) where
696+ -- Meta-information, which is not handled elsewhere, is ignored:
697+ gToEncoding opts targs = gToEncoding opts targs . unM1
805−instance ToJSON a => GToJSON Encoding arity (K1 i a) where
699+instance (ToJSON a) => GToEncoding arity (K1 i a) where
806 -- Constant values are encoded using their ToJSON instance:
700 -- Constant values are encoded using their ToJSON instance:
807− gToJSON _opts _ = toEncoding . unK1
701+ gToEncoding _opts _ = toEncoding . unK1
808− {-# INLINE gToJSON #-}
702+
703+instance GToEncoding One Par1 where
704+ -- Direct occurrences of the last type parameter are encoded with the
705+ -- function passed in as an argument:
706+ gToEncoding _opts (To1Args te _) = te . unPar1
810−instance ToJSON1 f => GToJSON Encoding One (Rec1 f) where
708+instance (ToJSON1 f) => GToEncoding One (Rec1 f) where
811 -- Recursive occurrences of the last type parameter are encoded using their
709 -- Recursive occurrences of the last type parameter are encoded using their
812 -- ToEncoding1 instance:
710 -- ToEncoding1 instance:
813− gToJSON _opts (To1Args te tel) = liftToEncoding te tel . unRec1
711+ gToEncoding _opts (To1Args te tel) = liftToEncoding te tel . unRec1
814− {-# INLINE gToJSON #-}
816−instance GToJSON Encoding arity U1 where
713+instance GToEncoding arity U1 where
817 -- Empty constructors are encoded to an empty array:
714 -- Empty constructors are encoded to an empty array:
818− gToJSON _opts _ _ = E.emptyArray_
715+ gToEncoding _opts _ _ = E.emptyArray_
819− {-# INLINE gToJSON #-}
716+
717+instance (ConsToEncoding arity a) => GToEncoding arity (C1 c a) where
718+ -- Constructors need to be encoded differently depending on whether they're
719+ -- a record or not. This distinction is made by 'consToEncoding':
720+ gToEncoding opts targs = consToEncoding opts targs . unM1
821instance ( EncodeProduct arity a
722instance ( EncodeProduct arity a
822 , EncodeProduct arity b
723 , EncodeProduct arity b
823− ) => GToJSON Encoding arity (a :*: b)
724+ ) => GToEncoding arity (a :*: b) where
825 -- Products are encoded to an array. Here we allocate a mutable vector of
725 -- Products are encoded to an array. Here we allocate a mutable vector of
826 -- the same size as the product and write the product's elements to it using
726 -- the same size as the product and write the product's elements to it using
827 -- 'encodeProduct':
727 -- 'encodeProduct':
828− gToJSON opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
728+ gToEncoding opts targs p = E.tuple $ encodeProduct opts targs p
829− {-# INLINE gToJSON #-}
831−instance ( ToJSON1 f
730+instance ( AllNullary (a :+: b) allNullary
832− , GToJSON Encoding One g
731+ , SumToEncoding arity (a :+: b) allNullary
833− ) => GToJSON Encoding One (f :.: g)
732+ ) => GToEncoding arity (a :+: b) where
834− where
733+ -- If all constructors of a sum datatype are nullary and the
734+ -- 'allNullaryToStringTag' option is set they are encoded to
735+ -- strings. This distinction is made by 'sumToEncoding':
736+ gToEncoding opts targs
737+ = (unTagged :: Tagged allNullary Encoding -> Encoding)
738+ . sumToEncoding opts targs
740+instance (ToJSON1 f, GToEncoding One g) => GToEncoding One (f :.: g) where
835 -- If an occurrence of the last type parameter is nested inside two
741 -- If an occurrence of the last type parameter is nested inside two
836 -- composed types, it is encoded by using the outermost type's ToJSON1
742 -- composed types, it is encoded by using the outermost type's ToJSON1
837 -- instance to generically encode the innermost type:
743 -- instance to generically encode the innermost type:
838− gToJSON opts targs =
744+ gToEncoding opts targs =
839− let gte = gToJSON opts targs in
745+ let gte = gToEncoding opts targs in
840 liftToEncoding gte (listEncoding gte) . unComp1
746 liftToEncoding gte (listEncoding gte) . unComp1
841− {-# INLINE gToJSON #-}
843--------------------------------------------------------------------------------
748--------------------------------------------------------------------------------
845−class SumToJSON enc arity f allNullary where
750+class SumToJSON arity f allNullary where
846− sumToJSON :: Options -> ToArgs enc arity a
751+ sumToJSON :: Options -> ToArgs Value arity a
847− -> f a -> Tagged allNullary enc
752+ -> f a -> Tagged allNullary Value
849−instance ( GetConName f
754+instance ( GetConName f
850− , FromString enc
755+ , TaggedObjectPairs arity f
851− , TaggedObject enc arity f
756+ , ObjectWithSingleFieldObj arity f
852− , SumToJSON' ObjectWithSingleField enc arity f
757+ , TwoElemArrayObj arity f
853− , SumToJSON' TwoElemArray enc arity f
854− , SumToJSON' UntaggedValue enc arity f
855− ) => SumToJSON enc arity f True
758+ ) => SumToJSON arity f True where
857 sumToJSON opts targs
759 sumToJSON opts targs
858− | allNullaryToStringTag opts = Tagged . fromString
760+ | allNullaryToStringTag opts = Tagged . String . pack
859 . constructorTagModifier opts . getConName
761 . constructorTagModifier opts . getConName
860 | otherwise = Tagged . nonAllNullarySumToJSON opts targs
762 | otherwise = Tagged . nonAllNullarySumToJSON opts targs
862−instance ( TaggedObject enc arity f
764+instance ( TwoElemArrayObj arity f
863− , SumToJSON' ObjectWithSingleField enc arity f
765+ , TaggedObjectPairs arity f
864− , SumToJSON' TwoElemArray enc arity f
766+ , ObjectWithSingleFieldObj arity f
865− , SumToJSON' UntaggedValue enc arity f
866− ) => SumToJSON enc arity f False
767+ ) => SumToJSON arity f False where
868 sumToJSON opts targs = Tagged . nonAllNullarySumToJSON opts targs
768 sumToJSON opts targs = Tagged . nonAllNullarySumToJSON opts targs
870−nonAllNullarySumToJSON :: ( TaggedObject enc arity f
770+nonAllNullarySumToJSON :: ( TwoElemArrayObj arity f
871− , SumToJSON' ObjectWithSingleField enc arity f
771+ , TaggedObjectPairs arity f
872− , SumToJSON' TwoElemArray enc arity f
772+ , ObjectWithSingleFieldObj arity f
873− , SumToJSON' UntaggedValue enc arity f
874− ) => Options -> ToArgs enc arity a
773+ ) => Options -> ToArgs Value arity a
875− -> f a -> enc
774+ -> f a -> Value
876nonAllNullarySumToJSON opts targs =
775nonAllNullarySumToJSON opts targs =
877 case sumEncoding opts of
776 case sumEncoding opts of
879 TaggedObject{..} ->
777 TaggedObject{..} ->
880− taggedObject opts targs tagFieldName contentsFieldName
778+ object . taggedObjectPairs opts targs tagFieldName contentsFieldName
779+ ObjectWithSingleField -> Object . objectWithSingleFieldObj opts targs
780+ TwoElemArray -> Array . twoElemArrayObj opts targs
882− ObjectWithSingleField ->
782+--------------------------------------------------------------------------------
883− (unTagged :: Tagged ObjectWithSingleField enc -> enc)
884− . sumToJSON' opts targs
887− (unTagged :: Tagged TwoElemArray enc -> enc)
888− . sumToJSON' opts targs
890− UntaggedValue ->
784+class SumToEncoding arity f allNullary where
891− (unTagged :: Tagged UntaggedValue enc -> enc)
785+ sumToEncoding :: Options -> ToArgs Encoding arity a
892− . sumToJSON' opts targs
786+ -> f a -> Tagged allNullary Encoding
788+instance ( GetConName f
789+ , TaggedObjectEnc arity f
790+ , ObjectWithSingleFieldEnc arity f
791+ , TwoElemArrayEnc arity f
792+ ) => SumToEncoding arity f True where
793+ sumToEncoding opts targs
794+ | allNullaryToStringTag opts = Tagged . toEncoding .
795+ constructorTagModifier opts . getConName
796+ | otherwise = Tagged . nonAllNullarySumToEncoding opts targs
798+instance ( TwoElemArrayEnc arity f
799+ , TaggedObjectEnc arity f
800+ , ObjectWithSingleFieldEnc arity f
801+ ) => SumToEncoding arity f False where
802+ sumToEncoding opts targs = Tagged . nonAllNullarySumToEncoding opts targs
804+nonAllNullarySumToEncoding :: ( TwoElemArrayEnc arity f
805+ , TaggedObjectEnc arity f
806+ , ObjectWithSingleFieldEnc arity f
807+ ) => Options -> ToArgs Encoding arity a
809+nonAllNullarySumToEncoding opts targs =
810+ case sumEncoding opts of
812+ taggedObjectEnc opts targs tagFieldName contentsFieldName
813+ ObjectWithSingleField -> objectWithSingleFieldEnc opts targs
814+ TwoElemArray -> twoElemArrayEnc opts targs
894--------------------------------------------------------------------------------
816--------------------------------------------------------------------------------
896−class FromString enc where
818+class TaggedObjectPairs arity f where
897− fromString :: String -> enc
819+ taggedObjectPairs :: Options -> ToArgs Value arity a
898−
820+ -> String -> String
899−instance FromString Encoding where
821+ -> f a -> [Pair]
900− fromString = toEncoding
822+
823+instance ( TaggedObjectPairs arity a
824+ , TaggedObjectPairs arity b
825+ ) => TaggedObjectPairs arity (a :+: b) where
826+ taggedObjectPairs opts targs tagFieldName contentsFieldName (L1 x) =
827+ taggedObjectPairs opts targs tagFieldName contentsFieldName x
828+ taggedObjectPairs opts targs tagFieldName contentsFieldName (R1 x) =
829+ taggedObjectPairs opts targs tagFieldName contentsFieldName x
831+instance ( IsRecord a isRecord
832+ , TaggedObjectPairs' arity a isRecord
834+ ) => TaggedObjectPairs arity (C1 c a) where
835+ taggedObjectPairs opts targs tagFieldName contentsFieldName =
836+ (pack tagFieldName .= constructorTagModifier opts
837+ (conName (undefined :: t c a p)) :) .
838+ (unTagged :: Tagged isRecord [Pair] -> [Pair]) .
839+ taggedObjectPairs' opts targs contentsFieldName . unM1
902−instance FromString Value where
841+class TaggedObjectPairs' arity f isRecord where
903− fromString = String . pack
842+ taggedObjectPairs' :: Options -> ToArgs Value arity a
843+ -> String -> f a -> Tagged isRecord [Pair]
905−--------------------------------------------------------------------------------
845+instance OVERLAPPING_ TaggedObjectPairs' arity U1 False where
846+ taggedObjectPairs' _ _ _ _ = Tagged []
907−class TaggedObject enc arity f where
848+instance (RecordToPairs arity f) => TaggedObjectPairs' arity f True where
908− taggedObject :: Options -> ToArgs enc arity a
849+ taggedObjectPairs' opts targs _ =
909− -> String -> String
850+ Tagged . toList . recordToPairs opts targs
912−instance ( TaggedObject enc arity a
852+instance (GToJSON arity f) => TaggedObjectPairs' arity f False where
913− , TaggedObject enc arity b
914− ) => TaggedObject enc arity (a :+: b)
916− taggedObject opts targs tagFieldName contentsFieldName (L1 x) =
917− taggedObject opts targs tagFieldName contentsFieldName x
918− taggedObject opts targs tagFieldName contentsFieldName (R1 x) =
919− taggedObject opts targs tagFieldName contentsFieldName x
921−instance ( IsRecord a isRecord
922− , TaggedObject' enc pairs arity a isRecord
923− , FromPairs enc pairs
925− , KeyValuePair enc pairs
927− ) => TaggedObject enc arity (C1 c a)
929− taggedObject opts targs tagFieldName contentsFieldName =
930− fromPairs . mappend tag . contents
932− tag = tagFieldName `pair`
933− (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
936− (unTagged :: Tagged isRecord pairs -> pairs) .
937− taggedObject' opts targs contentsFieldName . unM1
939−class TaggedObject' enc pairs arity f isRecord where
940− taggedObject' :: Options -> ToArgs enc arity a
941− -> String -> f a -> Tagged isRecord pairs
943−instance ( GToJSON enc arity f
944− , KeyValuePair enc pairs
945− ) => TaggedObject' enc pairs arity f False
947− taggedObject' opts targs contentsFieldName =
853+ taggedObjectPairs' opts targs contentsFieldName =
948− Tagged . (contentsFieldName `pair`) . gToJSON opts targs
854+ Tagged . (:[]) . (pack contentsFieldName .=) . gToJSON opts targs
950−instance OVERLAPPING_ Monoid pairs => TaggedObject' enc pairs arity U1 False where
856+--------------------------------------------------------------------------------
951− taggedObject' _ _ _ _ = Tagged mempty
953−instance ( RecordToPairs enc pairs arity f
858+class TaggedObjectEnc arity f where
954− ) => TaggedObject' enc pairs arity f True
859+ taggedObjectEnc :: Options -> ToArgs Encoding arity a
955− where
860+ -> String -> String
956− taggedObject' opts targs _ = Tagged . recordToPairs opts targs
861+ -> f a -> Encoding
863+instance ( TaggedObjectEnc arity a
864+ , TaggedObjectEnc arity b
865+ ) => TaggedObjectEnc arity (a :+: b) where
866+ taggedObjectEnc opts targs tagFieldName contentsFieldName (L1 x) =
867+ taggedObjectEnc opts targs tagFieldName contentsFieldName x
868+ taggedObjectEnc opts targs tagFieldName contentsFieldName (R1 x) =
869+ taggedObjectEnc opts targs tagFieldName contentsFieldName x
871+instance ( IsRecord a isRecord
872+ , TaggedObjectEnc' arity a isRecord
874+ ) => TaggedObjectEnc arity (C1 c a) where
875+ taggedObjectEnc opts targs tagFieldName contentsFieldName v =
877+ (E.string tagFieldName ><
879+ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))) ><
880+ ((unTagged :: Tagged isRecord Encoding -> Encoding) .
881+ taggedObjectEnc' opts targs contentsFieldName . unM1 $ v)
883+class TaggedObjectEnc' arity f isRecord where
884+ taggedObjectEnc' :: Options -> ToArgs Encoding arity a
885+ -> String -> f a -> Tagged isRecord Encoding
887+instance OVERLAPPING_ TaggedObjectEnc' arity U1 False where
888+ taggedObjectEnc' _ _ _ _ = Tagged E.empty
890+instance (RecordToEncoding arity f) => TaggedObjectEnc' arity f True where
891+ taggedObjectEnc' opts targs _ = Tagged . (E.comma ><) . fst
892+ . recordToEncoding opts targs
894+instance (GToEncoding arity f) => TaggedObjectEnc' arity f False where
895+ taggedObjectEnc' opts targs contentsFieldName =
896+ Tagged . (\z -> E.comma >< toEncoding contentsFieldName >< E.colon >< z) .
897+ gToEncoding opts targs
958--------------------------------------------------------------------------------
899--------------------------------------------------------------------------------
@@ -968,38 +909,23 @@ instance (GetConName a, GetConName b) => GetConName (a :+: b) where
968instance (Constructor c) => GetConName (C1 c a) where
909instance (Constructor c) => GetConName (C1 c a) where
969 getConName = conName
910 getConName = conName
971−-- For genericToJSONKey
972−instance GetConName a => GetConName (D1 d a) where
973− getConName (M1 x) = getConName x
975--------------------------------------------------------------------------------
912--------------------------------------------------------------------------------
977−-- Reflection of SumEncoding variants
914+class TwoElemArrayObj arity f where
978−
915+ twoElemArrayObj :: Options -> ToArgs Value arity a
979−data ObjectWithSingleField
916+ -> f a -> V.Vector Value
983−--------------------------------------------------------------------------------
985−class SumToJSON' s enc arity f where
986− sumToJSON' :: Options -> ToArgs enc arity a
987− -> f a -> Tagged s enc
989−instance ( SumToJSON' s enc arity a
918+instance ( TwoElemArrayObj arity a
990− , SumToJSON' s enc arity b
919+ , TwoElemArrayObj arity b
991− ) => SumToJSON' s enc arity (a :+: b)
920+ ) => TwoElemArrayObj arity (a :+: b) where
993− sumToJSON' opts targs (L1 x) = sumToJSON' opts targs x
921+ twoElemArrayObj opts targs (L1 x) = twoElemArrayObj opts targs x
994− sumToJSON' opts targs (R1 x) = sumToJSON' opts targs x
922+ twoElemArrayObj opts targs (R1 x) = twoElemArrayObj opts targs x
996−--------------------------------------------------------------------------------
998−instance ( GToJSON Value arity a
924+instance ( GToJSON arity a
999− , ConsToJSON Value arity a
925+ , ConsToJSON arity a
1000 , Constructor c
926 , Constructor c
1001− ) => SumToJSON' TwoElemArray Value arity (C1 c a) where
927+ ) => TwoElemArrayObj arity (C1 c a) where
1002− sumToJSON' opts targs x = Tagged $ Array $ V.create $ do
928+ twoElemArrayObj opts targs x = V.create $ do
1003 mv <- VM.unsafeNew 2
929 mv <- VM.unsafeNew 2
1004 VM.unsafeWrite mv 0 $ String $ pack $ constructorTagModifier opts
930 VM.unsafeWrite mv 0 $ String $ pack $ constructorTagModifier opts
1005 $ conName (undefined :: t c a p)
931 $ conName (undefined :: t c a p)
@@ -1008,121 +934,148 @@ instance ( GToJSON Value arity a
1009--------------------------------------------------------------------------------
935--------------------------------------------------------------------------------
1011−instance ( GToJSON Encoding arity a
937+class TwoElemArrayEnc arity f where
1012− , ConsToJSON Encoding arity a
938+ twoElemArrayEnc :: Options -> ToArgs Encoding arity a
941+instance ( TwoElemArrayEnc arity a
942+ , TwoElemArrayEnc arity b
943+ ) => TwoElemArrayEnc arity (a :+: b) where
944+ twoElemArrayEnc opts targs (L1 x) = twoElemArrayEnc opts targs x
945+ twoElemArrayEnc opts targs (R1 x) = twoElemArrayEnc opts targs x
947+instance ( GToEncoding arity a
948+ , ConsToEncoding arity a
1013 , Constructor c
949 , Constructor c
1014− ) => SumToJSON' TwoElemArray Encoding arity (C1 c a)
950+ ) => TwoElemArrayEnc arity (C1 c a) where
1015− where
951+ twoElemArrayEnc opts targs x = E.tuple $
1016− sumToJSON' opts targs x = Tagged $ E.list id
1017− [ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
952+ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p))) >*<
1018− , gToJSON opts targs x
953+ gToEncoding opts targs x
1021--------------------------------------------------------------------------------
955--------------------------------------------------------------------------------
1023−class ConsToJSON enc arity f where
957+class ConsToJSON arity f where
1024− consToJSON :: Options -> ToArgs enc arity a
958+ consToJSON :: Options -> ToArgs Value arity a
1025− -> f a -> enc
959+ -> f a -> Value
1027−class ConsToJSON' enc arity f isRecord where
961+class ConsToJSON' arity f isRecord where
1028− consToJSON' :: Options -> ToArgs enc arity a
962+ consToJSON' :: Options -> ToArgs Value arity a
963+ -> Bool -- ^ Are we a record with one field?
1029− -> f a -> Tagged isRecord enc
964+ -> f a -> Tagged isRecord Value
1031−instance ( IsRecord f isRecord
966+instance ( IsRecord f isRecord
1032− , ConsToJSON' enc arity f isRecord
967+ , ConsToJSON' arity f isRecord
1033− ) => ConsToJSON enc arity f
968+ ) => ConsToJSON arity f where
1035 consToJSON opts targs =
969 consToJSON opts targs =
1036− (unTagged :: Tagged isRecord enc -> enc)
970+ (unTagged :: Tagged isRecord Value -> Value)
1037− . consToJSON' opts targs
971+ . consToJSON' opts targs (isUnary (undefined :: f a))
1038− {-# INLINE consToJSON #-}
972+
1040−instance OVERLAPPING_
1041− ( RecordToPairs enc pairs arity (S1 s f)
1042− , FromPairs enc pairs
1043− , GToJSON enc arity f
1044− ) => ConsToJSON' enc arity (S1 s f) True
973+instance (RecordToPairs arity f) => ConsToJSON' arity f True where
1046− consToJSON' opts targs
974+ consToJSON' opts targs isUn f = let
975+ vals = toList $ recordToPairs opts targs f
1047− | unwrapUnaryRecords opts = Tagged . gToJSON opts targs
976+ in case (unwrapUnaryRecords opts,isUn,vals) of
1048− | otherwise = Tagged . fromPairs . recordToPairs opts targs
977+ (True,True,[(_,val)]) -> Tagged val
1049− {-# INLINE consToJSON' #-}
978+ _ -> Tagged $ object vals
1051−instance ( RecordToPairs enc pairs arity f
1052− , FromPairs enc pairs
1053− ) => ConsToJSON' enc arity f True
1055− consToJSON' opts targs = Tagged . fromPairs . recordToPairs opts targs
1056− {-# INLINE consToJSON' #-}
1058−instance GToJSON enc arity f => ConsToJSON' enc arity f False where
980+instance GToJSON arity f => ConsToJSON' arity f False where
1059− consToJSON' opts targs = Tagged . gToJSON opts targs
981+ consToJSON' opts targs _ = Tagged . gToJSON opts targs
1060− {-# INLINE consToJSON' #-}
1062--------------------------------------------------------------------------------
983--------------------------------------------------------------------------------
1064−class RecordToPairs enc pairs arity f where
985+class ConsToEncoding arity f where
1065− -- 1st element: whole thing
1066− -- 2nd element: in case the record has only 1 field, just the value
1067− -- of the field (without the key); 'Nothing' otherwise
1068− recordToPairs :: Options -> ToArgs enc arity a
986+ consToEncoding :: Options -> ToArgs Encoding arity a
1069− -> f a -> pairs
987+ -> f a -> Encoding
1071−instance ( Monoid pairs
989+class ConsToEncoding' arity f isRecord where
1072− , RecordToPairs enc pairs arity a
990+ consToEncoding' :: Options -> ToArgs Encoding arity a
1073− , RecordToPairs enc pairs arity b
991+ -> Bool -- ^ Are we a record with one field?
1074− ) => RecordToPairs enc pairs arity (a :*: b)
992+ -> f a -> Tagged isRecord Encoding
1076− recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
994+instance ( IsRecord f isRecord
1077− pairsOf a `mappend` pairsOf b
995+ , ConsToEncoding' arity f isRecord
1078− where
996+ ) => ConsToEncoding arity f where
1079− pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
997+ consToEncoding opts targs =
998+ (unTagged :: Tagged isRecord Encoding -> Encoding)
999+ . consToEncoding' opts targs (isUnary (undefined :: f a))
1001+instance (RecordToEncoding arity f) => ConsToEncoding' arity f True where
1002+ consToEncoding' opts targs isUn x =
1003+ let (enc, mbVal) = recordToEncoding opts targs x
1004+ in case (unwrapUnaryRecords opts, isUn, mbVal) of
1005+ (True, True, Just val) -> Tagged val
1006+ _ -> Tagged $ E.wrapObject enc
1008+instance GToEncoding arity f => ConsToEncoding' arity f False where
1009+ consToEncoding' opts targs _ = Tagged . gToEncoding opts targs
1011+--------------------------------------------------------------------------------
1013+class RecordToPairs arity f where
1014+ recordToPairs :: Options -> ToArgs Value arity a
1015+ -> f a -> DList Pair
1017+instance ( RecordToPairs arity a
1018+ , RecordToPairs arity b
1019+ ) => RecordToPairs arity (a :*: b) where
1080− pairsOf = recordToPairs opts targs
1020+ recordToPairs opts targs (a :*: b) = recordToPairs opts targs a <>
1081− {-# INLINE recordToPairs #-}
1021+ recordToPairs opts targs b
1083−instance ( Selector s
1084− , GToJSON enc arity a
1085− , KeyValuePair enc pairs
1086− ) => RecordToPairs enc pairs arity (S1 s a)
1023+instance (Selector s, GToJSON arity a) => RecordToPairs arity (S1 s a) where
1088 recordToPairs = fieldToPair
1024 recordToPairs = fieldToPair
1089− {-# INLINE recordToPairs #-}
1025+
1091−instance INCOHERENT_
1092− ( Selector s
1026+instance OVERLAPPING_ (Selector s, ToJSON a) =>
1093− , GToJSON enc arity (K1 i (Maybe a))
1094− , KeyValuePair enc pairs
1096− ) => RecordToPairs enc pairs arity (S1 s (K1 i (Maybe a)))
1027+ RecordToPairs arity (S1 s (K1 i (Maybe a))) where
1098 recordToPairs opts _ (M1 k1) | omitNothingFields opts
1028 recordToPairs opts _ (M1 k1) | omitNothingFields opts
1099− , K1 Nothing <- k1 = mempty
1029+ , K1 Nothing <- k1 = DList.empty
1100 recordToPairs opts targs m1 = fieldToPair opts targs m1
1030 recordToPairs opts targs m1 = fieldToPair opts targs m1
1101− {-# INLINE recordToPairs #-}
1031+
1103−instance INCOHERENT_
1105− , GToJSON enc arity (K1 i (Maybe a))
1106− , KeyValuePair enc pairs
1108− ) => RecordToPairs enc pairs arity (S1 s (K1 i (Semigroup.Option a)))
1110− recordToPairs opts targs = recordToPairs opts targs . unwrap
1112− unwrap :: S1 s (K1 i (Semigroup.Option a)) p -> S1 s (K1 i (Maybe a)) p
1113− unwrap (M1 (K1 (Semigroup.Option a))) = M1 (K1 a)
1114− {-# INLINE recordToPairs #-}
1116−fieldToPair :: (Selector s
1032+fieldToPair :: (Selector s, GToJSON arity a)
1117− , GToJSON enc arity a
1118− , KeyValuePair enc pairs)
1119− => Options -> ToArgs enc arity p
1033+ => Options -> ToArgs Value arity p
1120− -> S1 s a p -> pairs
1034+ -> S1 s a p -> DList Pair
1121−fieldToPair opts targs m1 =
1122− let key = fieldLabelModifier opts (selName m1)
1035+fieldToPair opts targs m1 = pure ( pack $ fieldLabelModifier opts $ selName m1
1123− value = gToJSON opts targs (unM1 m1)
1036+ , gToJSON opts targs (unM1 m1)
1124− in key `pair` value
1037+ )
1125−{-# INLINE fieldToPair #-}
1038+
1039+--------------------------------------------------------------------------------
1041+class RecordToEncoding arity f where
1042+ -- 1st element: whole thing
1043+ -- 2nd element: in case the record has only 1 field, just the value
1044+ -- of the field (without the key); 'Nothing' otherwise
1045+ recordToEncoding :: Options -> ToArgs Encoding arity a
1046+ -> f a -> (Encoding, Maybe Encoding)
1048+instance ( RecordToEncoding arity a
1049+ , RecordToEncoding arity b
1050+ ) => RecordToEncoding arity (a :*: b) where
1051+ recordToEncoding opts targs (a :*: b) | omitNothingFields opts =
1052+ (E.econcat $ intersperse E.comma $
1053+ filter (not . E.nullEncoding)
1054+ [ fst (recordToEncoding opts targs a)
1055+ , fst (recordToEncoding opts targs b) ]
1057+ recordToEncoding opts targs (a :*: b) =
1058+ (fst (recordToEncoding opts targs a) >< E.comma ><
1059+ fst (recordToEncoding opts targs b),
1063+instance (Selector s, GToEncoding arity a) => RecordToEncoding arity (S1 s a) where
1064+ recordToEncoding = fieldToEncoding
1066+instance OVERLAPPING_ (Selector s, ToJSON a) =>
1067+ RecordToEncoding arity (S1 s (K1 i (Maybe a))) where
1068+ recordToEncoding opts _ (M1 k1) | omitNothingFields opts
1069+ , K1 Nothing <- k1 = (E.empty, Nothing)
1070+ recordToEncoding opts targs m1 = fieldToEncoding opts targs m1
1072+fieldToEncoding :: (Selector s, GToEncoding arity a)
1073+ => Options -> ToArgs Encoding arity p
1074+ -> S1 s a p -> (Encoding, Maybe Encoding)
1075+fieldToEncoding opts targs m1 =
1076+ let keyBuilder = toEncoding (fieldLabelModifier opts $ selName m1)
1077+ valueBuilder = gToEncoding opts targs (unM1 m1)
1078+ in (keyBuilder >< E.colon >< valueBuilder, Just valueBuilder)
1127--------------------------------------------------------------------------------
1080--------------------------------------------------------------------------------
@@ -1145,12 +1098,10 @@ instance ( WriteProduct arity a
1145 lenL = len `unsafeShiftR` 1
1098 lenL = len `unsafeShiftR` 1
1146 lenR = len - lenL
1099 lenR = len - lenL
1147 ixR = ix + lenL
1100 ixR = ix + lenL
1148− {-# INLINE writeProduct #-}
1150−instance OVERLAPPABLE_ (GToJSON Value arity a) => WriteProduct arity a where
1102+instance OVERLAPPABLE_ (GToJSON arity a) => WriteProduct arity a where
1151 writeProduct opts targs mv ix _ =
1103 writeProduct opts targs mv ix _ =
1152 VM.unsafeWrite mv ix . gToJSON opts targs
1104 VM.unsafeWrite mv ix . gToJSON opts targs
1153− {-# INLINE writeProduct #-}
1155--------------------------------------------------------------------------------
1106--------------------------------------------------------------------------------
@@ -1165,45 +1116,61 @@ instance ( EncodeProduct arity a
1165 E.econcat $ intersperse E.comma $
1116 E.econcat $ intersperse E.comma $
1166 filter (not . E.nullEncoding)
1117 filter (not . E.nullEncoding)
1167 [encodeProduct opts targs a, encodeProduct opts targs b]
1118 [encodeProduct opts targs a, encodeProduct opts targs b]
1168− encodeProduct opts targs (a :*: b) =
1119+ encodeProduct opts targs (a :*: b) = encodeProduct opts targs a >*<
1169− encodeProduct opts targs a >*<
1170− encodeProduct opts targs b
1120+ encodeProduct opts targs b
1171− {-# INLINE encodeProduct #-}
1173−instance OVERLAPPABLE_ (GToJSON Encoding arity a) => EncodeProduct arity a where
1122+instance OVERLAPPABLE_ (GToEncoding arity a) => EncodeProduct arity a where
1174− encodeProduct opts targs a = E.retagEncoding $ gToJSON opts targs a
1123+ encodeProduct opts targs a = E.retagEncoding $ gToEncoding opts targs a
1175− {-# INLINE encodeProduct #-}
1177--------------------------------------------------------------------------------
1125--------------------------------------------------------------------------------
1127+class ObjectWithSingleFieldObj arity f where
1128+ objectWithSingleFieldObj :: Options -> ToArgs Value arity a
1131+instance ( ObjectWithSingleFieldObj arity a
1132+ , ObjectWithSingleFieldObj arity b
1133+ ) => ObjectWithSingleFieldObj arity (a :+: b) where
1134+ objectWithSingleFieldObj opts targs (L1 x) =
1135+ objectWithSingleFieldObj opts targs x
1136+ objectWithSingleFieldObj opts targs (R1 x) =
1137+ objectWithSingleFieldObj opts targs x
1179−instance ( GToJSON enc arity a
1139+instance ( GToJSON arity a
1180− , ConsToJSON enc arity a
1140+ , ConsToJSON arity a
1181− , FromPairs enc pairs
1182− , KeyValuePair enc pairs
1183 , Constructor c
1141 , Constructor c
1184− ) => SumToJSON' ObjectWithSingleField enc arity (C1 c a)
1142+ ) => ObjectWithSingleFieldObj arity (C1 c a) where
1185− where
1143+ objectWithSingleFieldObj opts targs = H.singleton typ . gToJSON opts targs
1186− sumToJSON' opts targs =
1187− Tagged . fromPairs . (typ `pair`) . gToJSON opts targs
1189− typ = constructorTagModifier opts $
1145+ typ = pack $ constructorTagModifier opts $
1190 conName (undefined :: t c a p)
1146 conName (undefined :: t c a p)
1192--------------------------------------------------------------------------------
1148--------------------------------------------------------------------------------
1194−instance OVERLAPPABLE_
1150+class ObjectWithSingleFieldEnc arity f where
1195− ( ConsToJSON enc arity a
1151+ objectWithSingleFieldEnc :: Options -> ToArgs Encoding arity a
1196− ) => SumToJSON' UntaggedValue enc arity (C1 c a)
1152+ -> f a -> Encoding
1198− sumToJSON' opts targs = Tagged . gToJSON opts targs
1200−instance OVERLAPPING_
1154+instance ( ObjectWithSingleFieldEnc arity a
1155+ , ObjectWithSingleFieldEnc arity b
1156+ ) => ObjectWithSingleFieldEnc arity (a :+: b) where
1157+ objectWithSingleFieldEnc opts targs (L1 x) =
1158+ objectWithSingleFieldEnc opts targs x
1159+ objectWithSingleFieldEnc opts targs (R1 x) =
1160+ objectWithSingleFieldEnc opts targs x
1162+instance ( GToEncoding arity a
1163+ , ConsToEncoding arity a
1201− ( Constructor c
1164+ , Constructor c
1202− , FromString enc
1165+ ) => ObjectWithSingleFieldEnc arity (C1 c a) where
1203− ) => SumToJSON' UntaggedValue enc arity (C1 c U1)
1166+ objectWithSingleFieldEnc opts targs v =
1204− where
1167+ E.openCurly ><
1205− sumToJSON' opts _ _ = Tagged . fromString $
1168+ toEncoding
1206− constructorTagModifier opts $ conName (undefined :: t c U1 p)
1169+ (constructorTagModifier opts
1170+ (conName (undefined :: t c a p))) ><
1172+ gToEncoding opts targs v ><
1208-------------------------------------------------------------------------------
1175-------------------------------------------------------------------------------
1209-- Instances
1176-- Instances
@@ -1276,13 +1243,6 @@ instance (ToJSON a, ToJSON b) => ToJSON (Either a b) where
1276 toEncoding = toEncoding2
1243 toEncoding = toEncoding2
1277 {-# INLINE toEncoding #-}
1244 {-# INLINE toEncoding #-}
1279−instance ToJSON Void where
1281− {-# INLINE toJSON #-}
1283− toEncoding = absurd
1284− {-# INLINE toEncoding #-}
1287instance ToJSON Bool where
1247instance ToJSON Bool where
1288 toJSON = Bool
1248 toJSON = Bool
@@ -1468,6 +1428,7 @@ instance ToJSONKey Int64 where
1468 toJSONKey = toJSONKeyTextEnc E.int64Text
1428 toJSONKey = toJSONKeyTextEnc E.int64Text
1469 {-# INLINE toJSONKey #-}
1429 {-# INLINE toJSONKey #-}
1471instance ToJSON Word where
1432instance ToJSON Word where
1472 toJSON = Number . fromIntegral
1433 toJSON = Number . fromIntegral
1473 {-# INLINE toJSON #-}
1434 {-# INLINE toJSON #-}
@@ -1527,12 +1488,6 @@ instance ToJSONKey Word64 where
1527 toJSONKey = toJSONKeyTextEnc E.word64Text
1488 toJSONKey = toJSONKeyTextEnc E.word64Text
1528 {-# INLINE toJSONKey #-}
1489 {-# INLINE toJSONKey #-}
1530−instance ToJSON CTime where
1531− toJSON (CTime i) = toJSON i
1532− {-# INLINE toJSON #-}
1534− toEncoding (CTime i) = toEncoding i
1535− {-# INLINE toEncoding #-}
1537instance ToJSON Text where
1492instance ToJSON Text where
1538 toJSON = String
1493 toJSON = String
@@ -1647,7 +1602,7 @@ instance (ToJSON a) => ToJSON (Identity a) where
1647 toEncodingList = liftToEncodingList toEncoding toEncodingList
1602 toEncodingList = liftToEncodingList toEncoding toEncodingList
1648 {-# INLINE toEncodingList #-}
1603 {-# INLINE toEncodingList #-}
1650−instance (ToJSONKey a) => ToJSONKey (Identity a) where
1605+instance (ToJSONKey a, ToJSON a) => ToJSONKey (Identity a) where
1651 toJSONKey = contramapToJSONKeyFunction runIdentity toJSONKey
1606 toJSONKey = contramapToJSONKeyFunction runIdentity toJSONKey
1652 toJSONKeyList = contramapToJSONKeyFunction (map runIdentity) toJSONKeyList
1607 toJSONKeyList = contramapToJSONKeyFunction (map runIdentity) toJSONKeyList
@@ -1796,11 +1751,13 @@ instance ToJSONKey k => ToJSON1 (M.Map k) where
1796 ToJSONKeyValue f _ -> Array . V.fromList . map (toJSONPair f g) . M.toList
1751 ToJSONKeyValue f _ -> Array . V.fromList . map (toJSONPair f g) . M.toList
1797 {-# INLINE liftToJSON #-}
1752 {-# INLINE liftToJSON #-}
1754+ -- liftToEncoding :: forall a. (a -> Encoding) -> ([a] -> Encoding) -> M.Map k a -> Encoding
1799 liftToEncoding g _ = case toJSONKey of
1755 liftToEncoding g _ = case toJSONKey of
1800 ToJSONKeyText _ f -> dict f g M.foldrWithKey
1756 ToJSONKeyText _ f -> dict f g M.foldrWithKey
1801 ToJSONKeyValue _ f -> listEncoding (pairEncoding f) . M.toList
1757 ToJSONKeyValue _ f -> listEncoding (pairEncoding f) . M.toList
1759+ -- pairEncoding :: (k -> Encoding) -> (k, a) -> Encoding
1803− pairEncoding f (a, b) = E.list id [f a, g b]
1760+ pairEncoding f (a, b) = tuple $ f a >*< g b
1804 {-# INLINE liftToEncoding #-}
1761 {-# INLINE liftToEncoding #-}
@@ -1838,17 +1795,6 @@ instance (ToJSON v) => ToJSON (Tree.Tree v) where
1838 toEncoding = toEncoding1
1795 toEncoding = toEncoding1
1839 {-# INLINE toEncoding #-}
1796 {-# INLINE toEncoding #-}
1841−-------------------------------------------------------------------------------
1843−-------------------------------------------------------------------------------
1845−instance ToJSON UUID.UUID where
1846− toJSON = toJSON . UUID.toText
1847− toEncoding = E.unsafeToEncoding . EB.quote . B.byteString . UUID.toASCIIBytes
1849−instance ToJSONKey UUID.UUID where
1850− toJSONKey = ToJSONKeyText UUID.toText $
1851− E.unsafeToEncoding . EB.quote . B.byteString . UUID.toASCIIBytes
1853-------------------------------------------------------------------------------
1799-------------------------------------------------------------------------------
1854-- vector
1800-- vector
@@ -1862,12 +1808,10 @@ instance ToJSON1 Vector where
1862 {-# INLINE liftToEncoding #-}
1808 {-# INLINE liftToEncoding #-}
1864instance (ToJSON a) => ToJSON (Vector a) where
1810instance (ToJSON a) => ToJSON (Vector a) where
1865− {-# SPECIALIZE instance ToJSON Array #-}
1811+ toJSON = Array . V.map toJSON
1868 {-# INLINE toJSON #-}
1812 {-# INLINE toJSON #-}
1870− toEncoding = toEncoding1
1814+ toEncoding = encodeVector
1871 {-# INLINE toEncoding #-}
1815 {-# INLINE toEncoding #-}
1873encodeVector :: (ToJSON a, VG.Vector v a) => v a -> Encoding
1817encodeVector :: (ToJSON a, VG.Vector v a) => v a -> Encoding
@@ -1931,12 +1875,11 @@ instance ToJSONKey k => ToJSON1 (H.HashMap k) where
1931 ToJSONKeyText _ f -> dict f g H.foldrWithKey
1875 ToJSONKeyText _ f -> dict f g H.foldrWithKey
1932 ToJSONKeyValue _ f -> listEncoding (pairEncoding f) . H.toList
1876 ToJSONKeyValue _ f -> listEncoding (pairEncoding f) . H.toList
1878+ -- pairEncoding :: (k -> Encoding) -> (k, a) -> Encoding
1934− pairEncoding f (a, b) = E.list id [f a, g b]
1879+ pairEncoding f (a, b) = tuple $ f a >*< g b
1935 {-# INLINE liftToEncoding #-}
1880 {-# INLINE liftToEncoding #-}
1937instance (ToJSON v, ToJSONKey k) => ToJSON (H.HashMap k v) where
1882instance (ToJSON v, ToJSONKey k) => ToJSON (H.HashMap k v) where
1938− {-# SPECIALIZE instance ToJSON Object #-}
1940 toJSON = toJSON1
1883 toJSON = toJSON1
1941 {-# INLINE toJSON #-}
1884 {-# INLINE toJSON #-}
@@ -1966,32 +1909,6 @@ dotNetTime (DotNetTime t) = secs ++ formatMillis t ++ ")/"
1966formatMillis :: (FormatTime t) => t -> String
1909formatMillis :: (FormatTime t) => t -> String
1967formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1910formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1969−-------------------------------------------------------------------------------
1971−-------------------------------------------------------------------------------
1973−instance ToJSON a => ToJSON (PM.Array a) where
1974− -- note: we could do better than this if vector exposed the data
1975− -- constructor in Data.Vector.
1976− toJSON = toJSON . Exts.toList
1977− toEncoding = toEncoding . Exts.toList
1979−instance ToJSON a => ToJSON (PM.SmallArray a) where
1980− toJSON = toJSON . Exts.toList
1981− toEncoding = toEncoding . Exts.toList
1983−#if (MIN_VERSION_primitive(0,6,4))
1984−instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
1985− toJSON = toJSON . Exts.toList
1986− toEncoding = toEncoding . Exts.toList
1988−#if !MIN_VERSION_primitive(0,7,0)
1989−instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1990− toJSON = toJSON . Exts.toList
1991− toEncoding = toEncoding . Exts.toList
1995-------------------------------------------------------------------------------
1912-------------------------------------------------------------------------------
1997-------------------------------------------------------------------------------
1914-------------------------------------------------------------------------------
@@ -2040,11 +1957,10 @@ stringEncoding :: Encoding' Text -> Value
2040stringEncoding = String
1957stringEncoding = String
2041 . T.dropAround (== '"')
1958 . T.dropAround (== '"')
2042 . T.decodeLatin1
1959 . T.decodeLatin1
2043− . L.toStrict
1960+ . lazyToStrictByteString
2044 . E.encodingToLazyByteString
1961 . E.encodingToLazyByteString
2045{-# INLINE stringEncoding #-}
1962{-# INLINE stringEncoding #-}
2048instance ToJSON NominalDiffTime where
1964instance ToJSON NominalDiffTime where
2049 toJSON = Number . realToFrac
1965 toJSON = Number . realToFrac
2050 {-# INLINE toJSON #-}
1966 {-# INLINE toJSON #-}
@@ -2052,144 +1968,18 @@ instance ToJSON NominalDiffTime where
2052 toEncoding = E.scientific . realToFrac
1968 toEncoding = E.scientific . realToFrac
2053 {-# INLINE toEncoding #-}
1969 {-# INLINE toEncoding #-}
2056−instance ToJSON DiffTime where
2057− toJSON = Number . realToFrac
2058− {-# INLINE toJSON #-}
2060− toEncoding = E.scientific . realToFrac
2061− {-# INLINE toEncoding #-}
2063−-- | Encoded as number
2064−instance ToJSON SystemTime where
2065− toJSON (MkSystemTime secs nsecs) =
2066− toJSON (fromIntegral secs + fromIntegral nsecs / 1000000000 :: Nano)
2067− toEncoding (MkSystemTime secs nsecs) =
2068− toEncoding (fromIntegral secs + fromIntegral nsecs / 1000000000 :: Nano)
2070−instance ToJSON CalendarDiffTime where
2071− toJSON (CalendarDiffTime m nt) = object
2075− toEncoding (CalendarDiffTime m nt) = E.pairs
2076− ("months" .= m <> "time" .= nt)
2078−instance ToJSON CalendarDiffDays where
2079− toJSON (CalendarDiffDays m d) = object
2083− toEncoding (CalendarDiffDays m d) = E.pairs
2084− ("months" .= m <> "days" .= d)
2086−instance ToJSON DayOfWeek where
2087− toJSON Monday = "monday"
2088− toJSON Tuesday = "tuesday"
2089− toJSON Wednesday = "wednesday"
2090− toJSON Thursday = "thursday"
2091− toJSON Friday = "friday"
2092− toJSON Saturday = "saturday"
2093− toJSON Sunday = "sunday"
2095−toEncodingDayOfWeek :: DayOfWeek -> E.Encoding' Text
2096−toEncodingDayOfWeek Monday = E.unsafeToEncoding "\"monday\""
2097−toEncodingDayOfWeek Tuesday = E.unsafeToEncoding "\"tuesday\""
2098−toEncodingDayOfWeek Wednesday = E.unsafeToEncoding "\"wednesday\""
2099−toEncodingDayOfWeek Thursday = E.unsafeToEncoding "\"thursday\""
2100−toEncodingDayOfWeek Friday = E.unsafeToEncoding "\"friday\""
2101−toEncodingDayOfWeek Saturday = E.unsafeToEncoding "\"saturday\""
2102−toEncodingDayOfWeek Sunday = E.unsafeToEncoding "\"sunday\""
2104−instance ToJSONKey DayOfWeek where
2105− toJSONKey = toJSONKeyTextEnc toEncodingDayOfWeek
2107-------------------------------------------------------------------------------
1971-------------------------------------------------------------------------------
2108-- base Monoid/Semigroup
1972-- base Monoid/Semigroup
2109-------------------------------------------------------------------------------
1973-------------------------------------------------------------------------------
2111−instance ToJSON1 Monoid.Dual where
1975+instance ToJSON1 Dual where
2112− liftToJSON t _ = t . Monoid.getDual
1976+ liftToJSON t _ = t . getDual
2113− {-# INLINE liftToJSON #-}
2115− liftToEncoding t _ = t . Monoid.getDual
2116− {-# INLINE liftToEncoding #-}
2118−instance ToJSON a => ToJSON (Monoid.Dual a) where
2120− {-# INLINE toJSON #-}
2122− toEncoding = toEncoding1
2123− {-# INLINE toEncoding #-}
2126−instance ToJSON1 Monoid.First where
2127− liftToJSON t to' = liftToJSON t to' . Monoid.getFirst
2128− {-# INLINE liftToJSON #-}
2130− liftToEncoding t to' = liftToEncoding t to' . Monoid.getFirst
2131− {-# INLINE liftToEncoding #-}
2133−instance ToJSON a => ToJSON (Monoid.First a) where
2135− {-# INLINE toJSON #-}
2137− toEncoding = toEncoding1
2138− {-# INLINE toEncoding #-}
2141−instance ToJSON1 Monoid.Last where
2142− liftToJSON t to' = liftToJSON t to' . Monoid.getLast
2143− {-# INLINE liftToJSON #-}
2145− liftToEncoding t to' = liftToEncoding t to' . Monoid.getLast
2146− {-# INLINE liftToEncoding #-}
2148−instance ToJSON a => ToJSON (Monoid.Last a) where
2150− {-# INLINE toJSON #-}
2152− toEncoding = toEncoding1
2153− {-# INLINE toEncoding #-}
2156−instance ToJSON1 Semigroup.Min where
2157− liftToJSON t _ (Semigroup.Min x) = t x
2158− {-# INLINE liftToJSON #-}
2160− liftToEncoding t _ (Semigroup.Min x) = t x
2161− {-# INLINE liftToEncoding #-}
2163−instance ToJSON a => ToJSON (Semigroup.Min a) where
2165− {-# INLINE toJSON #-}
2167− toEncoding = toEncoding1
2168− {-# INLINE toEncoding #-}
2171−instance ToJSON1 Semigroup.Max where
2172− liftToJSON t _ (Semigroup.Max x) = t x
2173− {-# INLINE liftToJSON #-}
2175− liftToEncoding t _ (Semigroup.Max x) = t x
2176− {-# INLINE liftToEncoding #-}
2178−instance ToJSON a => ToJSON (Semigroup.Max a) where
2180− {-# INLINE toJSON #-}
2182− toEncoding = toEncoding1
2183− {-# INLINE toEncoding #-}
2185−instance ToJSON1 Semigroup.First where
2186− liftToJSON t _ (Semigroup.First x) = t x
2187 {-# INLINE liftToJSON #-}
1977 {-# INLINE liftToJSON #-}
2189− liftToEncoding t _ (Semigroup.First x) = t x
1979+ liftToEncoding t _ = t . getDual
2190 {-# INLINE liftToEncoding #-}
1980 {-# INLINE liftToEncoding #-}
2192−instance ToJSON a => ToJSON (Semigroup.First a) where
1982+instance ToJSON a => ToJSON (Dual a) where
2193 toJSON = toJSON1
1983 toJSON = toJSON1
2194 {-# INLINE toJSON #-}
1984 {-# INLINE toJSON #-}
@@ -2197,14 +1987,14 @@ instance ToJSON a => ToJSON (Semigroup.First a) where
2197 {-# INLINE toEncoding #-}
1987 {-# INLINE toEncoding #-}
2200−instance ToJSON1 Semigroup.Last where
1990+instance ToJSON1 First where
2201− liftToJSON t _ (Semigroup.Last x) = t x
1991+ liftToJSON t to' = liftToJSON t to' . getFirst
2202 {-# INLINE liftToJSON #-}
1992 {-# INLINE liftToJSON #-}
2204− liftToEncoding t _ (Semigroup.Last x) = t x
1994+ liftToEncoding t to' = liftToEncoding t to' . getFirst
2205 {-# INLINE liftToEncoding #-}
1995 {-# INLINE liftToEncoding #-}
2207−instance ToJSON a => ToJSON (Semigroup.Last a) where
1997+instance ToJSON a => ToJSON (First a) where
2208 toJSON = toJSON1
1998 toJSON = toJSON1
2209 {-# INLINE toJSON #-}
1999 {-# INLINE toJSON #-}
@@ -2212,29 +2002,14 @@ instance ToJSON a => ToJSON (Semigroup.Last a) where
2212 {-# INLINE toEncoding #-}
2002 {-# INLINE toEncoding #-}
2215−instance ToJSON1 Semigroup.WrappedMonoid where
2005+instance ToJSON1 Last where
2216− liftToJSON t _ (Semigroup.WrapMonoid x) = t x
2006+ liftToJSON t to' = liftToJSON t to' . getLast
2217 {-# INLINE liftToJSON #-}
2007 {-# INLINE liftToJSON #-}
2219− liftToEncoding t _ (Semigroup.WrapMonoid x) = t x
2009+ liftToEncoding t to' = liftToEncoding t to' . getLast
2220 {-# INLINE liftToEncoding #-}
2010 {-# INLINE liftToEncoding #-}
2222−instance ToJSON a => ToJSON (Semigroup.WrappedMonoid a) where
2012+instance ToJSON a => ToJSON (Last a) where
2224− {-# INLINE toJSON #-}
2226− toEncoding = toEncoding1
2227− {-# INLINE toEncoding #-}
2230−instance ToJSON1 Semigroup.Option where
2231− liftToJSON t to' = liftToJSON t to' . Semigroup.getOption
2232− {-# INLINE liftToJSON #-}
2234− liftToEncoding t to' = liftToEncoding t to' . Semigroup.getOption
2235− {-# INLINE liftToEncoding #-}
2237−instance ToJSON a => ToJSON (Semigroup.Option a) where
2238 toJSON = toJSON1
2013 toJSON = toJSON1
2239 {-# INLINE toJSON #-}
2014 {-# INLINE toJSON #-}
@@ -2245,13 +2020,6 @@ instance ToJSON a => ToJSON (Semigroup.Option a) where
2245-- tagged
2020-- tagged
2246-------------------------------------------------------------------------------
2021-------------------------------------------------------------------------------
2248−instance ToJSON1 Proxy where
2249− liftToJSON _ _ _ = Null
2250− {-# INLINE liftToJSON #-}
2252− liftToEncoding _ _ _ = E.null_
2253− {-# INLINE liftToEncoding #-}
2255instance ToJSON (Proxy a) where
2023instance ToJSON (Proxy a) where
2256 toJSON _ = Null
2024 toJSON _ = Null
2257 {-# INLINE toJSON #-}
2025 {-# INLINE toJSON #-}
@@ -2260,13 +2028,6 @@ instance ToJSON (Proxy a) where
2260 {-# INLINE toEncoding #-}
2028 {-# INLINE toEncoding #-}
2263−instance ToJSON2 Tagged where
2264− liftToJSON2 _ _ t _ (Tagged x) = t x
2265− {-# INLINE liftToJSON2 #-}
2267− liftToEncoding2 _ _ t _ (Tagged x) = t x
2268− {-# INLINE liftToEncoding2 #-}
2270instance ToJSON1 (Tagged a) where
2031instance ToJSON1 (Tagged a) where
2271 liftToJSON t _ (Tagged x) = t x
2032 liftToJSON t _ (Tagged x) = t x
2272 {-# INLINE liftToJSON #-}
2033 {-# INLINE liftToJSON #-}
@@ -2281,6 +2042,7 @@ instance ToJSON b => ToJSON (Tagged a b) where
2281 toEncoding = toEncoding1
2042 toEncoding = toEncoding1
2282 {-# INLINE toEncoding #-}
2043 {-# INLINE toEncoding #-}
2284instance ToJSONKey b => ToJSONKey (Tagged a b) where
2046instance ToJSONKey b => ToJSONKey (Tagged a b) where
2285 toJSONKey = contramapToJSONKeyFunction unTagged toJSONKey
2047 toJSONKey = contramapToJSONKeyFunction unTagged toJSONKey
2286 toJSONKeyList = contramapToJSONKeyFunction (fmap unTagged) toJSONKeyList
2048 toJSONKeyList = contramapToJSONKeyFunction (fmap unTagged) toJSONKeyList
@@ -2301,7 +2063,7 @@ instance (ToJSONKey a, ToJSON a) => ToJSONKey [a] where
2301 toJSONKey = toJSONKeyList
2063 toJSONKey = toJSONKeyList
2303-------------------------------------------------------------------------------
2065-------------------------------------------------------------------------------
2304−-- Tuple instances
2066+-- Tuple instances, see tuple-instances-to.hs
2305-------------------------------------------------------------------------------
2067-------------------------------------------------------------------------------
2307instance ToJSON2 (,) where
2069instance ToJSON2 (,) where
@@ -2312,7 +2074,9 @@ instance ToJSON2 (,) where
2312 return mv
2074 return mv
2313 {-# INLINE liftToJSON2 #-}
2075 {-# INLINE liftToJSON2 #-}
2315− liftToEncoding2 toA _ toB _ (a, b) = E.list id [toA a, toB b]
2077+ liftToEncoding2 toA _ toB _ (a, b) = tuple $
2316 {-# INLINE liftToEncoding2 #-}
2080 {-# INLINE liftToEncoding2 #-}
2318instance (ToJSON a) => ToJSON1 ((,) a) where
2082instance (ToJSON a) => ToJSON1 ((,) a) where
@@ -2336,11 +2100,10 @@ instance (ToJSON a) => ToJSON2 ((,,) a) where
2336 return mv
2100 return mv
2337 {-# INLINE liftToJSON2 #-}
2101 {-# INLINE liftToJSON2 #-}
2339− liftToEncoding2 toB _ toC _ (a, b, c) = E.list id
2103+ liftToEncoding2 toB _ toC _ (a, b, c) = tuple $
2340− [ toEncoding a
2104+ toEncoding a >*<
2341− , toB b
2105+ toB b >*<
2344 {-# INLINE liftToEncoding2 #-}
2107 {-# INLINE liftToEncoding2 #-}
2346instance (ToJSON a, ToJSON b) => ToJSON1 ((,,) a b) where
2109instance (ToJSON a, ToJSON b) => ToJSON1 ((,,) a b) where
@@ -2365,12 +2128,11 @@ instance (ToJSON a, ToJSON b) => ToJSON2 ((,,,) a b) where
2365 return mv
2128 return mv
2366 {-# INLINE liftToJSON2 #-}
2129 {-# INLINE liftToJSON2 #-}
2368− liftToEncoding2 toC _ toD _ (a, b, c, d) = E.list id
2131+ liftToEncoding2 toC _ toD _ (a, b, c, d) = tuple $
2369− [ toEncoding a
2132+ toEncoding a >*<
2370− , toEncoding b
2133+ toEncoding b >*<
2371− , toC c
2134+ toC c >*<
2374 {-# INLINE liftToEncoding2 #-}
2136 {-# INLINE liftToEncoding2 #-}
2376instance (ToJSON a, ToJSON b, ToJSON c) => ToJSON1 ((,,,) a b c) where
2138instance (ToJSON a, ToJSON b, ToJSON c) => ToJSON1 ((,,,) a b c) where
@@ -2396,13 +2158,12 @@ instance (ToJSON a, ToJSON b, ToJSON c) => ToJSON2 ((,,,,) a b c) where
2396 return mv
2158 return mv
2397 {-# INLINE liftToJSON2 #-}
2159 {-# INLINE liftToJSON2 #-}
2399− liftToEncoding2 toD _ toE _ (a, b, c, d, e) = E.list id
2161+ liftToEncoding2 toD _ toE _ (a, b, c, d, e) = tuple $
2400− [ toEncoding a
2162+ toEncoding a >*<
2401− , toEncoding b
2163+ toEncoding b >*<
2402− , toEncoding c
2164+ toEncoding c >*<
2403− , toD d
2165+ toD d >*<
2406 {-# INLINE liftToEncoding2 #-}
2167 {-# INLINE liftToEncoding2 #-}
2408instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d) => ToJSON1 ((,,,,) a b c d) where
2169instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d) => ToJSON1 ((,,,,) a b c d) where
@@ -2429,14 +2190,13 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d) => ToJSON2 ((,,,,,) a b c d) w
2429 return mv
2190 return mv
2430 {-# INLINE liftToJSON2 #-}
2191 {-# INLINE liftToJSON2 #-}
2432− liftToEncoding2 toE _ toF _ (a, b, c, d, e, f) = E.list id
2193+ liftToEncoding2 toE _ toF _ (a, b, c, d, e, f) = tuple $
2433− [ toEncoding a
2194+ toEncoding a >*<
2434− , toEncoding b
2195+ toEncoding b >*<
2435− , toEncoding c
2196+ toEncoding c >*<
2436− , toEncoding d
2197+ toEncoding d >*<
2437− , toE e
2198+ toE e >*<
2440 {-# INLINE liftToEncoding2 #-}
2200 {-# INLINE liftToEncoding2 #-}
2442instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e) => ToJSON1 ((,,,,,) a b c d e) where
2202instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e) => ToJSON1 ((,,,,,) a b c d e) where
@@ -2464,15 +2224,14 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e) => ToJSON2 ((,,,,,,)
2464 return mv
2224 return mv
2465 {-# INLINE liftToJSON2 #-}
2225 {-# INLINE liftToJSON2 #-}
2467− liftToEncoding2 toF _ toG _ (a, b, c, d, e, f, g) = E.list id
2227+ liftToEncoding2 toF _ toG _ (a, b, c, d, e, f, g) = tuple $
2468− [ toEncoding a
2228+ toEncoding a >*<
2469− , toEncoding b
2229+ toEncoding b >*<
2470− , toEncoding c
2230+ toEncoding c >*<
2471− , toEncoding d
2231+ toEncoding d >*<
2472− , toEncoding e
2232+ toEncoding e >*<
2473− , toF f
2233+ toF f >*<
2476 {-# INLINE liftToEncoding2 #-}
2235 {-# INLINE liftToEncoding2 #-}
2478instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f) => ToJSON1 ((,,,,,,) a b c d e f) where
2237instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f) => ToJSON1 ((,,,,,,) a b c d e f) where
@@ -2501,16 +2260,15 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f) => ToJSON2
2501 return mv
2260 return mv
2502 {-# INLINE liftToJSON2 #-}
2261 {-# INLINE liftToJSON2 #-}
2504− liftToEncoding2 toG _ toH _ (a, b, c, d, e, f, g, h) = E.list id
2263+ liftToEncoding2 toG _ toH _ (a, b, c, d, e, f, g, h) = tuple $
2505− [ toEncoding a
2264+ toEncoding a >*<
2506− , toEncoding b
2265+ toEncoding b >*<
2507− , toEncoding c
2266+ toEncoding c >*<
2508− , toEncoding d
2267+ toEncoding d >*<
2509− , toEncoding e
2268+ toEncoding e >*<
2510− , toEncoding f
2269+ toEncoding f >*<
2511− , toG g
2270+ toG g >*<
2514 {-# INLINE liftToEncoding2 #-}
2272 {-# INLINE liftToEncoding2 #-}
2516instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g) => ToJSON1 ((,,,,,,,) a b c d e f g) where
2274instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g) => ToJSON1 ((,,,,,,,) a b c d e f g) where
@@ -2540,17 +2298,16 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g)
2540 return mv
2298 return mv
2541 {-# INLINE liftToJSON2 #-}
2299 {-# INLINE liftToJSON2 #-}
2543− liftToEncoding2 toH _ toI _ (a, b, c, d, e, f, g, h, i) = E.list id
2301+ liftToEncoding2 toH _ toI _ (a, b, c, d, e, f, g, h, i) = tuple $
2544− [ toEncoding a
2302+ toEncoding a >*<
2545− , toEncoding b
2303+ toEncoding b >*<
2546− , toEncoding c
2304+ toEncoding c >*<
2547− , toEncoding d
2305+ toEncoding d >*<
2548− , toEncoding e
2306+ toEncoding e >*<
2549− , toEncoding f
2307+ toEncoding f >*<
2550− , toEncoding g
2308+ toEncoding g >*<
2551− , toH h
2309+ toH h >*<
2554 {-# INLINE liftToEncoding2 #-}
2311 {-# INLINE liftToEncoding2 #-}
2556instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h) => ToJSON1 ((,,,,,,,,) a b c d e f g h) where
2313instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h) => ToJSON1 ((,,,,,,,,) a b c d e f g h) where
@@ -2581,18 +2338,17 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2581 return mv
2338 return mv
2582 {-# INLINE liftToJSON2 #-}
2339 {-# INLINE liftToJSON2 #-}
2584− liftToEncoding2 toI _ toJ _ (a, b, c, d, e, f, g, h, i, j) = E.list id
2341+ liftToEncoding2 toI _ toJ _ (a, b, c, d, e, f, g, h, i, j) = tuple $
2585− [ toEncoding a
2342+ toEncoding a >*<
2586− , toEncoding b
2343+ toEncoding b >*<
2587− , toEncoding c
2344+ toEncoding c >*<
2588− , toEncoding d
2345+ toEncoding d >*<
2589− , toEncoding e
2346+ toEncoding e >*<
2590− , toEncoding f
2347+ toEncoding f >*<
2591− , toEncoding g
2348+ toEncoding g >*<
2592− , toEncoding h
2349+ toEncoding h >*<
2593− , toI i
2350+ toI i >*<
2596 {-# INLINE liftToEncoding2 #-}
2352 {-# INLINE liftToEncoding2 #-}
2598instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i) => ToJSON1 ((,,,,,,,,,) a b c d e f g h i) where
2354instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i) => ToJSON1 ((,,,,,,,,,) a b c d e f g h i) where
@@ -2624,19 +2380,18 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2624 return mv
2380 return mv
2625 {-# INLINE liftToJSON2 #-}
2381 {-# INLINE liftToJSON2 #-}
2627− liftToEncoding2 toJ _ toK _ (a, b, c, d, e, f, g, h, i, j, k) = E.list id
2383+ liftToEncoding2 toJ _ toK _ (a, b, c, d, e, f, g, h, i, j, k) = tuple $
2628− [ toEncoding a
2384+ toEncoding a >*<
2629− , toEncoding b
2385+ toEncoding b >*<
2630− , toEncoding c
2386+ toEncoding c >*<
2631− , toEncoding d
2387+ toEncoding d >*<
2632− , toEncoding e
2388+ toEncoding e >*<
2633− , toEncoding f
2389+ toEncoding f >*<
2634− , toEncoding g
2390+ toEncoding g >*<
2635− , toEncoding h
2391+ toEncoding h >*<
2636− , toEncoding i
2392+ toEncoding i >*<
2637− , toJ j
2393+ toJ j >*<
2640 {-# INLINE liftToEncoding2 #-}
2395 {-# INLINE liftToEncoding2 #-}
2642instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j) => ToJSON1 ((,,,,,,,,,,) a b c d e f g h i j) where
2397instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j) => ToJSON1 ((,,,,,,,,,,) a b c d e f g h i j) where
@@ -2669,20 +2424,19 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2669 return mv
2424 return mv
2670 {-# INLINE liftToJSON2 #-}
2425 {-# INLINE liftToJSON2 #-}
2672− liftToEncoding2 toK _ toL _ (a, b, c, d, e, f, g, h, i, j, k, l) = E.list id
2427+ liftToEncoding2 toK _ toL _ (a, b, c, d, e, f, g, h, i, j, k, l) = tuple $
2673− [ toEncoding a
2428+ toEncoding a >*<
2674− , toEncoding b
2429+ toEncoding b >*<
2675− , toEncoding c
2430+ toEncoding c >*<
2676− , toEncoding d
2431+ toEncoding d >*<
2677− , toEncoding e
2432+ toEncoding e >*<
2678− , toEncoding f
2433+ toEncoding f >*<
2679− , toEncoding g
2434+ toEncoding g >*<
2680− , toEncoding h
2435+ toEncoding h >*<
2681− , toEncoding i
2436+ toEncoding i >*<
2682− , toEncoding j
2437+ toEncoding j >*<
2683− , toK k
2438+ toK k >*<
2686 {-# INLINE liftToEncoding2 #-}
2440 {-# INLINE liftToEncoding2 #-}
2688instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k) => ToJSON1 ((,,,,,,,,,,,) a b c d e f g h i j k) where
2442instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k) => ToJSON1 ((,,,,,,,,,,,) a b c d e f g h i j k) where
@@ -2716,21 +2470,20 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2716 return mv
2470 return mv
2717 {-# INLINE liftToJSON2 #-}
2471 {-# INLINE liftToJSON2 #-}
2719− liftToEncoding2 toL _ toM _ (a, b, c, d, e, f, g, h, i, j, k, l, m) = E.list id
2473+ liftToEncoding2 toL _ toM _ (a, b, c, d, e, f, g, h, i, j, k, l, m) = tuple $
2720− [ toEncoding a
2474+ toEncoding a >*<
2721− , toEncoding b
2475+ toEncoding b >*<
2722− , toEncoding c
2476+ toEncoding c >*<
2723− , toEncoding d
2477+ toEncoding d >*<
2724− , toEncoding e
2478+ toEncoding e >*<
2725− , toEncoding f
2479+ toEncoding f >*<
2726− , toEncoding g
2480+ toEncoding g >*<
2727− , toEncoding h
2481+ toEncoding h >*<
2728− , toEncoding i
2482+ toEncoding i >*<
2729− , toEncoding j
2483+ toEncoding j >*<
2730− , toEncoding k
2484+ toEncoding k >*<
2731− , toL l
2485+ toL l >*<
2734 {-# INLINE liftToEncoding2 #-}
2487 {-# INLINE liftToEncoding2 #-}
2736instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k, ToJSON l) => ToJSON1 ((,,,,,,,,,,,,) a b c d e f g h i j k l) where
2489instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k, ToJSON l) => ToJSON1 ((,,,,,,,,,,,,) a b c d e f g h i j k l) where
@@ -2765,22 +2518,21 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2765 return mv
2518 return mv
2766 {-# INLINE liftToJSON2 #-}
2519 {-# INLINE liftToJSON2 #-}
2768− liftToEncoding2 toM _ toN _ (a, b, c, d, e, f, g, h, i, j, k, l, m, n) = E.list id
2521+ liftToEncoding2 toM _ toN _ (a, b, c, d, e, f, g, h, i, j, k, l, m, n) = tuple $
2769− [ toEncoding a
2522+ toEncoding a >*<
2770− , toEncoding b
2523+ toEncoding b >*<
2771− , toEncoding c
2524+ toEncoding c >*<
2772− , toEncoding d
2525+ toEncoding d >*<
2773− , toEncoding e
2526+ toEncoding e >*<
2774− , toEncoding f
2527+ toEncoding f >*<
2775− , toEncoding g
2528+ toEncoding g >*<
2776− , toEncoding h
2529+ toEncoding h >*<
2777− , toEncoding i
2530+ toEncoding i >*<
2778− , toEncoding j
2531+ toEncoding j >*<
2779− , toEncoding k
2532+ toEncoding k >*<
2780− , toEncoding l
2533+ toEncoding l >*<
2781− , toM m
2534+ toM m >*<
2784 {-# INLINE liftToEncoding2 #-}
2536 {-# INLINE liftToEncoding2 #-}
2786instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k, ToJSON l, ToJSON m) => ToJSON1 ((,,,,,,,,,,,,,) a b c d e f g h i j k l m) where
2538instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k, ToJSON l, ToJSON m) => ToJSON1 ((,,,,,,,,,,,,,) a b c d e f g h i j k l m) where
@@ -2816,23 +2568,22 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2816 return mv
2568 return mv
2817 {-# INLINE liftToJSON2 #-}
2569 {-# INLINE liftToJSON2 #-}
2819− liftToEncoding2 toN _ toO _ (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) = E.list id
2571+ liftToEncoding2 toN _ toO _ (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) = tuple $
2820− [ toEncoding a
2572+ toEncoding a >*<
2821− , toEncoding b
2573+ toEncoding b >*<
2822− , toEncoding c
2574+ toEncoding c >*<
2823− , toEncoding d
2575+ toEncoding d >*<
2824− , toEncoding e
2576+ toEncoding e >*<
2825− , toEncoding f
2577+ toEncoding f >*<
2826− , toEncoding g
2578+ toEncoding g >*<
2827− , toEncoding h
2579+ toEncoding h >*<
2828− , toEncoding i
2580+ toEncoding i >*<
2829− , toEncoding j
2581+ toEncoding j >*<
2830− , toEncoding k
2582+ toEncoding k >*<
2831− , toEncoding l
2583+ toEncoding l >*<
2832− , toEncoding m
2584+ toEncoding m >*<
2833− , toN n
2585+ toN n >*<
2836 {-# INLINE liftToEncoding2 #-}
2587 {-# INLINE liftToEncoding2 #-}
2838instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k, ToJSON l, ToJSON m, ToJSON n) => ToJSON1 ((,,,,,,,,,,,,,,) a b c d e f g h i j k l m n) where
2589instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g, ToJSON h, ToJSON i, ToJSON j, ToJSON k, ToJSON l, ToJSON m, ToJSON n) => ToJSON1 ((,,,,,,,,,,,,,,) a b c d e f g h i j k l m n) where
@@ -2847,26 +2598,27 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2847 toEncoding = toEncoding2
2598 toEncoding = toEncoding2
2848 {-# INLINE toEncoding #-}
2599 {-# INLINE toEncoding #-}
2850−--------------------------------------------------------------------------------
2601+-------------------------------------------------------------------------------
2851−
2602+-- pre-bytestring-0.10 compatibility
2852−-- | Wrap a list of pairs as an object.
2603+-------------------------------------------------------------------------------
2853−class Monoid pairs => FromPairs enc pairs | enc -> pairs where
2854− fromPairs :: pairs -> enc
2856−instance (a ~ Value) => FromPairs (Encoding' a) Series where
2857− fromPairs = E.pairs
2859−instance FromPairs Value (DList Pair) where
2860− fromPairs = object . toList
2862−-- | Like 'KeyValue' but the value is already converted to JSON
2605+{-# INLINE lazyToStrictByteString #-}
2863−-- ('Value' or 'Encoding'), and the result actually represents lists of pairs
2606+lazyToStrictByteString :: L.ByteString -> S.ByteString
2864−-- so it can be readily concatenated.
2607+#if MIN_VERSION_bytestring(0,10,0)
2865−class Monoid kv => KeyValuePair v kv where
2608+lazyToStrictByteString = L.toStrict
2866− pair :: String -> v -> kv
2609+#else
2610+lazyToStrictByteString = packChunks
2868−instance (v ~ Value) => KeyValuePair v (DList Pair) where
2612+-- packChunks is taken from the blaze-builder package.
2869− pair k v = DList.singleton (pack k .= v)
2871−instance (e ~ Encoding) => KeyValuePair e Series where
2614+-- | Pack the chunks of a lazy bytestring into a single strict bytestring.
2872− pair = E.pairStr
2615+packChunks :: L.ByteString -> S.ByteString
2617+ S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs)
2619+ copyChunks !L.Empty !_pf = return ()
2620+ copyChunks !(L.Chunk (S.PS fpbuf o l) lbs') !pf = do
2621+ withForeignPtr fpbuf $ \pbuf ->
2622+ copyBytes pf (pbuf `plusPtr` o) l
2623+ copyChunks lbs' (pf `plusPtr` l)