Skip to content

Commit e75142a

Browse files
authored
Merge pull request #146 from weissjeffm/flatten-false
fix map/flatten to stop ignoring the value false
2 parents df7218c + 4a1c0b5 commit e75142a

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/plumbing/map.cljc

+3-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@
4949
[m]
5050
(when m
5151
((fn flatten-helper [keyseq m]
52-
(when m
53-
(if (map? m)
54-
(mapcat (fn [[k v]] (flatten-helper (conj keyseq k) v)) m)
55-
[[keyseq m]])))
52+
(if (map? m)
53+
(mapcat (fn [[k v]] (flatten-helper (conj keyseq k) v)) m)
54+
[[keyseq m]]))
5655
[] m)))
5756

5857
(defn unflatten

test/plumbing/map_test.cljc

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
(is (empty? (map/flatten {})))
5353
(is (= [[[] :foo]] (map/flatten :foo)))
5454
(is (= {[:a] 1
55-
[:b :c] 2
56-
[:b :d :e] 3
55+
[:b :c] false
56+
[:b :d :e] nil
5757
[:b :d :f] 4}
58-
(into {} (map/flatten {:a 1 :b {:c 2 :d {:e 3 :f 4}}})))))
58+
(into {} (map/flatten {:a 1 :b {:c false :d {:e nil :f 4}}})))))
5959

6060
(deftest unflatten-test
6161
(is (= {} (map/unflatten nil)))

0 commit comments

Comments
 (0)