cli: validate commands

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## Unreleased
 
 - Add `clojure.string/includes?`
+- [#691](https://github.com/squint-cljs/squint/issues/691): Add validation to CLI ([@lread](https://github.com/lread))
 
 ## v0.8.152 (2025-07-18)
 

bb/node_cli_tests.clj

@@ -0,0 +1,153 @@
+(ns node-cli-tests
+  "Sanity checks on cli error processing and squint.edn default handling"
+  (:require
+   [babashka.fs :as fs]
+   [babashka.process :as p]
+   [clojure.test :as t :refer [deftest is]]
+   [clojure.string :as str]))
+
+(def test-dir ".work/cli-test")
+
+(t/use-fixtures :each (fn [f]
+                        (when (fs/exists? test-dir)
+                          (fs/delete-tree test-dir))
+                        (fs/create-dirs test-dir)
+                        (f)))
+
+(defn squint-edn [cfg]
+  (spit (fs/file test-dir "squint.edn") (pr-str cfg)))
+
+(defn squint
+  [& args]
+  (apply p/shell {:continue true
+                  :dir test-dir
+                  :out :string
+                  :err :inherit}
+         (into ["node" "../../node_cli.js"] args)))
+
+(deftest cmd-with-no-args-test
+  (let [{:keys [exit out]} (squint "repl" "foo")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Must specify no args, found: foo" out))))
+
+(deftest cmd-with-one-arg-test
+  (let [{:keys [exit out]} (squint "run")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Must specify a single <file>" out)))
+
+  (let [{:keys [exit out]} (squint "run" "too" "many" "args")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Must specify a single <file>, found: too many args" out))))
+
+(deftest unrecognized-opt-test
+  (let [{:keys [exit out]} (squint "compile" "--wtf")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Unrecognized option: --wtf" out)))
+  (let [{:keys [exit out]} (squint "compile" "-wtf")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Unrecognized option: -w" out))))
+
+(deftest opt-with-no-value-test
+  (let [{:keys [exit out]} (squint "compile" "--paths")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Option specified without value: --paths" out))))
+
+(deftest compile-is-assumed-when-not-specified-test
+  ;; help alone brings up all cmds help
+  (let [{:keys [exit out]} (squint "--help")]
+    (is (= 0 exit))
+    (is (str/includes? out "Usage: squint <subcommand>")))
+  ;; if anything else not matching another cmd is specified, assume compile
+  (let [{:keys [exit out]} (squint "some-file" "--help")]
+    (is (= 0 exit))
+    (is (str/includes? out "Usage: squint compile"))))
+
+(deftest eval-test
+  ;; -e is our only command-less command, so deserves sanity tests
+  (let [{:keys [exit out]} (squint "-e" "(+ 1 2 3)" "--repl")]
+    (is (= 0 exit))
+    (is (= "6" (str/trim out))))
+  (let [{:keys [exit out]} (squint "-e" "--help")]
+    (is (= 0 exit))
+    (is (str/includes? out "Usage: squint -e")))
+  (let [{:keys [exit out]} (squint "-e")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Option specified without value: -e" out))))
+
+(deftest no-files-processed-test
+  (let [{:keys [exit out]} (squint "compile" "wontfind")]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Compile processed no files" out))
+    (is (re-find #"Compiled sources: 0" out))
+    (is (not (re-find #"Copied resources:" out))))
+  (let [{:keys [exit out]} (squint "compile" "wontfind" "--copy-resources" :foo)]
+    (is (= 1 exit))
+    (is (re-find #".*ERROR.* Compile processed no files" out))
+    (is (re-find #"Compiled sources: 0" out))
+    (is (re-find #"Copied resources: 0" out))))
+
+(deftest squint-edn-only-test
+  (fs/copy-tree "test-project" test-dir)
+  (fs/delete-tree (fs/file test-dir "lib"))
+  (squint-edn {:paths ["src" "src-other"
+                       "resources"]
+               :output-dir "lib"
+               :copy-resources #{"foo\\.json"  "test\\.json" :css}})
+  (let [{:keys [exit out]} (squint "compile")]
+    (is (= 0 exit))
+    (doseq [s ["Compiled sources: 5"
+               "Copied resources: 3"]]
+      (is (str/includes? out s)))
+    (doseq [f ["lib/foo.json"
+               "lib/baz.css"
+               "lib/main.mjs"]]
+      (is (fs/exists? (str (fs/file test-dir f)))))
+    (is (not (fs/exists? (str (fs/file test-dir "lib/bar.json")))))))
+
+(deftest squint-edn-with-some-command-line-overrides-test
+  (fs/copy-tree "test-project" test-dir)
+  (fs/delete-tree (fs/file test-dir "lib"))
+  (squint-edn {:paths ["src" "src-other"
+                       "resources"]
+               :output-dir "lib"
+               :copy-resources #{"foo\\.json" "test\\.json" :css}})
+  (let [{:keys [exit out]} (squint "compile"
+                                   "--paths" "src" "--paths" "resources"
+                                   "--output-dir" "other-lib")]
+    (is (= 0 exit))
+    (doseq [s ["Compiled sources: 4"
+               "Copied resources: 3"]]
+      (is (str/includes? out s)))
+    (doseq [f ["other-lib/foo.json"
+               "other-lib/baz.css"
+               "other-lib/main.mjs"]]
+      (is (fs/exists? (str (fs/file test-dir f)))))
+    (is (not (fs/exists? (str (fs/file test-dir "other-lib/bar.json")))))))
+
+(deftest squint-edn-with-all-command-line-overrides-test
+  (fs/copy-tree "test-project" test-dir)
+  (fs/delete-tree (fs/file test-dir "lib"))
+  (squint-edn {:paths ["src" "src-other"
+                       "resources"]
+               :output-dir "lib"
+               :copy-resources #{"foo\\.json" "test\\.json" :css}})
+  (let [{:keys [exit out]} (squint "compile"
+                                   "--paths" "src" "--paths" "resources"
+                                   "--output-dir" "other-lib"
+                                   "--copy-resources" "bar\\.json" "--copy-resources" ":css"
+                                   "--extension" ".js")]
+    (is (= 0 exit))
+    (doseq [s ["Compiled sources: 4"
+               "Copied resources: 2"]]
+      (is (str/includes? out s)))
+    (doseq [f ["other-lib/bar.json"
+               "other-lib/baz.css"
+               "other-lib/main.js"]]
+      (is (fs/exists? (str (fs/file test-dir f)))))
+    (is (not (fs/exists? (str (fs/file test-dir "other-lib/foo.json")))))))
+
+(defn run-tests [_]
+  (let [{:keys [fail error]}
+        (t/run-tests 'node-cli-tests)]
+    (when (pos? (+ fail error))
+      (throw (ex-info "Tests failed" {:babashka/exit 1})))))

bb/tasks.clj

@@ -4,6 +4,7 @@
    [babashka.process :as p :refer [shell]]
    [cheshire.core :as json]
    [node-repl-tests]
+   [node-cli-tests]
    [clojure.string :as str]))
 
 (def test-config
@@ -75,6 +76,7 @@
   (shell "npx shadow-cljs --config-merge .work/config-merge.edn compile squint")
   (shell "node lib/squint_tests.js")
   (node-repl-tests/run-tests {})
+  (node-cli-tests/run-tests {})
   (test-project {})
   (test-run {}))
 

deps.edn

@@ -1,7 +1,7 @@
 {:paths ["src" "resources" "compiler-common"]
  :deps {borkdude/edamame {:mvn/version "1.4.30"}
         babashka/process {:mvn/version "0.1.7"}
-        org.babashka/cli {:mvn/version "0.7.51"}
+        org.babashka/cli {:mvn/version "0.8.66"}
         org.babashka/sci {:mvn/version "0.6.37"}}
  :aliases
  {:dev {}