can use uuid with ghcjs

Author: functora

ghcjs/currency-converter/.gitignore

@@ -4,3 +4,4 @@ dist-newstyle
 node_modules
 dist
 android
+capacitor-geckoview/capacitor/build

ghcjs/currency-converter/Main.hs

@@ -82,7 +82,8 @@ data TopOrBottom
   deriving stock (Eq, Ord, Show, Read, Enum, Bounded, Data, Generic)
 
 data ModelMoney = ModelMoney
-  { modelMoneyAmountInput :: Text,
+  { modelMoneyAmountUuid :: UUID,
+    modelMoneyAmountInput :: Text,
     modelMoneyAmountOutput :: Money (Tags 'Signed |+| 'MoneyAmount),
     modelMoneyCurrencyInfo :: CurrencyInfo,
     modelMoneyCurrencyOpen :: Bool,
@@ -97,12 +98,14 @@ data ModelData = ModelData
   }
   deriving stock (Eq, Ord, Show, Read, Data, Generic)
 
-mkModel :: (MonadThrow m, MonadUnliftIO m) => m Model
-mkModel = do
+newModel :: (MonadThrow m, MonadUnliftIO m) => m Model
+newModel = do
   ct <- getCurrentTime
   prod <- liftIO newBroadcastTChanIO
   cons <- liftIO . atomically $ dupTChan prod
   market <- newMarket
+  topUuid <- newUuid
+  bottomUuid <- newUuid
   let btc =
         CurrencyInfo
           { currencyInfoCode = CurrencyCode "btc",
@@ -118,15 +121,17 @@ mkModel = do
         ModelData
           { modelDataTopMoney =
               ModelMoney
-                { modelMoneyAmountInput = inspectMoneyAmount zero,
+                { modelMoneyAmountUuid = topUuid,
+                  modelMoneyAmountInput = inspectMoneyAmount zero,
                   modelMoneyAmountOutput = zero,
                   modelMoneyCurrencyInfo = btc,
                   modelMoneyCurrencyOpen = False,
                   modelMoneyCurrencySearch = mempty
                 },
             modelDataBottomMoney =
               ModelMoney
-                { modelMoneyAmountInput = inspectMoneyAmount zero,
+                { modelMoneyAmountUuid = bottomUuid,
+                  modelMoneyAmountInput = inspectMoneyAmount zero,
                   modelMoneyAmountOutput = zero,
                   modelMoneyCurrencyInfo = usd,
                   modelMoneyCurrencyOpen = False,
@@ -167,15 +172,17 @@ mkModel = do
           ModelData
             { modelDataTopMoney =
                 ModelMoney
-                  { modelMoneyAmountInput = inspectMoneyAmount baseAmt,
+                  { modelMoneyAmountUuid = topUuid,
+                    modelMoneyAmountInput = inspectMoneyAmount baseAmt,
                     modelMoneyAmountOutput = unTag @'Base baseAmt,
                     modelMoneyCurrencyInfo = baseCur,
                     modelMoneyCurrencyOpen = False,
                     modelMoneyCurrencySearch = mempty
                   },
               modelDataBottomMoney =
                 ModelMoney
-                  { modelMoneyAmountInput = inspectMoneyAmount quoteAmt,
+                  { modelMoneyAmountUuid = bottomUuid,
+                    modelMoneyAmountInput = inspectMoneyAmount quoteAmt,
                     modelMoneyAmountOutput = unTag @'Quote quoteAmt,
                     modelMoneyCurrencyInfo = quoteCur,
                     modelMoneyCurrencyOpen = False,
@@ -231,7 +238,7 @@ extendedEvents =
 
 main :: IO ()
 main = do
-  st <- mkModel
+  st <- newModel
   runApp
     $ startApp
       App
@@ -336,7 +343,7 @@ syncInputs st =
   forM_ enumerate $ \loc -> do
     JS.eval @Text
       $ "var el = document.getElementById('"
-      <> inspect loc
+      <> htmlUuid (st ^. #modelData . getMoneyOptic loc . #modelMoneyAmountUuid)
       <> "'); if (el && !(el.getElementsByTagName('input')[0] === document.activeElement)) el.value = '"
       <> (st ^. #modelData . getMoneyOptic loc . #modelMoneyAmountInput)
       <> "';"
@@ -533,12 +540,19 @@ amountWidget st loc =
           )
         & TextField.setAttributes
           [ class_ "fill",
-            id_ $ inspect loc,
+            id_
+              . ms
+              . htmlUuid @Text
+              $ st
+              ^. #modelData
+              . getMoneyOptic loc
+              . #modelMoneyAmountUuid,
             onKeyDown onKeyDownAction,
             onBlur onBlurAction
           ]
     ]
   where
+    uuid = st ^. #modelData . getMoneyOptic loc . #modelMoneyAmountUuid
     input = st ^. #modelData . getMoneyOptic loc . #modelMoneyAmountInput
     output = st ^. #modelData . getMoneyOptic loc . #modelMoneyAmountOutput
     valid =
@@ -561,7 +575,7 @@ amountWidget st loc =
                 . void
                 . JS.eval @Text
                 $ "document.getElementById('"
-                <> inspect loc
+                <> htmlUuid uuid
                 <> "').getElementsByTagName('input')[0].blur();"
             )
             ( ChanItem 300 id
@@ -589,11 +603,11 @@ amountWidget st loc =
     onClearAction =
       PushUpdate
         ( do
-            focus $ inspect loc
+            focus . ms $ htmlUuid @Text uuid
             void
               . JS.eval @Text
               $ "var el = document.getElementById('"
-              <> inspect loc
+              <> htmlUuid uuid
               <> "'); if (el) el.value = '';"
         )
         ( ChanItem 300 $ \st' ->

ghcjs/currency-converter/android.nix

@@ -51,7 +51,7 @@ with (import ./default.nix); let
           --android --assetPath static
         ${pkgs.nodejs}/bin/npx trapeze run trapeze.yaml -y \
           --android-project android
-        printf "include ':capacitor-android'\nproject(':capacitor-android').projectDir = new File('../../../pub/capacitor-geckoview/capacitor')" > ./android/capacitor.settings.gradle
+        printf "include ':capacitor-android'\nproject(':capacitor-android').projectDir = new File('../capacitor-geckoview/capacitor')" > ./android/capacitor.settings.gradle
       )
     '';
   };

ghcjs/currency-converter/default.nix

@@ -1,9 +1,9 @@
 let
-  # functora = ../..;
-  functora = fetchTarball {
-    url = "https://github.com/functora/functora.github.io/archive/687980745c94639d3a8479363d4195b5d0c45033.tar.gz";
-    sha256 = "0rzkhwwkal0rpif4sjmp61viq0afm3d9lmlkj8vyr4fv5zk7ydjn";
-  };
+  functora = ../..;
+  # functora = fetchTarball {
+  #   url = "https://github.com/functora/functora.github.io/archive/687980745c94639d3a8479363d4195b5d0c45033.tar.gz";
+  #   sha256 = "0rzkhwwkal0rpif4sjmp61viq0afm3d9lmlkj8vyr4fv5zk7ydjn";
+  # };
   functora-miso = import "${functora}/ghcjs/miso/default.nix" {
     overlays = import ./overlays.nix {inherit functora;};
   };

ghcjs/currency-converter/overlays.nix

@@ -61,6 +61,11 @@
               ver = "0.1.1.1";
               sha256 = "EIIBNte4+s9s3lthoh1kj/qviuK+zlvBgNpKC0MmHcM=";
             } {};
+            uuid = doJailbreak (self.callHackageDirect {
+              pkg = "uuid";
+              ver = "1.3.11";
+              sha256 = "MGfh19sw6wjqknzHLgfDLet1m0pTISe7rsdl/OSwnFM=";
+            } {});
             #
             # Local
             #

pub/functora/functora.cabal

@@ -108,6 +108,7 @@ common pkg-prelude
     , unbounded-delays
     , universum
     , unliftio
+    , uuid
     , witch-mini
     , with-utf8
 

pub/functora/src/functora-ghcjs.cabal

@@ -117,6 +117,7 @@ library
     , unbounded-delays
     , universum
     , unliftio
+    , uuid
     , vector
     , witch-mini
     , with-utf8

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

@@ -69,6 +69,8 @@ module Functora.Prelude
     altM,
     altM',
     takeWhileAcc,
+    newUuid,
+    htmlUuid,
   )
 where
 
@@ -145,6 +147,9 @@ import qualified Data.Time.Clock as Clock
 import Data.Time.Clock.POSIX as X (posixSecondsToUTCTime)
 import Data.Tuple.Extra as X (uncurry3)
 import qualified Data.Typeable as Typeable
+import Data.UUID as X (UUID)
+import qualified Data.UUID as UUID
+import qualified Data.UUID.V4 as UUID
 import Functora.PreludeOrphan as X ()
 import GHC.Generics as X (Rep)
 import GHC.TypeLits as X (KnownSymbol, Symbol)
@@ -698,3 +703,9 @@ takeWhileAcc f prev (x : xs) =
   case f x prev of
     Nothing -> []
     Just next -> x : takeWhileAcc f next xs
+
+newUuid :: (MonadIO m) => m UUID
+newUuid = liftIO UUID.nextRandom
+
+htmlUuid :: forall a. (From Text a) => UUID -> a
+htmlUuid = from @Text @a . ("uuid-" <>) . UUID.toText

pub/functora/src/sql/Functora/SqlOrphan.hs

@@ -4,7 +4,6 @@
 module Functora.SqlOrphan () where
 
 import qualified Data.Data as Data
-import Data.UUID (UUID)
 import qualified Data.UUID as UUID
 import Database.Esqueleto.Legacy hiding (from)
 import Functora.Money