Bufix: Shallow trees not rendered to tables properly

Author: matthewdowney

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [1.1.2] - 2019-06-04
+### Fixed
+- If the first level of the tree is a leaf, `accounting-table` doesn't walk it 
+  correctly.
+### Added
+- Can pass through a custom `:min-leaf-depth` key to `tree` (replaces binding a 
+dynamic var in earlier versions).
+
+## [1.1.1] - 2019-06-01
+### Fixed
+- Total rows were not always being displayed correctly for trees
+
 ## [1.1.0] - 2019-05-28
 ### Added
 - More flexible tree rendering/aggregation

README.md

@@ -8,7 +8,7 @@ common sense styling.
 
 Lein:
 ```
-[org.clojars.mjdowney/excel-clj "1.1.1"]
+[org.clojars.mjdowney/excel-clj "1.1.2"]
 ```
 
 - [Getting Started](#getting-started)

project.clj

@@ -1,4 +1,4 @@
-(defproject org.clojars.mjdowney/excel-clj "1.1.1"
+(defproject org.clojars.mjdowney/excel-clj "1.1.2"
   :description "Generate Excel documents & PDFs from Clojure data."
   :url "https://github.com/matthewdowney/excel-clj"
   :license {:name "Eclipse Public License"

src/excel_clj/core.clj

@@ -200,12 +200,13 @@
   If provided, the formatters argument is a function that takes the integer
   depth of a category (increases with nesting) and returns a cell format for
   the row, and total-formatters is the same for rows that are totals."
-  [t & {:keys [headers formatters total-formatters data-format]
+  [t & {:keys [headers formatters total-formatters min-leaf-depth data-format]
         :or {formatters style/default-tree-formatters
              total-formatters style/default-tree-total-formatters
+             min-leaf-depth 2
              data-format :accounting}}]
   (try
-    (let [tabular (tree/accounting-table (second t))
+    (let [tabular (tree/accounting-table (second t) :min-leaf-depth min-leaf-depth)
           fmt-or-max (fn [fs n]
                        (or (get fs n) (second (apply max-key first fs))))
           all-colls (or headers

src/excel_clj/tree.clj

@@ -161,15 +161,17 @@
                 [{::depth 0 ::label (label node) ::header? true}]
                 ;; Then the children & their values
                 (mapv #(update % ::depth inc) children)
+
                 ;; And finally an aggregation if there are multiple header children
                 ;; or any leaf children
                 (let [fchild (first children)
                       siblings (get (group-by :depth children) (:depth fchild))]
                   (when (or (>= (count siblings) 2) (not (::header? fchild)))
                     [(merge {::depth 0 ::label "" ::total? true} (value node aggregate-with))])))
+
               ;; A leaf just has its label & value attrs. The depth is inc'd by each
               ;; parent back to the root, so it does not stay at 0.
-              (merge {::depth 0 ::label (label node)} (value node aggregate-with))))
+              [(merge {::depth 0 ::label (label node)} (value node aggregate-with))]))
           tree)))
     (map
       (fn [table-row]