wip

babashka · Nov 3, 2023 · 5dd1a24 · 5dd1a24
1 parent ee4f5a7
commit 5dd1a24
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/babashka/cli.cljc b/src/babashka/cli.cljc
@@ -230,7 +230,8 @@
             (let [arg-count (count args)
                   cnt (min arg-count
                            (bounded-count arg-count args->opts))]
-              [(concat (interleave args->opts args)
+              [(concat (interleave #?(:squint (map vector args->opts)
+                                      :default args->opts) args)
                        (drop cnt args))
                (drop cnt args->opts)])
             [args args->opts])
@@ -348,11 +349,16 @@
                 mode (when no-keyword-opts :hyphens)
                 args (seq args)
                 a->o a->o]
+           #_(prn :acc acc :current-opt current-opt :added added :mode (str mode) :args args :a-o a->o)
            (if-not args
              [acc current-opt added]
              (let [raw-arg (first args)
-                   opt? #?(:squint false
-                           :default (keyword? raw-arg))]
+                   opt? #?(:squint (vector? raw-arg)
+                           :default (keyword? raw-arg))
+                   raw-arg #?(:squint (if opt?
+                                        (first raw-arg)
+                                        raw-arg)
+                              :default raw-arg)]
                (if opt?
                  (recur (process-previous acc current-opt added nil)
                         raw-arg added mode (next args)

diff --git a/test/babashka/cli_test.cljc b/test/babashka/cli_test.cljc
@@ -81,7 +81,7 @@
                  :option :b
                  :value "dude"
                  :spec nil}
-                (ex-data e)))))
+              (ex-data e)))))
   (is (submap? {:a [1 1]}
                (cli/parse-opts ["-a" "1" "-a" "1"] {:collect {:a []} :coerce {:a :long}})))
   (is (submap? {:foo :bar

diff --git a/test/babashka/one_off.cljs b/test/babashka/one_off.cljs
@@ -0,0 +1,5 @@
+(ns babashka.one-off
+  (:require [babashka.cli :as cli]))
+
+(prn (cli/parse-opts ["2021a4" ":no-git-tag-version" ":deps-file" "foo.edn"] {:args->opts [:version] :spec {:no-git-tag-version {:coerce :boolean}}}))
+(prn (cli/parse-opts ["foo"] {:args->opts [:bar]}))