Skip to content

Resolve opts once: stash ::spec-map, pass resolved opts through pipeline #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
borkdude merged 1 commit into from
Jul 13, 2026
Merged

Resolve opts once: stash ::spec-map, pass resolved opts through pipeline #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions src/babashka/cli.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,21 @@
(fn [data]
(f (merge {:spec spec :type :org.babashka/cli} data)))))

(defn- resolve-opts [opts]
(defn- ->spec-map [spec]
(cond (nil? spec) {}
(map? spec) spec
:else (into {} spec)))

(defn- resolve-opts
"Resolve `opts` once: merge the spec-derived opts (see [[spec->opts]]) and
stash the mapified spec as `::spec-map`. Idempotent via `::resolved`.
Consumers read `::spec-map` instead of re-deriving it."
[opts]
(if (::resolved opts)
opts
(let [spec (:spec opts)]
(assoc (if spec (merge-opts opts (spec->opts spec opts)) opts)
::spec-map (->spec-map spec)
::resolved true))))

(defn- kw->str [kw]
Expand All @@ -315,11 +325,6 @@
[opt->flag opt]
(or (get opt->flag opt) (str "--" (kw->str opt))))

(defn- ->spec-map [spec]
(cond (nil? spec) {}
(map? spec) spec
:else (into {} spec)))

(defn- decorate-label
"Decorate a positional argument label `raw` (its `:ref` or key name). Wraps in
`<...>` unless `raw` already starts with `<` or `[`. Appends `...` when
Expand Down Expand Up @@ -368,7 +373,7 @@
(let [spec (:spec opts)
opts (resolve-opts opts)
coerce-map (:coerce opts)
spec-map (->spec-map spec)
spec-map (::spec-map opts)
positional (:positional opts)
m-meta (meta m)
implicit-values (or (::implicit-values opts)
Expand Down Expand Up @@ -460,8 +465,7 @@
coerce-map (:coerce opts)
aliases (or (:alias opts)
(:aliases opts))
spec-map (if (map? spec)
spec (when spec (into {} spec)))
spec-map (::spec-map opts)
positional (:positional opts)
known-keys (set (concat (keys spec-map)
(vals aliases)
Expand Down Expand Up @@ -603,7 +607,7 @@
(let [parse-opts opts ;; disambiguate from cli opts (without making fn sig odd-looking)
aliases (or (:alias parse-opts) (:aliases parse-opts))
spec (:spec parse-opts)
spec-map (if (map? spec) spec (when spec (into {} spec)))
spec-map (or (::spec-map parse-opts) (->spec-map spec))
alias-keys (set (concat (keys aliases) (keep :alias (vals spec-map))))
known-keys (set (concat (keys spec-map) (vals aliases) (keys coerce)))
expects-bool-val? (fn [opt-key] (#{:boolean :bool} (coerce-coerce-fn (get coerce opt-key))))
Expand Down Expand Up @@ -816,13 +820,9 @@
(let [opts (resolve-opts opts)
;; Step 1: Parse (raw strings, no coercion)
parsed (parse-opts* args opts)
;; Step 2: Coerce
coerced (coerce-opts parsed {:coerce (:coerce opts)
:spec (:spec opts)
:positional (:positional opts)
:error-fn (:error-fn opts)
::auto-coerce true
::resolved true})
;; Step 2: Coerce. Pass the resolved opts through whole, so per-key
;; config never needs re-threading per pipeline stage.
coerced (coerce-opts parsed (assoc opts ::auto-coerce true))
;; Step 3: Apply defaults
coerced (apply-defaults coerced opts)
;; Step 4: Validate
Expand Down
Loading