unicode wip

Author: functora

pub/functora/src/bolt11/Functora/Bolt11.hs

@@ -204,18 +204,18 @@ data Route = Route
 instance A.ToJSON Route where
   toJSON x =
     A.object
-      [ "pubkey" A..= inspectHex @String (routePubKey x),
-        "short_channel_id" A..= inspectHex @String (routeShortChanId x),
+      [ "pubkey" A..= inspectHex @Unicode (routePubKey x),
+        "short_channel_id" A..= inspectHex @Unicode (routeShortChanId x),
         "fee_base_msat" A..= routeFeeBaseMsat x,
         "fee_proportional_millionths" A..= routeFeePropMillionth x,
         "cltv_expiry_delta" A..= routeCltvExpiryDelta x
       ]
   toEncoding x =
     A.pairs
       $ "pubkey"
-      A..= inspectHex @String (routePubKey x)
+      A..= inspectHex @Unicode (routePubKey x)
         <> "short_channel_id"
-      A..= inspectHex @String (routeShortChanId x)
+      A..= inspectHex @Unicode (routeShortChanId x)
         <> "fee_base_msat"
       A..= routeFeeBaseMsat x
         <> "fee_proportional_millionths"

pub/functora/src/prelude/Functora/Prelude.hs

@@ -529,7 +529,7 @@ display x
 #if defined(__GHCJS__) || defined(ghcjs_HOST_OS) || defined(wasi_HOST_OS)
     defDisplay
       | Just HRefl <- typeOf x `eqTypeRep` typeRep @JS.JSString =
-          from @String @dst $ from @JS.JSString @String x
+          from @JS.JSString @dst x
       | otherwise =
           Universum.show x
 #else
@@ -664,10 +664,10 @@ getCurrentPicos = do
 -- Exceptions
 
 data ParseException = ParseException
-  { parseExceptionSource :: String,
+  { parseExceptionSource :: Unicode,
     parseExceptionSourceType :: SomeTypeRep,
     parseExceptionTargetType :: SomeTypeRep,
-    parseExceptionFailure :: String
+    parseExceptionFailure :: Unicode
   }
   deriving stock (Eq, Ord, Show, Data, Generic)
 
@@ -736,7 +736,7 @@ parseRatio str =
         then pure rat
         else
           throwParseException str
-            $ inspectType @int @String
+            $ inspectType @int @Unicode
             <> " numerator or denominator seems to be out of bounds, expected "
             <> inspect rhsRat
             <> " but got "
@@ -1056,6 +1056,7 @@ type Textual mono =
     From String mono,
     From Text mono,
     From TL.Text mono,
+    From Unicode mono,
     ConvertUtf8 mono ByteString,
     ConvertUtf8 mono BL.ByteString
   )

pub/functora/src/prelude/Functora/PreludeOrphan.hs

@@ -154,11 +154,15 @@ instance ConvertUtf8 JSString BL.ByteString where
   decodeUtf8Strict = fmap JS.pack . decodeUtf8Strict
 
 instance Binary JSString where
-  put = Binary.put . from @JSString @Text
-  get = fmap (from @Text @JSString) Binary.get
+  put = Binary.put . encodeUtf8 @JSString @ByteString
+  get = do
+    bs <- Binary.get
+    case decodeUtf8Strict @JSString @ByteString bs of
+      Right x -> pure x
+      Left e -> fail $ displayException e
 
 instance A.ToJSONKey JSString where
-  toJSONKey = contramap (from @JSString @Text) $ A.toJSONKey
+  toJSONKey = contramap (from @JSString @Text) $ A.toJSONKey @Text
 
 instance A.FromJSONKey JSString where
   fromJSONKey = fmap (from @Text @JSString) $ A.fromJSONKey @Text

pub/functora/src/web/Functora/Web.hs

@@ -99,7 +99,7 @@ webFetch prevUri opts = do
     else
       throwString $
         "Bad HTTP status="
-          <> inspect @Text webResCode
+          <> inspect @Unicode webResCode
           <> " of req="
           <> inspect webReq
           <> " with res="
@@ -126,7 +126,7 @@ webFetch prevUri opts = do
     else
       throwString $
         "Bad HTTP status="
-          <> inspect @Text webResCode
+          <> inspect @Unicode webResCode
           <> " of req="
           <> inspect nextUri
           <> " with res="