Update support for json-syntax v3

Author: TristanCacqueray

monocle.cabal

@@ -186,7 +186,6 @@ library
                      , tasty                      >= 1.4
                      , tasty-hunit                >= 0.10
                      , template-haskell
-                     , text-short                 >= 0.1
                      , text-time                  >= 0.3
                      , th-env                     >= 0.1
                      , time

src/Json/Extras.hs

@@ -4,7 +4,6 @@
 module Json.Extras (
   -- * Data types
   module Json,
-  ShortText,
 
   -- * Extras
   decodeThrow,
@@ -16,8 +15,6 @@ module Json.Extras (
 
 import Data.ByteString.Lazy qualified as LBS
 import Data.Bytes qualified as Bytes
-import Data.Text.Short (ShortText)
-import Data.Text.Short qualified as TextShort
 import Data.Text.Time qualified as TextTime
 import Data.Time.Clock (UTCTime)
 import Relude
@@ -30,7 +27,7 @@ decodeThrow dat = case decode (Bytes.fromByteString (from dat)) of
   Right v -> v
 
 -- | 'getAttr' return an object value
-getAttr :: ShortText -> Json.Value -> Maybe Json.Value
+getAttr :: Text -> Json.Value -> Maybe Json.Value
 getAttr k v = case v of
   Json.Object xs -> getFirst $ foldMap getValue' xs
   _ -> Nothing
@@ -39,7 +36,7 @@ getAttr k v = case v of
     | key == k = First $ Just value
     | otherwise = First Nothing
 
-getString :: Json.Value -> Maybe ShortText
+getString :: Json.Value -> Maybe Text
 getString v = case v of
   Json.String x -> pure x
   _ -> Nothing
@@ -51,5 +48,5 @@ getArray v = case v of
 
 getDate :: Json.Value -> Maybe UTCTime
 getDate v = case v of
-  Json.String t -> either (const Nothing) Just $ TextTime.parseUTCTimeOrError (TextShort.toText t)
+  Json.String t -> either (const Nothing) Just $ TextTime.parseUTCTimeOrError t
   _ -> error "Not a date"

src/Monocle/Backend/Queries.hs

@@ -10,7 +10,6 @@ import Data.List qualified
 import Data.Map qualified as Map
 import Data.Ord qualified
 import Data.String.Interpolate (i, iii)
-import Data.Text.Short qualified as TextShort
 import Data.Time (UTCTime (UTCTime), addDays, addGregorianMonthsClip, addGregorianYearsClip, secondsToNominalDiffTime)
 import Data.Time.Clock (secondsToDiffTime)
 import Data.Vector qualified as V
@@ -445,8 +444,8 @@ data FirstEvent = FirstEvent
 data JsonChangeEvent = JsonChangeEvent
   { jceCreatedAt :: UTCTime
   , jceOnCreatedAt :: UTCTime
-  , jceChangeId :: Json.ShortText
-  , jceAuthor :: Json.ShortText
+  , jceChangeId :: Text
+  , jceAuthor :: Text
   }
 
 decodeJsonChangeEvent :: Json.Value -> Maybe JsonChangeEvent
@@ -496,7 +495,7 @@ firstEventOnChanges = do
     let (createdAt, author) =
           -- If the event is older update the info
           if jceCreatedAt < feCreatedAt acc
-            then (jceCreatedAt, from $ TextShort.toText jceAuthor)
+            then (jceCreatedAt, from jceAuthor)
             else (feCreatedAt acc, feAuthor acc)
      in FirstEvent
           { feChangeCreatedAt = jceOnCreatedAt

test/JsonDecode.hs

@@ -7,7 +7,6 @@ import Criterion.Main
 import Data.Aeson qualified as Aeson
 import Data.ByteString.Lazy qualified as LBS
 import Data.Bytes qualified as B
-import Data.Text.Short qualified as TextShort
 import Data.Text.Time qualified as T
 import Database.Bloodhound qualified as BH
 import Faker qualified
@@ -38,7 +37,7 @@ jsonPerf dat = do
     _ -> Nothing
   getDate :: Json.Value -> UTCTime
   getDate v = case v of
-    Json.String t -> either (error "oops") id $ T.parseUTCTimeOrError (TextShort.toText t)
+    Json.String t -> either (error "oops") id $ T.parseUTCTimeOrError t
     _ -> error "Not a date"
   toDuration :: Json.Value -> Maybe Pico
   toDuration v' = do