refactoring wip

Author: functora

ghcjs/lightning-verifier/src/App/Widgets/Fav.hs

@@ -13,7 +13,6 @@ import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.Grid as Grid
 import qualified Material.Button as Button
 import qualified Material.Dialog as Dialog
-import qualified Miso.String as MS
 
 fav :: Model -> [View Action]
 fav st =
@@ -114,8 +113,8 @@ fav st =
 
 makeFavName :: Model -> Unicode
 makeFavName =
-  MS.toUpper
-    . MS.strip
+  toUpper
+    . strip
     . (^. #modelFavName . #fieldInput . #uniqueValue)
 
 favItems :: Model -> [View Action]

ghcjs/lightning-verifier/src/Main.hs

@@ -9,7 +9,6 @@ import Network.Wai.Application.Static
 import qualified Network.Wai.Handler.Warp as Warp
 import qualified Network.WebSockets as Ws
 import qualified Data.ByteString.Lazy as BL
-import qualified Miso.String as MS
 #endif
 
 #ifdef wasi_HOST_OS
@@ -84,7 +83,7 @@ runApp app = do
           staticApp (defaultWebAppSettings "static") req
         ("site.webmanifest" : _) ->
           staticApp (defaultWebAppSettings "static") req
-        (file : _) | (MS.isSuffixOf ".js" file) && (file /= "jsaddle.js") ->
+        (file : _) | (isSuffixOf ".js" file) && (file /= "jsaddle.js") ->
           staticApp (defaultWebAppSettings "static") req
         _ ->
           JS.jsaddleAppWithJs (JS.jsaddleJs False <> js) req

ghcjs/lightning-verifier/test/App/TypesSpec.hs

@@ -31,7 +31,7 @@ fun = \case
 spec :: Spec
 spec = do
   prop "Identity/JSON" $ \txt -> do
-    let wrap :: Identity MisoString = Identity txt
+    let wrap :: Identity Unicode = Identity txt
     let txtJson = A.encode txt
     let wrapJson = A.encode wrap
     wrap ^. #runIdentity `shouldBe` txt

ghcjs/miso-widgets/src/Functora/Miso/Jsm/Generic.hs

@@ -17,7 +17,6 @@ where
 import qualified Data.ByteString.Lazy as BL
 import Functora.Miso.Prelude
 import qualified Language.Javascript.JSaddle as JS
-import qualified Miso.String as MS
 import qualified Text.URI as URI
 import qualified Prelude
 import qualified Prelude ((!!))
@@ -123,15 +122,11 @@ selectStorage key after =
 
 selectBarcode :: (Maybe Unicode -> JSM ()) -> JSM ()
 selectBarcode after =
-  genericPromise "selectBarcode" Nothing
-    $ after
-    . fmap MS.strip
+  genericPromise "selectBarcode" Nothing $ after . fmap strip
 
 selectClipboard :: (Maybe Unicode -> JSM ()) -> JSM ()
 selectClipboard after =
-  genericPromise "selectClipboard" Nothing
-    $ after
-    . fmap MS.strip
+  genericPromise "selectClipboard" Nothing $ after . fmap strip
 
 genericPromise ::
   Unicode ->

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

@@ -870,7 +870,7 @@ genericFieldViewer args widget =
     allowCopy =
       opts ^. #fieldOptsAllowCopy
     allowTrunc =
-      maybe False (MS.length input >) $ opts ^. #fieldOptsTruncateLimit
+      maybe False (length input >) $ opts ^. #fieldOptsTruncateLimit
     stateTrunc =
       fromMaybe Closed $ opts ^. #fieldOptsTruncateState
     extraWidgets =
@@ -939,7 +939,7 @@ truncateFieldInput ::
   Unicode
 truncateFieldInput True Closed limit full =
   let half = fromMaybe defTruncateLimit limit `div` 2
-   in MS.take half full
+   in take half full
         <> "..."
         <> MS.takeEnd half full
 truncateFieldInput _ _ _ full =

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

@@ -231,7 +231,6 @@ import Data.Sequences as X hiding
     sortOn,
     splitAt,
     subsequences,
-    take,
     takeWhile,
     uncons,
   )
@@ -306,6 +305,7 @@ import Universum as X hiding
     state,
     swap,
     tails,
+    take,
     throwM,
     toStrict,
     try,