Skip to content

Expose matched commands in :no-match and :input-exhausted error cases for dispatch #93

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 3 commits into from
Mar 15, 2024
Merged

Expose matched commands in :no-match and :input-exhausted error cases for dispatch #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94c7893
Refactor
Sohalt Mar 13, 2024
20b1414
Expose matched cmds as :dispatch in :no-match and :input-exhausted er…
Sohalt Mar 13, 2024
2b5ae09
Add test
Sohalt Mar 15, 2024
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
20 changes: 10 additions & 10 deletions src/babashka/cli.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,29 +644,29 @@
{:error :no-match
:wrong-input arg
:available-commands (keys (:cmd cmd-info))
:dispatch cmds
:opts (dissoc all-opts ::opts-by-cmds)}
{:error :input-exhausted
:available-commands (keys (:cmd cmd-info))
:dispatch cmds
:opts (dissoc all-opts ::opts-by-cmds)})))))))

(defn- dispatch-tree
([tree args]
(dispatch-tree tree args nil))
([tree args opts]
(let [{:as res :keys [cmd-info error wrong-input available-commands]}
(let [{:as res :keys [cmd-info error available-commands]}
(dispatch-tree' tree args opts)
error-fn* (or (:error-fn opts)
error-fn (or (:error-fn opts)
(fn [{:keys [msg] :as data}]
(throw (ex-info msg data))))
error-fn (fn [data]
(-> {;; :tree tree
:type :org.babashka/cli
:wrong-input wrong-input :all-commands available-commands}
(merge data)
error-fn*))]
(throw (ex-info msg data))))]
(case error
(:no-match :input-exhausted)
(error-fn {:cause error :opts (:opts res)})
(error-fn (merge
{:type :org.babashka/cli
:cause error
:all-commands available-commands}
(select-keys res [:wrong-input :opts :dispatch])))
nil ((:fn cmd-info) (dissoc res :cmd-info))))))

(defn dispatch
Expand Down
7 changes: 6 additions & 1 deletion test/babashka/cli_test.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,12 @@
(is (= {:dispatch ["foo" "bar"], :opts {:version "2000"}, :args ["some-arg"]}
(-> (cli/dispatch
table
["foo" "bar" "--version" "2000" "some-arg"]))))))))
["foo" "bar" "--version" "2000" "some-arg"])))))
(testing "dispatch errors return :dispatch key"
(is (= {:type :org.babashka/cli, :dispatch ["foo" "bar"], :all-commands '("baz"), :cause :input-exhausted, :opts {}}
(cli/dispatch [{:cmds ["foo" "bar" "baz"] :fn identity}] ["foo" "bar"] {:error-fn identity})))
(is (= {:type :org.babashka/cli, :dispatch ["foo" "bar"], :wrong-input "wrong", :all-commands '("baz"), :cause :no-match, :opts {}}
(cli/dispatch [{:cmds ["foo" "bar" "baz"] :fn identity}] ["foo" "bar" "wrong"] {:error-fn identity})))))))

(deftest table->tree-test
(testing "internal represenation"
Expand Down