Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/rules_clojure/gen_build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,14 @@
(defn emit-bazel-kwargs
"Return a seq of \"k = v\" entry strings, sorted by buildifier attribute priority.
Sortable list-typed values (per `sortable-list-attrs`) are sorted by `label-sort-key`.
Vector values render inline (<=1 element) or multi-line via `emit-vector`."
Vector values render inline (<=1 element) or multi-line via `emit-vector`.
Entries whose value is an empty collection are dropped — `data = []` /
`srcs = []` are noise, not declarations."
[kwargs]
{:pre [(map? kwargs)]
:post [(sequential? %)]}
(->> (:x kwargs)
(remove (fn [[_ v]] (and (coll? v) (empty? v))))
sort-kwargs-entries
(map (fn [[k v]]
(let [v-str (cond
Expand Down
23 changes: 23 additions & 0 deletions test/rules_clojure/gen_build_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,29 @@
")")
result)))))

(deftest test-empty-collection-attrs-dropped
(testing "empty list/map values are omitted from the rendered call"
(let [result (gb/emit-bazel
(list 'filegroup
(gb/kwargs {:name "x"
:srcs ["a.clj"]
:data []})))]
(is (= "filegroup(\n name = \"x\",\n srcs = [\"a.clj\"],\n)"
result)
"data = [] is noise — bazel default is [] anyway — and must not render")))
(testing "non-empty values survive"
(let [result (gb/emit-bazel
(list 'filegroup
(gb/kwargs {:name "x"
:srcs ["a.clj"]
:data ["//b:c"]})))]
(is (str/includes? result "data = [\"//b:c\"]"))))
(testing "non-collection falsy/zero values are preserved"
(is (str/includes?
(gb/emit-bazel (list 'rule (gb/kwargs {:name "x" :testonly false})))
"testonly = False")
"False must render, not be confused with an empty collection")))

(deftest test-attr-sorting
(testing "name first, then by priority, then alphabetical"
(let [result (gb/emit-bazel
Expand Down