@@ -32,6 +32,7 @@ import qualified Control.Monad.State as S
3232import Data.Aeson
3333import Data.Aeson.Types (Parser)
3434import Data.Constraint
35+import Data.List (intercalate)
3536import Data.Maybe (catMaybes)
3637import Data.Proxy
3738import qualified Data.Text as T
@@ -42,11 +43,17 @@ import GHC.OverloadedLabels
4243import GHC.Prim
4344import GHC.ST (ST (..), runST)
4445import GHC.TypeLits
45−import Generic.Data (gshowsPrec)
46−import Generic.Data.Internal.Show (GShow)
4746import qualified Optics.Lens as OL
4847import Unsafe.Coerce
4948import Prelude
49+#if MIN_VERSION_aeson(2,0,0)
50+import Data.Aeson.Key (fromText, fromString)
51+#else
52+fromText :: a -> a
53+fromText = id
54+fromString :: String -> T.Text
55+fromString = T.pack
56+#endif
5057
5158-- | Field named @l@ labels value of type @t@ adapted from the awesome /labels/ package.
5259-- Example: @(#name := \"Chris\") :: (\"name\" := String)@
@@ -102,13 +109,12 @@ defaultJSONOptions = JSONOptions {fieldTransform = id}
102109type role Rec representational
103110
104111instance
105− ( RecApply lts lts Show,
106− GShow Proxy (Rep (Rec lts)),
107− Generic (Rec lts)
112+ ( RecApply lts lts Show
108113 ) =>
109114 Show (Rec lts)
110115 where
111− show = (\x -> if null x then "{}" else x) . unwords . drop 1 . words . flip (gshowsPrec 0) ""
116+ show rec = "{" ++ formatted ++ "}"
117+ where formatted = intercalate ", " $ map (\(k, v) -> k ++ " = " ++ v) $ showRec rec
112118
113119instance RecEq lts lts => Eq (Rec lts) where
114120 (==) (a :: Rec lts) (b :: Rec lts) = recEq a b (Proxy :: Proxy lts)
@@ -403,26 +409,20 @@ type family RecDeepTy (ps :: r) (lts :: [*]) :: * where
403409-- NOTE: changed from original superrecord to not require a 'Sort'
404410combine ::
405411 forall lhs rhs res.
406− ( KnownNat (RecSize lhs),
407− KnownNat (RecSize rhs),
408− KnownNat (RecSize lhs + RecSize rhs),
409− res ~ RecAppend lhs rhs,
410− RecCopy lhs lhs res,
411− RecCopy rhs rhs res
412− ) =>
412+ res ~ RecAppend lhs rhs =>
413413 Rec lhs ->
414414 Rec rhs ->
415415 Rec res
416−combine lts rts =
417− let !(I# size#) =
418− fromIntegral $ natVal' (proxy# :: Proxy# (RecSize lhs + RecSize rhs))
416+combine (MkRec arr0#) (MkRec arr1#) =
417+ let !size0# = sizeofSmallArray# arr0#
418+ !size1# = sizeofSmallArray# arr1#
419419 in runST' $
420420 ST $ \s# ->
421− case newSmallArray# size# (error "No value") s# of
421+ case newSmallArray# (size0# +# size1#) (error "No value") s# of
422422 (# s'#, arr# #) ->
423− case recCopyInto (Proxy :: Proxy lhs) lts (Proxy :: Proxy res) arr# s'# of
423+ case copySmallArray# arr1# 0# arr# 0# size1# s'# of
424424 s''# ->
425− case recCopyInto (Proxy :: Proxy rhs) rts (Proxy :: Proxy res) arr# s''# of
425+ case copySmallArray# arr0# 0# arr# size1# size0# s''# of
426426 s'''# ->
427427 case unsafeFreezeSmallArray# arr# s'''# of
428428 (# s''''#, a# #) -> (# s''''#, MkRec a# #)
@@ -492,13 +492,7 @@ insert (l := v) rts =
492492-- | Alias for 'combine'
493493(++:) ::
494494 forall lhs rhs res.
495− ( KnownNat (RecSize lhs),
496− KnownNat (RecSize rhs),
497− KnownNat (RecSize lhs + RecSize rhs),
498− res ~ RecAppend lhs rhs,
499− RecCopy lhs lhs res,
500− RecCopy rhs rhs res
501− ) =>
495+ res ~ RecAppend lhs rhs =>
502496 Rec lhs ->
503497 Rec rhs ->
504498 Rec res
@@ -572,16 +566,16 @@ class ToJSON a => EncodeField a where
572566
573567instance ToJSON a => EncodeField a where
574568 encodeField = pure . toJSON
575− encodeKV = (.=)
569+ encodeKV k v = fromText k .= v
576570
577571instance {-# OVERLAPS #-} ToJSON a => EncodeField (Maybe a) where
578572 encodeField = fmap toJSON
579573 encodeKV _ Nothing = mempty
580− encodeKV k v = k .= v
574+ encodeKV k v = fromText k .= v
581575
582576recToValue :: forall lts. (RecApply lts lts EncodeField) => JSONOptions -> Rec lts -> Value
583577recToValue options r =
584− object $ catMaybes $ reflectRec @EncodeField Proxy (\k v -> (T.pack (fieldTransform options k),) <$> encodeField v) r
578+ object $ catMaybes $ reflectRec @EncodeField Proxy (\k v -> (fromString (fieldTransform options k),) <$> encodeField v) r
585579
586580recToEncoding :: forall lts. (RecApply lts lts EncodeField) => JSONOptions -> Rec lts -> Encoding
587581recToEncoding options r =
@@ -686,10 +680,10 @@ class FromJSON a => ParseField a where
686680 parseField :: Object -> T.Text -> Parser a
687681
688682instance FromJSON a => ParseField a where
689− parseField = (.:)
683+ parseField o k = o .: fromText k
690684
691685instance {-# OVERLAPS #-} FromJSON a => ParseField (Maybe a) where
692− parseField = (.:?)
686+ parseField o k = o .:? fromText k
693687
694688instance
695689 ( KnownSymbol l,