From 5c08c145a58064144b13ddc2b53d35b53fffde56 Mon Sep 17 00:00:00 2001
From: Joshua Clayton <joshua.clayton@gmail.com>
Date: Tue, 2 May 2017 10:25:59 -0700
Subject: [PATCH] Extract app types

---
 app/App.hs   | 49 +++++++++++--------------------------------------
 app/Main.hs  |  3 ++-
 app/Types.hs | 43 +++++++++++++++++++++++++++++++++++++++++++
 unused.cabal |  1 +
 4 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 app/Types.hs

diff --git a/app/App.hs b/app/App.hs
index 5c40739..1c60ad4 100644
--- a/app/App.hs
+++ b/app/App.hs
@@ -1,53 +1,27 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 
 module App
-    ( Options(..)
-    , runProgram
+    ( runProgram
     ) where
 
-import           Control.Monad.Except (ExceptT, MonadError, runExceptT, throwError)
-import           Control.Monad.Reader (ReaderT, MonadReader, MonadIO, runReaderT, asks, liftIO)
+import           Control.Monad.Except (runExceptT, throwError)
+import           Control.Monad.Reader (runReaderT, asks, liftIO)
 import qualified Data.Bifunctor as BF
 import qualified Data.Bool as B
 import qualified Data.Maybe as M
+import           Types
 import           Unused.Aliases (termsAndAliases)
 import           Unused.CLI (SearchRunner(..), loadGitContext, renderHeader, executeSearch, withRuntime)
 import qualified Unused.CLI.Views as V
-import           Unused.Cache (FingerprintOutcome(..), cached)
+import           Unused.Cache (cached)
 import           Unused.Grouping (CurrentGrouping(..), groupedResponses)
 import           Unused.Parser (parseResults)
 import           Unused.ResponseFilter (withOneOccurrence, withLikelihoods, ignoringPaths)
-import           Unused.ResultsClassifier (ParseConfigError, LanguageConfiguration(..), loadAllConfigurations)
-import           Unused.TagsSource (TagSearchOutcome, loadTagsFromFile, loadTagsFromPipe)
+import           Unused.ResultsClassifier (LanguageConfiguration(..), loadAllConfigurations)
+import           Unused.TagsSource (loadTagsFromFile, loadTagsFromPipe)
 import           Unused.TermSearch (SearchResults(..), SearchBackend(..), SearchTerm, fromResults)
 import           Unused.Types (TermMatchSet, RemovalLikelihood(..))
 
-type AppConfig = MonadReader Options
-
-data AppError
-    = TagError TagSearchOutcome
-    | InvalidConfigError [ParseConfigError]
-    | CacheError FingerprintOutcome
-
-newtype App a = App {
-    runApp :: ReaderT Options (ExceptT AppError IO) a
-} deriving (Monad, Functor, Applicative, AppConfig, MonadError AppError, MonadIO)
-
-data Options = Options
-    { oSearchRunner :: SearchRunner
-    , oSingleOccurrenceMatches :: Bool
-    , oLikelihoods :: [RemovalLikelihood]
-    , oAllLikelihoods :: Bool
-    , oIgnoredPaths :: [String]
-    , oGrouping :: CurrentGrouping
-    , oWithoutCache :: Bool
-    , oFromStdIn :: Bool
-    , oCommitCount :: Maybe Int
-    , oSearchBackend :: SearchBackend
-    }
-
 runProgram :: Options -> IO ()
 runProgram options = withRuntime $
     either renderError return
@@ -67,11 +41,10 @@ searchBackend :: AppConfig m => m SearchBackend
 searchBackend = asks oSearchBackend
 
 termsWithAlternatesFromConfig :: App [SearchTerm]
-termsWithAlternatesFromConfig = do
-    aliases <- concatMap lcTermAliases <$> loadAllConfigs
-    terms <- calculateTagInput
-
-    return $ termsAndAliases aliases terms
+termsWithAlternatesFromConfig =
+    termsAndAliases
+    <$> (concatMap lcTermAliases <$> loadAllConfigs)
+    <*> calculateTagInput
 
 renderError :: AppError -> IO ()
 renderError (TagError e) = V.missingTagsFileError e
diff --git a/app/Main.hs b/app/Main.hs
index fa29b17..aa75924 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,9 +1,10 @@
 module Main where
 
-import           App (runProgram, Options(Options))
+import           App (runProgram)
 import           Common
 import qualified Data.Maybe as M
 import           Options.Applicative
+import           Types (Options(Options))
 import           Unused.CLI (SearchRunner(..))
 import           Unused.Grouping (CurrentGrouping(..))
 import           Unused.TermSearch (SearchBackend(..))
diff --git a/app/Types.hs b/app/Types.hs
new file mode 100644
index 0000000..fcd7061
--- /dev/null
+++ b/app/Types.hs
@@ -0,0 +1,43 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE ConstraintKinds #-}
+
+module Types
+    ( Options(..)
+    , AppConfig
+    , AppError(..)
+    , App(..)
+    ) where
+
+import Control.Monad.Except (ExceptT, MonadError)
+import Control.Monad.Reader (MonadReader, ReaderT, MonadIO)
+import Unused.CLI (SearchRunner)
+import Unused.Cache (FingerprintOutcome)
+import Unused.Grouping (CurrentGrouping)
+import Unused.ResultsClassifier (ParseConfigError)
+import Unused.TagsSource (TagSearchOutcome)
+import Unused.TermSearch (SearchBackend)
+import Unused.Types (RemovalLikelihood)
+
+data Options = Options
+    { oSearchRunner :: SearchRunner
+    , oSingleOccurrenceMatches :: Bool
+    , oLikelihoods :: [RemovalLikelihood]
+    , oAllLikelihoods :: Bool
+    , oIgnoredPaths :: [String]
+    , oGrouping :: CurrentGrouping
+    , oWithoutCache :: Bool
+    , oFromStdIn :: Bool
+    , oCommitCount :: Maybe Int
+    , oSearchBackend :: SearchBackend
+    }
+
+type AppConfig = MonadReader Options
+
+data AppError
+    = TagError TagSearchOutcome
+    | InvalidConfigError [ParseConfigError]
+    | CacheError FingerprintOutcome
+
+newtype App a = App {
+    runApp :: ReaderT Options (ExceptT AppError IO) a
+} deriving (Monad, Functor, Applicative, AppConfig, MonadError AppError, MonadIO)
diff --git a/unused.cabal b/unused.cabal
index f791ca4..fd64590 100644
--- a/unused.cabal
+++ b/unused.cabal
@@ -96,6 +96,7 @@ executable unused
                      , mtl
                      , transformers
   other-modules:       App
+                     , Types
   default-language:    Haskell2010
 
 test-suite unused-test