refactor journalModifyTransactions, modifyTransactions

API changes:

Hledger.Data.TransactionModifier
-transactionModifierToFunction
+modifyTransactions

Hledger.Read.Common.applyTransactionModifiers -> Hledger.Data.Journal.journalModifyTransactions

hledger-lib/Hledger/Data/Journal.hs

@@ -69,6 +69,7 @@ module Hledger.Data.Journal (
   journalCheckBalanceAssertions,
   journalNumberAndTieTransactions,
   journalUntieTransactions,
+  journalModifyTransactions,
   -- * Tests
   samplejournal,
   tests_Journal,
@@ -107,6 +108,7 @@ import Hledger.Data.AccountName
 import Hledger.Data.Amount
 import Hledger.Data.Dates
 import Hledger.Data.Transaction
+import Hledger.Data.TransactionModifier
 import Hledger.Data.Posting
 import Hledger.Query
 
@@ -557,6 +559,11 @@ journalTieTransactions j@Journal{jtxns=ts} = j{jtxns=map txnTieKnot ts}
 journalUntieTransactions :: Transaction -> Transaction
 journalUntieTransactions t@Transaction{tpostings=ps} = t{tpostings=map (\p -> p{ptransaction=Nothing}) ps}
 
+-- | Apply any transaction modifier rules in the journal 
+-- (adding automated postings to transactions, eg).
+journalModifyTransactions :: Journal -> Journal
+journalModifyTransactions j = j{ jtxns = modifyTransactions (jtxnmodifiers j) (jtxns j) }
+
 -- | Check any balance assertions in the journal and return an error
 -- message if any of them fail.
 journalCheckBalanceAssertions :: Journal -> Either String Journal

hledger-lib/Hledger/Data/TransactionModifier.hs

@@ -8,7 +8,7 @@ typically adding automated postings to them.
 
 -}
 module Hledger.Data.TransactionModifier (
-    transactionModifierToFunction
+   modifyTransactions
 )
 where
 
@@ -32,6 +32,12 @@ import Hledger.Utils.Debug
 -- >>> import Hledger.Data.Transaction
 -- >>> import Hledger.Data.Journal
 
+-- | Apply all the given transaction modifiers, in turn, to each transaction.
+modifyTransactions :: [TransactionModifier] -> [Transaction] -> [Transaction]
+modifyTransactions tmods ts = map applymods ts
+  where
+    applymods = foldr (flip (.) . transactionModifierToFunction) id tmods
+
 -- | Converts a 'TransactionModifier' to a 'Transaction'-transforming function,
 -- which applies the modification(s) specified by the TransactionModifier.
 -- Currently this means adding automated postings when certain other postings are present.

hledger-lib/Hledger/Read/Common.hs

@@ -33,7 +33,6 @@ module Hledger.Read.Common (
   rejp,
   genericSourcePos,
   journalSourcePos,
-  applyTransactionModifiers,
   parseAndFinaliseJournal,
   parseAndFinaliseJournal',
   setYear,
@@ -228,14 +227,6 @@ journalSourcePos p p' = JournalSourcePos (sourceName p) (fromIntegral . unPos $
             | otherwise = unPos $ sourceLine p' -- might be at end of file withat last new-line
 
 
--- | Apply any transaction modifier rules in the journal 
--- (adding automated postings to transactions, eg).
-applyTransactionModifiers :: Journal -> Journal
-applyTransactionModifiers j = j { jtxns = map applyallmodifiers $ jtxns j }
-  where
-    applyallmodifiers = 
-      foldr (flip (.) . transactionModifierToFunction) id (jtxnmodifiers j)
-
 -- | Given a megaparsec ParsedJournal parser, input options, file
 -- path and file content: parse and post-process a Journal, or give an error.
 parseAndFinaliseJournal :: ErroringJournalParser IO ParsedJournal -> InputOpts
@@ -267,7 +258,7 @@ parseAndFinaliseJournal parser iopts f txt = do
                  -- with transaction modifiers
                  then
                    -- first pass
-                   applyTransactionModifiers <$>
+                   journalModifyTransactions <$>
                      (journalBalanceTransactions False $
                       journalReverse $
                       journalAddFile (f, txt) $
@@ -312,7 +303,7 @@ parseAndFinaliseJournal' parser iopts f txt = do
       -- time. If we are only running once, we reorder and follow the
       -- options for checking assertions.
       let fj = if auto_ iopts && (not . null . jtxnmodifiers) pj
-               then applyTransactionModifiers <$>
+               then journalModifyTransactions <$>
                     (journalBalanceTransactions False $
                      journalReverse $
                      journalApplyCommodityStyles pj) >>=

hledger/Hledger/Cli/Commands/Rewrite.hs

@@ -37,11 +37,9 @@ rewritemode = hledgerCommandMode
 -- TODO allow using this on unbalanced entries, eg to rewrite while editing
 
 rewrite opts@CliOpts{rawopts_=rawopts,reportopts_=ropts} j@Journal{jtxns=ts} = do 
-  -- create re-writer
-  let modifiers = transactionModifierFromOpts opts : jtxnmodifiers j
-      applyallmodifiers = foldr (flip (.) . transactionModifierToFunction) id modifiers
   -- rewrite matched transactions
-  let j' = j{jtxns=map applyallmodifiers ts}
+  let modifiers = transactionModifierFromOpts opts : jtxnmodifiers j
+  let j' = j{jtxns=modifyTransactions modifiers ts}
   -- run the print command, showing all transactions, or show diffs
   printOrDiff rawopts opts{reportopts_=ropts{query_=""}} j j'
 

hledger/Hledger/Cli/Utils.hs

@@ -154,7 +154,7 @@ journalAddForecast opts@CliOpts{reportopts_=ropts} j = do
   let forecastspan = DateSpan (Just forecaststart) (Just forecastend)
       forecasttxns =
         -- If there are forecast transaction, lets apply transaction modifiers to them
-        map (foldr (flip (.) . transactionModifierToFunction) id (jtxnmodifiers j)) $
+        modifyTransactions (jtxnmodifiers j) $
         [ txnTieKnot t | pt <- jperiodictxns j
                        , t <- runPeriodicTransaction pt forecastspan
                        , spanContainsDate forecastspan (tdate t)