Partially apply post processing function as early as possible

Author: bergmark

rest-gen/src/Rest/Gen.hs

@@ -61,28 +61,28 @@ runGenerate config name api sources imports rewrites postProc =
   where
     m :: Version -> Some1 (Router m) -> IO Result
     m ver (Some1 r) = case get action config of
-      Just (MakeDocs root) -> generateDocs       config ver r postProc root
-      Just MakeJS          -> generateJavaScript config ver r postProc moduleName
-      Just MakeRb          -> generateRuby       config ver r postProc moduleName
-      Just MakeHS          -> generateHaskell    config ver r postProc moduleName packageName sources imports rewrites
+      Just (MakeDocs root) -> generateDocs       config ver r (postProc HtmlFile      ) root
+      Just MakeJS          -> generateJavaScript config ver r (postProc JavaScriptFile) moduleName
+      Just MakeRb          -> generateRuby       config ver r (postProc RubyFile      ) moduleName
+      Just MakeHS          -> generateHaskell    config ver r (postProc HaskellFile   ) moduleName packageName sources imports rewrites
       Nothing              -> return $ Error NoOp
     packageName = map toLower name
     moduleName  = ModuleName $ upFirst packageName
 
-generateJavaScript :: Config -> Version -> Router m s -> (FileType -> String -> IO String) -> ModuleName -> IO Result
+generateJavaScript :: Config -> Version -> Router m s -> (String -> IO String) -> ModuleName -> IO Result
 generateJavaScript config ver r postProc moduleName = do
-  file <- postProc JavaScriptFile =<< mkJsApi (overModuleName (++ "Api") moduleName) (get apiPrivate config) ver r
+  file <- postProc =<< mkJsApi (overModuleName (++ "Api") moduleName) (get apiPrivate config) ver r
   toTarget config file
 
-generateRuby ::  Config -> Version -> Router m s -> (FileType -> String -> IO String) -> ModuleName -> IO Result
+generateRuby ::  Config -> Version -> Router m s -> (String -> IO String) -> ModuleName -> IO Result
 generateRuby config ver r postProc moduleName = do
-  file <- postProc RubyFile =<< mkRbApi (overModuleName (++ "Api") moduleName) (get apiPrivate config) ver r
+  file <- postProc =<< mkRbApi (overModuleName (++ "Api") moduleName) (get apiPrivate config) ver r
   toTarget config file
 
-generateDocs :: Config -> Version -> Router m s -> (FileType -> String -> IO String) -> String -> IO Result
+generateDocs :: Config -> Version -> Router m s -> (String -> IO String) -> String -> IO Result
 generateDocs config ver r postProc rootUrl = do
   targetDir <- getTargetDir config "./docs"
-  writeDocs (context targetDir) (postProc HtmlFile) r
+  writeDocs (context targetDir) postProc r
   return $ FileOut targetDir
     where
       context targetDir = DocsContext
@@ -93,10 +93,10 @@ generateDocs config ver r postProc rootUrl = do
         , DCtx.sourceDir      = getSourceLocation config
         }
 
-generateHaskell :: Config -> Version -> Router m s -> (FileType -> String -> IO String) -> ModuleName -> String -> [ModuleName] -> [ImportDecl] -> [(ModuleName, ModuleName)] -> IO Result
+generateHaskell :: Config -> Version -> Router m s -> (String -> IO String) -> ModuleName -> String -> [ModuleName] -> [ImportDecl] -> [(ModuleName, ModuleName)] -> IO Result
 generateHaskell config ver r postProc moduleName packageName sources imports rewrites = do
   targetPath <- getTargetDir config "./client"
-  mkHsApi (context targetPath (getSourceLocation config)) (postProc HaskellFile) r
+  mkHsApi (context targetPath (getSourceLocation config)) postProc r
   return $ FileOut targetPath
   where
     context tp sourceDir = HaskellContext