Add :coll? flagopts, print multiline flag docs

Author: plexus

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Added
 
+- Added `:coll?` flagopt for flags that can be specified multiple times
+- Correctly print multiline flag docstrings
+
 ## Fixed
 
 ## Changed

README.md

@@ -188,6 +188,9 @@ At this point a few things are worth calling out.
   as a positional argument rather than a flag. Note that the shell does its own
   backspace (character escape) handling, so in practice this means prefixing
   with two backslashes, e.g. `\\--foo`.
+- For flags that are expected to be passed multiple times, e.g. `-u foo -u bar`,
+  set `:coll? true`, in that case you will always receive them as a vector, even
+  if there is only one.
 
 You can also explicitly set which key to use with `:key`, as well as setting a
 specific `:value`, for instance:
@@ -269,6 +272,16 @@ must always be passed:
                                       :required true}] })
 ```
 
+#### Flag option reference
+
+- `:doc` docstring
+- `:default` default value
+- `:value` value to be associated with the key (for flags that don't take arguments)
+- `:handler` handler function, `(fn [opts & flag-args] ,,,)` 
+- `:middelware` functions which wrap the final command handler
+- `:coll?` flag can be specified  multiple times, will result in a vector 
+- `:parse` function used to coerce the flag argument
+
 ### Commands
 
 `lambdaisland/cli` is specifically meant for CLI tools with multiple subcommands

src/lambdaisland/cli.clj

@@ -71,21 +71,25 @@
             has-long?  (some long? (mapcat (comp :flags second) flagpairs))]
         (println "\nFLAGS")
         (print-table
-         (for [[_ {:keys [flags argdoc required] :as flagopts}] flagpairs]
-           (let [short (some short? flags)
-                 long (some long? flags)]
-             [(str (cond
-                     short
-                     (str short ", ")
-                     has-short?
-                     "    "
-                     :else
-                     "")
-                   long
-                   argdoc)
-              (desc flagopts)
-              (if required "(required)" "")
-              ])))))
+         (apply
+          concat
+          (for [[_ {:keys [flags argdoc doc required] :as flagopts}] flagpairs]
+            (let [short (some short? flags)
+                  long (some long? flags)]
+              (into [[(str (cond
+                             short
+                             (str short ", ")
+                             has-short?
+                             "    "
+                             :else
+                             "")
+                           long
+                           argdoc)
+                      (desc flagopts)
+                      (if required "(required)" "")]]
+                    (map (fn [l]
+                           ["" l ""]))
+                    (next (str/split doc #"\R")))))))))
     (when (seq command-pairs)
       (println "\nSUBCOMMANDS")
       (print-table
@@ -135,9 +139,13 @@
                               (:value flagspec)
                               ((fnil inc 0) (get opts (:key flagspec))))
                             (= 1 (count args))
-                            (first args)
+                            (if (:coll? flagspec)
+                              ((fnil conj []) (get opts (:key flagspec)) (first args))
+                              (first args))
                             :else
-                            (vec args))))))))))))
+                            (if (:coll? flagspec)
+                              ((fnil into []) (get opts (:key flagspec)) args)
+                              (vec args)))))))))))))
 
 (defn default-parse [s]
   (cond