unicode refactoring wip

Author: functora

ghcjs/lightning-verifier/src/App/Types.hs

@@ -224,7 +224,7 @@ stQuery st = do
     encodeText :: (MonadThrow m) => BL.ByteString -> m Prelude.Text
     encodeText =
       either throw pure
-        . decodeUtf8'
+        . decodeUtf8Strict
         . B64URL.encode
         . from @BL.ByteString @ByteString
 

ghcjs/miso-widgets/src/Functora/Miso/Prelude.hs

@@ -8,9 +8,6 @@ module Functora.Miso.Prelude
   )
 where
 
-#if defined(__GHCJS__) || defined(ghcjs_HOST_OS) || defined(wasi_HOST_OS)
-import qualified Data.Binary as Binary (get, put)
-#endif
 import Functora.Cfg as X
 import Functora.Miso.Orphan as X ()
 import Functora.Prelude as X hiding
@@ -40,23 +37,6 @@ import Miso.String as X
   )
 import Type.Reflection
 
-#if defined(__GHCJS__) || defined(ghcjs_HOST_OS) || defined(wasi_HOST_OS)
-instance Binary MisoString where
-  put = Binary.put . fromMisoString @Prelude.Text
-  get = fmap (toMisoString @Prelude.Text) Binary.get
-
-instance ConvertUtf8 MisoString ByteString where
-  encodeUtf8 = encodeUtf8 . fromMisoString @Prelude.String
-  decodeUtf8 = toMisoString @Prelude.String . decodeUtf8
-  decodeUtf8Strict = fmap (toMisoString @Prelude.String) . decodeUtf8Strict
-
-instance ToJSONKey MisoString where
-  toJSONKey = contramap (fromMisoString @Prelude.Text) $ toJSONKey
-
-instance FromJSONKey MisoString where
-  fromJSONKey = fmap toMisoString $ fromJSONKey @Prelude.Text
-#endif
-
 instance (ToMisoString a) => ToMisoString (Tagged "UTF-8" a) where
   toMisoString = toMisoString . unTagged
 

ghcjs/miso-widgets/src/Functora/Miso/Types.hs

@@ -485,20 +485,13 @@ newPaymentMethod ::
   m (PaymentMethod Unique)
 newPaymentMethod cur addr0 = do
   lbl <-
-    newTextField
-      . toMisoString @Prelude.Text
-      $ inspectCurrencyInfo cur
-      <> " total"
+    newTextField $ inspectCurrencyInfo cur <> " total"
   addr1 <-
     maybe
       ( pure Nothing
       )
       ( fmap (Just . (& #fieldPairValue . #fieldType .~ FieldTypeQrCode))
-          . newFieldPair
-            ( toMisoString @Prelude.Text
-                $ inspectCurrencyInfo cur
-                <> " address"
-            )
+          . newFieldPair (inspectCurrencyInfo cur <> " address")
           . DynamicFieldText
       )
       addr0

ghcjs/miso-widgets/src/Functora/Miso/Widgets/Currency.hs

@@ -12,7 +12,6 @@ import Functora.Miso.Prelude
 import Functora.Miso.Types
 import qualified Functora.Miso.Widgets.Field as Field
 import Functora.Money hiding (Currency, Money, Text)
-import qualified Functora.Prelude as Prelude
 import qualified Material.Button as Button
 import qualified Material.Dialog as Dialog
 import qualified Material.LayoutGrid as LayoutGrid
@@ -58,7 +57,6 @@ selectCurrency
                   ]
                 $ Button.config
             )
-            . toMisoString @Prelude.Text
             . inspectCurrencyInfo
             $ fromMaybe
               (CurrencyInfo (CurrencyCode "XXX") mempty)
@@ -153,9 +151,7 @@ currencyListWidget
       newFuzz cur =
         Fuzzy.Fuzzy
           { Fuzzy.original = cur,
-            Fuzzy.rendered =
-              toMisoString @Prelude.Text
-                $ inspectCurrencyInfo cur,
+            Fuzzy.rendered = inspectCurrencyInfo cur,
             Fuzzy.score = 0
           }
       search =
@@ -182,8 +178,7 @@ currencyListWidget
                 )
                 "<b>"
                 "</b>"
-                ( toMisoString @Prelude.Text . inspectCurrencyInfo
-                )
+                inspectCurrencyInfo
                 False
 
 currencyListItemWidget ::

ghcjs/miso-widgets/src/Functora/Miso/Widgets/Money.hs

@@ -66,9 +66,8 @@ moneyViewer Args {argsModel = st, argsOptic = optic, argsAction = action} opts =
                       )
                       ( Field.defOpts
                           & #optsPlaceholder
-                          .~ toMisoString @Prelude.Text
-                            ( inspectCurrencyInfo
-                                $ money
+                          .~ inspectCurrencyInfo
+                            ( money
                                 ^. #moneyCurrency
                                 . #currencyOutput
                             )

prv

@@ -123,7 +123,10 @@ common pkg-prelude
     , with-utf8
 
   if ((impl(ghcjs) || arch(javascript)) || os(wasi))
-    build-depends: ghcjs-base
+    build-depends:
+      , aeson
+      , jsaddle
+      , miso
 
 common pkg-qr
   import:         pkg
@@ -206,7 +209,6 @@ common pkg-money
     , cfg
     , tags
     , template-haskell
-    , text
 
 common pkg-rates
   import:         pkg
@@ -258,7 +260,6 @@ common pkg-bolt11
     , binary
     , bitcoin-address
     , bytestring
-    , text
 
 library
   import:          pkg-prelude

pub/functora/functora.cabal

@@ -20,7 +20,6 @@ module Functora.Bolt11
     Bolt11Hrp (..),
     Bolt11Sig (..),
     Bolt11 (..),
-    inspectW5,
     decodeBolt11,
   )
 where
@@ -40,7 +39,6 @@ import qualified Data.ByteString as BS
 import qualified Data.ByteString.Base16 as B16
 import qualified Data.ByteString.Builder as BS
 import qualified Data.ByteString.Lazy.Char8 as BL
-import qualified Data.Text.Lazy as TL
 import Functora.Prelude hiding (error)
 import Prelude (Show (..), error)
 
@@ -50,11 +48,9 @@ newtype Hex = Hex
   deriving stock (Eq, Ord, Data, Generic)
 
 instance Show Hex where
-  show =
-    from @TL.Text @String
-      . inspectHex
+  show = inspectHex @String
 
-inspectHex :: Hex -> TL.Text
+inspectHex :: (Textual a) => Hex -> a
 inspectHex =
   decodeUtf8
     . BS.toLazyByteString
@@ -82,7 +78,7 @@ instance IsString Hex where
 data Tag
   = PaymentHash Hex
   | PaymentSecret Hex
-  | Description Text
+  | Description Unicode
   | AdditionalMetadata [Word5]
   | PayeePubkey Hex
   | DescriptionHash Hex
@@ -208,18 +204,18 @@ data Route = Route
 instance A.ToJSON Route where
   toJSON x =
     A.object
-      [ "pubkey" A..= inspectHex (routePubKey x),
-        "short_channel_id" A..= inspectHex (routeShortChanId x),
+      [ "pubkey" A..= inspectHex @String (routePubKey x),
+        "short_channel_id" A..= inspectHex @String (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 (routePubKey x)
+      A..= inspectHex @String (routePubKey x)
         <> "short_channel_id"
-      A..= inspectHex (routeShortChanId x)
+      A..= inspectHex @String (routeShortChanId x)
         <> "fee_base_msat"
       A..= routeFeeBaseMsat x
         <> "fee_proportional_millionths"
@@ -284,7 +280,7 @@ data Bolt11HrpAmt = Bolt11HrpAmt
   }
   deriving stock (Eq, Ord, Show, Data, Generic)
 
-inspectBolt11HrpAmt :: (IsString a, Semigroup a) => Bolt11HrpAmt -> a
+inspectBolt11HrpAmt :: forall a. (Textual a) => Bolt11HrpAmt -> a
 inspectBolt11HrpAmt (Bolt11HrpAmt amt mul) =
   if sat > 1_000_000
     then inspectBolt11HrpAmt' btc <> " BTC"
@@ -302,9 +298,9 @@ inspectBolt11HrpAmt (Bolt11HrpAmt amt mul) =
 
 inspectBolt11HrpAmt' ::
   forall a b.
-  ( IsString a,
-    From b Integer,
-    Integral b
+  ( Textual a,
+    Integral b,
+    From b Integer
   ) =>
   Ratio b ->
   a
@@ -390,9 +386,9 @@ w5hex :: [Word5] -> Either String Hex
 w5hex =
   second Hex . w5bs
 
-w5txt :: [Word5] -> Either String Text
+w5txt :: [Word5] -> Either String Unicode
 w5txt =
-  first displayException . decodeUtf8' <=< w5bs
+  first displayException . decodeUtf8Strict <=< w5bs
 
 w5int :: [Word5] -> Int
 w5int bytes = foldl' decodeInt 0 (zip [0 ..] (take 7 (reverse bytes)))
@@ -430,13 +426,6 @@ w5addr net (v0 : rest) =
   where
     cfg = networkSettings net
 
-inspectW5 :: forall a. (From Text a) => [Word5] -> a
-inspectW5 ws =
-  from @Text @a
-    . either (const . inspect $ fmap fromEnum ws) id
-    $ w5txt ws
-    <|> fmap inspect (w5bs ws)
-
 parseTag :: Network -> [Word5] -> (Maybe Tag, [Word5])
 parseTag _ [] = (Nothing, [])
 parseTag _ ws@[_] = (Nothing, ws)

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

@@ -133,7 +133,9 @@ common pkg
     , with-utf8
 
   if (impl(ghcjs) || arch(javascript))
-    build-depends: ghcjs-base
+    build-depends:
+      , ghcjs-base
+      , miso
 
   if os(wasi)
     build-depends:

pub/functora/src/functora-ghcjs.cabal

@@ -34,12 +34,10 @@ module Functora.Money
 where
 
 import qualified Data.Aeson.Combinators.Decode as A
-import qualified Data.Text as T
 import Functora.Cfg
 import Functora.MoneySing as X
 import Functora.Prelude
 import Functora.Tags as X
-import qualified Language.Haskell.TH.Syntax as TH
 
 type IntRep tags = IntRepFamily (GetTag SignedOrUnsigned tags)
 
@@ -305,32 +303,30 @@ unJsonUnsignedMoneyGOL =
   newUnsignedMoneyGOL @tags <$> unJsonRational
 
 newtype CurrencyCode = CurrencyCode
-  { unCurrencyCode :: Text
+  { unCurrencyCode :: Unicode
   }
-  deriving stock (Eq, Ord, Show, Read, Data, Generic, TH.Lift)
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
   deriving newtype (Binary, FromJSON, FromJSONKey, ToJSON, ToJSONKey)
 
-inspectCurrencyCode :: forall a. (From Text a) => CurrencyCode -> a
+inspectCurrencyCode :: CurrencyCode -> Unicode
 inspectCurrencyCode =
-  from @Text @a
-    . T.strip
+  strip
     . unCurrencyCode
 
 data CurrencyInfo = CurrencyInfo
   { currencyInfoCode :: CurrencyCode,
-    currencyInfoText :: Text
+    currencyInfoText :: Unicode
   }
-  deriving stock (Eq, Ord, Show, Read, Data, Generic, TH.Lift)
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
   deriving (Binary, FromJSON, ToJSON) via GenericType CurrencyInfo
 
-inspectCurrencyInfo :: forall a. (From Text a) => CurrencyInfo -> a
+inspectCurrencyInfo :: CurrencyInfo -> Unicode
 inspectCurrencyInfo input =
-  from @Text @a
-    $ if null info
-      then code
-      else code <> " - " <> info
+  if null info
+    then code
+    else code <> " - " <> info
   where
-    info = T.strip $ currencyInfoText input
+    info = strip $ currencyInfoText input
     code = inspectCurrencyCode $ currencyInfoCode input
 
 --