get rid of most of utils.errors

f-o-a-m · Sep 20, 2023 · 38f7398 · 38f7398
1 parent fc71a51
commit 38f7398
Show file tree

Hide file tree

Showing 18 changed files with 409 additions and 521 deletions.
diff --git a/spago.dhall b/spago.dhall
@@ -17,13 +17,15 @@ You can edit this file as you like.
   , "datetime"
   , "effect"
   , "either"
+  , "errors"
   , "eth-core"
   , "exceptions"
   , "foldable-traversable"
   , "foreign-object"
   , "functors"
   , "identity"
   , "integers"
+  , "js-date"
   , "logging"
   , "maybe"
   , "mkdirp"
@@ -33,6 +35,7 @@ You can edit this file as you like.
   , "node-fs-aff"
   , "node-path"
   , "node-process"
+  , "now"
   , "optparse"
   , "ordered-collections"
   , "parallel"

diff --git a/src/Chanterelle.purs b/src/Chanterelle.purs
@@ -2,17 +2,16 @@ module Chanterelle where
 
 import Prelude
 
+import Chanterelle.Compile (compile) as Chanterelle
 import Chanterelle.Deploy (deploy)
 import Chanterelle.Internal.Codegen (generatePS) as Chanterelle
-import Chanterelle.Internal.Compile (compile) as Chanterelle
 import Chanterelle.Logging (LogLevel(..), log, logCompileError, readLogLevel, setLogLevel)
+import Chanterelle.Project (loadProject)
+import Chanterelle.Types.Compile (runCompileM)
 import Chanterelle.Types.Deploy (DeployM)
-import Chanterelle.Types.Compile (runCompileMExceptT)
 import Chanterelle.Types.Project (ChanterelleProject)
-import Chanterelle.Internal.Utils (eitherM_)
-import Chanterelle.Project (loadProject)
 import Control.Monad.Error.Class (try)
-import Data.Either (Either(..))
+import Data.Either (Either(..), either)
 import Data.Generic.Rep (class Generic)
 import Data.Show.Generic (genericShow)
 import Effect.Aff (Aff)
@@ -45,7 +44,7 @@ data CommonOpts = CommonOpts
   }
 
 derive instance Generic CommonOpts _
-instance showCommonOpts :: Show CommonOpts where
+instance Show CommonOpts where
   show = genericShow
 
 data Command s
@@ -56,7 +55,7 @@ data Command s
   | GlobalDeploy (DeployOptions s)
 
 derive instance Generic (Command s) _
-instance showCommand :: Show (DeployOptions s) => Show (Command s) where
+instance Show (DeployOptions s) => Show (Command s) where
   show = genericShow
 
 traverseDeployOptions :: forall a b f. Applicative f => (DeployOptions a -> f (DeployOptions b)) -> Args' a -> f (Args' b)
@@ -104,7 +103,11 @@ runCommand project = case _ of
     log Error $ "deploy is unavailable as Chanterelle is running from a global installation"
     log Error $ "Please ensure your project's Chanterelle instance has compiled"
   -- doClassicBuild = doCompile *> doCodegen
-  doCompile = eitherM_ terminateOnCompileError $ runCompileMExceptT Chanterelle.compile project
-  doCodegen = eitherM_ terminateOnCompileError $ runCompileMExceptT Chanterelle.generatePS project
+  doCompile = do
+    eRes <- runCompileM Chanterelle.compile project
+    either terminateOnCompileError mempty eRes
+  doCodegen = do
+    eRes <- runCompileM Chanterelle.generatePS project
+    either terminateOnCompileError mempty eRes
 
   terminateOnCompileError e = logCompileError e *> liftEffect (exit 1)
diff --git a/src/Chanterelle/Internal/Artifact.purs → src/Chanterelle/Artifact.purs b/src/Chanterelle/Internal/Artifact.purs → src/Chanterelle/Artifact.purs
@@ -1,4 +1,4 @@
-module Chanterelle.Internal.Artifact
+module Chanterelle.Artifact
   ( readArtifact
   , updateArtifact
   , writeArtifact
@@ -7,8 +7,7 @@ module Chanterelle.Internal.Artifact
 import Prelude
 
 import Chanterelle.Types.Artifact (Artifact(..))
-import Chanterelle.Internal.Utils.FS (readTextFile, withTextFile, writeTextFile)
-import Chanterelle.Internal.Utils.Json (jsonStringifyWithSpaces, parseDecodeM)
+import Chanterelle.Utils (jsonStringifyWithSpaces, parseDecodeM, readTextFile, withTextFile, writeTextFile)
 import Control.Monad.Error.Class (class MonadThrow)
 import Data.Argonaut (encodeJson)
 import Data.DateTime.Instant (unInstant)

diff --git a/src/Chanterelle/Internal/Codegen.purs → src/Chanterelle/Codegen.purs b/src/Chanterelle/Internal/Codegen.purs → src/Chanterelle/Codegen.purs
@@ -7,7 +7,7 @@ import Prelude
 import Chanterelle.Logging (LogLevel(..), log)
 import Chanterelle.Types.Compile (CompileError(..))
 import Chanterelle.Types.Project (ChanterelleProject(..), ChanterelleProjectSpec(..), ChanterelleModule(..))
-import Chanterelle.Internal.Utils.FS (assertDirectory')
+import Chanterelle.Utils (assertDirectory')
 import Control.Monad.Error.Class (class MonadThrow, throwError)
 import Control.Monad.Reader (class MonadAsk, ask)
 import Data.AbiParser (Abi(Abi), AbiDecodeError(..), AbiWithErrors) as PSWeb3Gen

diff --git a/src/Chanterelle/Internal/Compile.purs → src/Chanterelle/Compile.purs b/src/Chanterelle/Internal/Compile.purs → src/Chanterelle/Compile.purs
@@ -1,4 +1,4 @@
-module Chanterelle.Internal.Compile
+module Chanterelle.Compile
   ( compile
   , makeSolcInput
   , compileModuleWithoutWriting
@@ -8,14 +8,14 @@ module Chanterelle.Internal.Compile
 
 import Prelude
 
-import Chanterelle.Internal.Artifact (writeArtifact)
-import Chanterelle.Internal.Utils.Error (withExcept', withExceptM', withExceptT')
-import Chanterelle.Internal.Utils.FS (assertDirectory', fileIsDirty)
+import Chanterelle.Artifact (writeArtifact)
 import Chanterelle.Logging (LogLevel(..), log, logSolcError)
 import Chanterelle.Types.Artifact (Artifact(..))
 import Chanterelle.Types.Bytecode (Bytecode(..), flattenLinkReferences)
 import Chanterelle.Types.Compile (CompileError(..))
 import Chanterelle.Types.Project (ChanterelleModule(..), ChanterelleProject(..), ChanterelleProjectSpec(..), Dependency(..), getSolc, partitionSelectionSpecs)
+import Chanterelle.Utils (assertDirectory', fileIsDirty)
+import Chanterelle.Utils.Error (withExceptT')
 import Control.Error.Util (note)
 import Control.Monad.Error.Class (class MonadThrow, throwError)
 import Control.Monad.Reader (class MonadAsk, ask)
@@ -24,7 +24,7 @@ import Data.Argonaut as A
 import Data.Argonaut.Parser as AP
 import Data.Array (catMaybes, partition)
 import Data.Bifunctor (lmap)
-import Data.Either (Either(..), hush)
+import Data.Either (Either(..), either, hush)
 import Data.Lens ((^?))
 import Data.Lens.Index (ix)
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
@@ -113,7 +113,9 @@ compileModuleWithoutWriting
   -> m ST.CompilerOutput
 compileModuleWithoutWriting m@(ChanterelleModule mod) solcInput = do
   (ChanterelleProject project) <- ask
-  solc <- withExceptM' CompilerUnavailable $ getSolc project.solc
+  solc <- do
+    eRes <- getSolc project.solc
+    either (throwError <<< CompilerUnavailable) pure eRes
   log Info ("compiling " <> show mod.moduleType <> " " <> mod.moduleName)
   output <- Solc.compile solc solcInput (loadSolcCallback m project.root project.spec) --liftEffect $ runFn2 _compile (A.stringify $ encodeJson solcInput) (loadSolcCallback m project.root project.spec)
   case output of
@@ -243,7 +245,8 @@ resolveSolidityContractLevelOutput
    . MonadThrow CompileError m
   => ST.ContractLevelOutput
   -> m Artifact
-resolveSolidityContractLevelOutput = withExcept' UnexpectedSolcOutput <<< fromSolidityContractLevelOutput
+resolveSolidityContractLevelOutput a =
+  either (throwError <<< UnexpectedSolcOutput) pure $ fromSolidityContractLevelOutput a
   where
 
   fromSolidityBytecodeOutput :: ST.BytecodeOutput -> Either String Bytecode