Skip to content

Commit 5b633ba

Browse files
committed
cli: select-keys squint.edn to spec keys before :exec-args
So stray keys in squint.edn don't trip :restrict validation, matching prior PR behavior.
1 parent 5b6c6e1 commit 5b633ba

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/squint/internal/cli.cljs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,12 @@ Use squint <subcommand> --help to show more info."))))
458458
(println help)
459459
(let [cmd-def (cmd-def-from-cli-args cmd-table cli-args)
460460
;; squint.edn is passed as :exec-args so bb cli precedence is:
461-
;; CLI > squint.edn > spec :default
461+
;; CLI > squint.edn > spec :default. Filter to spec keys so
462+
;; stray keys in squint.edn don't trip :restrict.
462463
cmd-def (cond-> cmd-def
463464
(:squint-edn? cmd-def)
464-
(assoc :exec-args (utils/get-cfg)))
465+
(assoc :exec-args (select-keys (utils/get-cfg)
466+
(keys (:spec cmd-def)))))
465467
cmd-opts-args (parse-cmd-opts-args cli-args cmd-def)]
466468
(when (:squint-edn? cmd-def)
467469
;; sync cfg atom with fully merged opts for downstream consumers

0 commit comments

Comments
 (0)