Split Lib module into Server and Codegen

Author: juanedi

app/Main.hs

@@ -1,13 +1,14 @@
 module Main where
 
-import qualified Lib
+import qualified Codegen
+import qualified Server
 import qualified System.Environment
 import qualified System.Exit
 
 main :: IO ()
 main = do
   args <- System.Environment.getArgs
   case args of
-    ["--server"] -> Lib.runServer
-    ["--codegen"] -> Lib.runCodegen
+    ["--server"] -> Server.run
+    ["--codegen"] -> Codegen.run
     _ -> System.Exit.die "Invalid arguments!"

src/Codegen.hs

@@ -0,0 +1,30 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Codegen (run) where
+
+import Elm.Derive (constructorTagModifier, defaultOptions, deriveBoth)
+import qualified Game
+import Servant.Elm (DefineElm (DefineElm), Proxy (Proxy), defElmImports, defElmOptions, generateElmModuleWith)
+import Server (APIRoutes)
+import System.Process (createProcess, cwd, proc)
+
+run :: IO ()
+run =
+  let outputDir = "./ui/generated"
+   in do
+        putStrLn "Deleting old generated code..."
+        putStrLn "Generating Elm code from API..."
+        generateElmModuleWith
+          defElmOptions
+          ["Api"]
+          defElmImports
+          outputDir
+          [ DefineElm (Proxy :: Proxy Game.State),
+            DefineElm (Proxy :: Proxy Game.Country)
+          ]
+          (Proxy :: Proxy APIRoutes)
+        putStrLn "Formatting generated code using elm-format..."
+        createProcess (proc "elm-format" ["Api.elm", "--yes"]) {cwd = Just outputDir}
+        putStrLn "Done!"

src/Lib.hs src/Server.hs

@@ -2,10 +2,9 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeOperators #-}
 
-module Lib
-  ( runServer,
-    runCodegen,
-    app,
+module Server
+  ( Server.run,
+    APIRoutes,
   )
 where
 
@@ -16,20 +15,20 @@ import Network.Wai
 import Network.Wai.Handler.Warp
 import Network.Wai.Logger (withStdoutLogger)
 import Servant
-import Servant.Elm (DefineElm (DefineElm), Proxy (Proxy), defElmImports, defElmOptions, generateElmModuleWith)
 import System.Environment (lookupEnv)
-import qualified System.Process
-import System.Process (cwd, proc)
 
 type APIRoutes = "game" :> Get '[JSON] Game.State
 
+deriveBoth defaultOptions {constructorTagModifier = Game.tagToApiLabel} ''Game.Country
+deriveBoth defaultOptions ''Game.State
+
 type Routes =
   APIRoutes
     :<|> "_build" :> Raw
     :<|> Raw
 
-runServer :: IO ()
-runServer = do
+run :: IO ()
+run = do
   maybePort <- lookupEnv "PORT"
   let port = fromMaybe 8080 (fmap read maybePort)
   withStdoutLogger $ \logger -> do
@@ -51,25 +50,3 @@ server =
   return Game.new
     :<|> serveDirectoryWebApp "ui/_build"
     :<|> serveDirectoryFileServer "ui/static"
-
-deriveBoth defaultOptions {constructorTagModifier = Game.tagToApiLabel} ''Game.Country
-deriveBoth defaultOptions ''Game.State
-
-runCodegen :: IO ()
-runCodegen =
-  let outputDir = "./ui/generated"
-   in do
-        putStrLn "Deleting old generated code..."
-        putStrLn "Generating Elm code from API..."
-        generateElmModuleWith
-          defElmOptions
-          ["Api"]
-          defElmImports
-          outputDir
-          [ DefineElm (Proxy :: Proxy Game.State),
-            DefineElm (Proxy :: Proxy Game.Country)
-          ]
-          (Proxy :: Proxy APIRoutes)
-        putStrLn "Formatting generated code using elm-format..."
-        System.Process.createProcess (proc "elm-format" ["Api.elm", "--yes"]) {cwd = Just outputDir}
-        putStrLn "Done!"

teg.cabal

@@ -15,7 +15,8 @@ cabal-version:       >=1.10
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Lib,
+  exposed-modules:     Codegen,
+                       Server,
                        Game
   build-depends:       base >= 4.7 && < 5
                      , aeson