When having named positional arguments and trailing unnamed positional arguments, assign them correctly

Author: plexus

CHANGELOG.md

@@ -1,10 +1,8 @@
 # Unreleased
 
-## Added
-
 ## Fixed
 
-## Changed
+- When having named positional arguments and trailing unnamed positional arguments, assign them correctly
 
 # 0.23.93 (2025-02-25 / a192123)
 

src/lambdaisland/cli.clj

@@ -142,20 +142,20 @@
                    (apply call-handler handler opts args)
                    (-> opts
                        (assoc
-                         (:key flagspec)
-                         (cond
-                           (= 0 (count args))
-                           (if (contains? flagspec :value)
-                             (:value flagspec)
-                             ((fnil inc 0) (get opts (:key flagspec))))
-                           (= 1 (count args))
-                           (if (:coll? flagspec)
-                             ((fnil conj []) (get opts (:key flagspec)) (first args))
-                             (first args))
-                           :else
-                           (if (:coll? flagspec)
-                             ((fnil into []) (get opts (:key flagspec)) args)
-                             (vec args))))
+                        (:key flagspec)
+                        (cond
+                          (= 0 (count args))
+                          (if (contains? flagspec :value)
+                            (:value flagspec)
+                            ((fnil inc 0) (get opts (:key flagspec))))
+                          (= 1 (count args))
+                          (if (:coll? flagspec)
+                            ((fnil conj []) (get opts (:key flagspec)) (first args))
+                            (first args))
+                          :else
+                          (if (:coll? flagspec)
+                            ((fnil into []) (get opts (:key flagspec)) args)
+                            (vec args))))
                        (assoc-in [::sources (:key flagspec)] (str (:flag flagspec) " command line flag"))))))))))))
 
 (defn default-parse [s]
@@ -451,6 +451,7 @@
             (-> cmdspec
                 (dissoc :command :commands :middleware)
                 (merge command-match)
+                (dissoc :argnames)
                 (assoc :name (str program-name " " cmd)))
             (drop arg-count pos-args)
             (-> opts

test/lambdaisland/cli_test.clj

@@ -18,6 +18,12 @@
                      :flags   ["-x" {:doc      "flag x"
                                      :required required}]}]})
 
+(defn cmdspec-pos
+  "cmdspec with a positional argument."
+  []
+  {:commands ["run <module>"
+              {:command #'identity}]})
+
 (deftest required-flag
   (testing "successful exit"
     (are [input args expected]
@@ -47,3 +53,9 @@
         (is (thrown-with-msg? Exception expected (cli/dispatch* input args)))
       (cmdspec-1 true) []      #"Missing required flags: -x"
       (cmdspec-n true) ["run"] #"Missing required flags: -x")))
+
+(deftest positional-argument-with-trailing-arguments
+  (let [{::cli/keys [argv]
+         :keys [module]} (cli/dispatch* (cmdspec-pos) ["run" "foo" "bar"])]
+    (is (= "foo" module))
+    (is (= ["foo" "bar"] argv))))