Split pure WASI code into wasi-lib

Author: palas

cardano-wasm/app/Main.hs

@@ -1,8 +1,8 @@
 module Main where
 
-import Cardano.Wasm.Internal.Api.Info (apiInfo)
-import Cardano.Wasm.Internal.Api.InfoToTypeScript (apiInfoToTypeScriptFile)
-import Cardano.Wasm.Internal.Api.TypeScriptDefs (writeTypeScriptToDir)
+import Cardano.Wasm.Api.Info (apiInfo)
+import Cardano.Wasm.Api.InfoToTypeScript (apiInfoToTypeScriptFile)
+import Cardano.Wasm.Api.TypeScriptDefs (writeTypeScriptToDir)
 
 import Options.Applicative
 

cardano-wasm/cardano-wasm.cabal

@@ -24,32 +24,22 @@ common project-config
     -Wredundant-constraints
     -Wunused-packages
 
-executable cardano-wasm
+library cardano-wasi-lib
   import: project-config
-  main-is: Main.hs
   hs-source-dirs:
-    app
-    src
+    src-lib
 
-  default-language: Haskell2010
+  exposed-modules:
+    Cardano.Wasm.Api.GRPC
+    Cardano.Wasm.Api.Info
+    Cardano.Wasm.Api.InfoToTypeScript
+    Cardano.Wasm.Api.Tx
+    Cardano.Wasm.Api.TypeScriptDefs
+    Cardano.Wasm.Api.Wallet
+    Cardano.Wasm.ExceptionHandling
 
-  if arch(wasm32)
-    ghc-options:
-      -no-hs-main
-      -optl-mexec-model=reactor
-      "-optl-Wl,--strip-all"
   other-modules:
-    Cardano.Wasm.Internal.Api.GRPC
-    Cardano.Wasm.Internal.Api.Info
-    Cardano.Wasm.Internal.Api.InfoToTypeScript
     Cardano.Wasm.Internal.Api.Random
-    Cardano.Wasm.Internal.Api.Tx
-    Cardano.Wasm.Internal.Api.TypeScriptDefs
-    Cardano.Wasm.Internal.Api.Wallet
-    Cardano.Wasm.Internal.ExceptionHandling
-    Cardano.Wasm.Internal.JavaScript.Bridge
-    Cardano.Wasm.Internal.JavaScript.GRPC
-    Cardano.Wasm.Internal.JavaScript.GRPCTypes
 
   build-depends:
     aeson,
@@ -66,18 +56,67 @@ executable cardano-wasm
     exceptions,
     filepath,
     microlens,
-    optparse-applicative,
     text,
 
   if arch(wasm32)
     build-depends:
-      base16-bytestring,
-      ghc-experimental,
-      utf8-string,
+      base16-bytestring
   else
     build-depends:
       crypton
 
+executable cardano-wasi
+  import: project-config
+  main-is: Main.hs
+  hs-source-dirs:
+    app
+    src-wasi
+
+  default-language: Haskell2010
+
+  if arch(wasm32)
+    ghc-options:
+      -no-hs-main
+      -optl-mexec-model=reactor
+      "-optl-Wl,--strip-all"
+  other-modules:
+  build-depends:
+    base,
+    cardano-wasm:cardano-wasi-lib,
+    optparse-applicative,
+
+executable cardano-wasm
+  import: project-config
+  main-is: Main.hs
+  hs-source-dirs:
+    app
+    src-wasm
+
+  default-language: Haskell2010
+
+  if arch(wasm32)
+    ghc-options:
+      -no-hs-main
+      -optl-mexec-model=reactor
+      "-optl-Wl,--strip-all"
+  other-modules:
+    Cardano.Wasm.Internal.JavaScript.Bridge
+    Cardano.Wasm.Internal.JavaScript.GRPC
+    Cardano.Wasm.Internal.JavaScript.GRPCTypes
+
+  build-depends:
+    base,
+    cardano-wasm:cardano-wasi-lib,
+    optparse-applicative,
+
+  if arch(wasm32)
+    build-depends:
+      aeson,
+      cardano-api,
+      ghc-experimental,
+      text,
+      utf8-string,
+
 test-suite cardano-wasm-golden
   type: exitcode-stdio-1.0
   main-is: cardano-wasm-golden.hs

cardano-wasm/src/Cardano/Wasm/Internal/Api/GRPC.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/Api/GRPC.hs

@@ -1,7 +1,7 @@
-module Cardano.Wasm.Internal.Api.GRPC where
+module Cardano.Wasm.Api.GRPC where
 
-import Cardano.Wasm.Internal.Api.Tx qualified as Wasm
-import Cardano.Wasm.Internal.ExceptionHandling (rightOrError, toMonadFail)
+import Cardano.Wasm.Api.Tx qualified as Wasm
+import Cardano.Wasm.ExceptionHandling (rightOrError, toMonadFail)
 
 import Data.ByteString.Base16 qualified as Base16
 import Data.ByteString.Base64 qualified as Base64

cardano-wasm/src/Cardano/Wasm/Internal/Api/Info.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/Api/Info.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE InstanceSigs #-}
 
-module Cardano.Wasm.Internal.Api.Info
+module Cardano.Wasm.Api.Info
   ( apiInfo
   , ApiInfo (..)
   , VirtualObjectInfo (..)
@@ -14,7 +14,7 @@ where
 
 import Cardano.Api (pretty)
 
-import Cardano.Wasm.Internal.Api.Tx (UnsignedTxObject (..), newExperimentalEraTxImpl, newTxImpl)
+import Cardano.Wasm.Api.Tx (UnsignedTxObject (..), newExperimentalEraTxImpl, newTxImpl)
 
 import Data.Aeson qualified as Aeson
 import Data.Text qualified as Text

cardano-wasm/src/Cardano/Wasm/Internal/Api/InfoToTypeScript.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/Api/InfoToTypeScript.hs

@@ -1,8 +1,8 @@
-module Cardano.Wasm.Internal.Api.InfoToTypeScript where
+module Cardano.Wasm.Api.InfoToTypeScript where
 
-import Cardano.Wasm.Internal.Api.Info (tsTypeAsString)
-import Cardano.Wasm.Internal.Api.Info qualified as Info
-import Cardano.Wasm.Internal.Api.TypeScriptDefs qualified as TypeScript
+import Cardano.Wasm.Api.Info (tsTypeAsString)
+import Cardano.Wasm.Api.Info qualified as Info
+import Cardano.Wasm.Api.TypeScriptDefs qualified as TypeScript
 
 import Data.List (nub)
 import Data.Map (Map)

cardano-wasm/src/Cardano/Wasm/Internal/Api/Tx.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/Api/Tx.hs

@@ -7,7 +7,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeFamilies #-}
 
-module Cardano.Wasm.Internal.Api.Tx
+module Cardano.Wasm.Api.Tx
   ( UnsignedTxObject (..)
   , ProtocolParamsJSON (..)
   , newTxImpl
@@ -32,7 +32,7 @@ import Cardano.Api.Plutus qualified as Shelley
 import Cardano.Api.Tx qualified as TxBody
 
 import Cardano.Ledger.Api qualified as Ledger
-import Cardano.Wasm.Internal.ExceptionHandling (justOrError, rightOrError, throwError, toMonadFail)
+import Cardano.Wasm.ExceptionHandling (justOrError, rightOrError, throwError, toMonadFail)
 
 import Control.Monad.Catch (MonadThrow)
 import Data.Aeson (ToJSON (toJSON), (.=))

cardano-wasm/src/Cardano/Wasm/Internal/Api/TypeScriptDefs.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/Api/TypeScriptDefs.hs

@@ -11,7 +11,7 @@
 -- data types and servant HTTP APIs respectively. And other libraries
 -- that align with our needs, like `language-typescript`, are not
 -- actively maintained.
-module Cardano.Wasm.Internal.Api.TypeScriptDefs where
+module Cardano.Wasm.Api.TypeScriptDefs where
 
 import Data.List.NonEmpty qualified as LNE
 import Data.Text.Lazy qualified as TL

cardano-wasm/src/Cardano/Wasm/Internal/Api/Wallet.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/Api/Wallet.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 
-module Cardano.Wasm.Internal.Api.Wallet
+module Cardano.Wasm.Api.Wallet
   ( WalletObject (..)
   , generatePaymentWalletImpl
   , restorePaymentWalletFromSigningKeyBech32Impl
@@ -38,8 +38,8 @@ import Cardano.Api
   )
 
 import Cardano.Crypto.Seed (mkSeedFromBytes)
+import Cardano.Wasm.ExceptionHandling (rightOrError, toMonadFail)
 import Cardano.Wasm.Internal.Api.Random (getRandomBytes)
-import Cardano.Wasm.Internal.ExceptionHandling (rightOrError, toMonadFail)
 
 import Data.Aeson ((.=))
 import Data.Aeson qualified as Aeson

cardano-wasm/src/Cardano/Wasm/Internal/ExceptionHandling.hs renamed to cardano-wasm/src-lib/Cardano/Wasm/ExceptionHandling.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE InstanceSigs #-}
 
-module Cardano.Wasm.Internal.ExceptionHandling where
+module Cardano.Wasm.ExceptionHandling where
 
 import Control.Exception (Exception, displayException)
 import Control.Monad.Catch (MonadThrow (..))