ys: Fixes for CLI getopts with more tests

ingydotnet · ingydotnet · commit ac98efc2974d · 2025-02-01T12:19:29.000-08:00
diff --git a/ys/Makefile b/ys/Makefile
@@ -62,7 +62,7 @@ test: test-unit
 test-all: test-unit test-run
 
 test-unit: $(LEIN) $(YAMLSCRIPT_CORE_INSTALLED)
-	$< test
+	$< test $(lein-test)
 
 test-run: $(BPAN_LOCAL) build
 	prove $${TEST_VERBOSE:+'-v'} $(test)
diff --git a/ys/src/yamlscript/cli.clj b/ys/src/yamlscript/cli.clj
@@ -72,24 +72,24 @@
 ;; See https://clojure.github.io/tools.cli/#clojure.tools.cli/parse-opts
 (def cli-options
   [;
-   [nil "--run"
-    "Run a YAMLScript program file (default)"]
-   ["-l" "--load"
-    "Output (compact) JSON of YAMLScript evaluation"]
    ["-e" "--eval YSEXPR"
     "Evaluate a YAMLScript expression
                            multiple -e values joined by newline"
     :default []
     :update-fn conj
     :multi true]
+   ["-l" "--load"
+    "Output (compact) JSON of YAMLScript evaluation"]
+   ["-f" "--file FILE"
+    "Explicitly indicate input file"]
 
    ["-c" "--compile"
     "Compile YAMLScript to Clojure"]
    ["-b" "--binary"
     "Compile to a native binary executable"]
 
    ["-p" "--print"
-    "Print the result of --run in code mode"]
+    "Print the final evaluation result value"]
    ["-o" "--output FILE"
     "Output file for --load, --compile or --binary"]
    ["-s" "--stream"
@@ -500,6 +500,15 @@ Options:
       (mutex1 opts :print (set/difference action-opts #{:run}))
       (mutex1 opts :to (set/difference action-opts #{:load :compile})))))
 
+(defn looks-like-expr [file]
+  (when (and
+          (string? file)
+          (re-find #"(?:^(?:\ |(?:_?[.:]\w))|\ $|\()" file))
+    (if (fs/exists? file)
+      (err (str "'" file "' looks like an expression,\n"
+             "but is also the name of a file. Use --eval or -e."))
+      true)))
+
 (defn do-main [opts args help error errs]
   (if error
     (do-error [(str "Error: " error)])
@@ -520,20 +529,20 @@ Options:
         :nrepl (do-nrepl opts args)
         (do-run opts args)))))
 
-(defn -main [& argv]
-  (global/reset-env nil)
-
+(defn get-opts [argv]
   (let [orig argv
-        arg1 (first argv)
-        [args argv] (if (and arg1 (not (re-find #"^-" arg1)))
-                      [[arg1] (cons "--" (rest argv))]
-                      (split-with #(not= "--" %1) argv))
+        [args argv] (split-with #(not= "--" %1) argv)
+        [argv is--] (if (= "--" (first argv))
+                      [(rest argv) true]
+                      [argv false])
+        ;_ (WWW "args argv" args argv)
         options (cli/parse-opts args cli-options)
         {opts :options
          args :arguments
          help :summary
          errs :errors} options
-        args (concat args (rest argv))
+        ;_ (WWW "args argv" args argv)
+        args (concat args argv)
         opts (if-not (seq orig) (assoc opts :help true) opts)
         error (validate-opts opts)
         opts (if (env "YS_FORMAT") (assoc opts :to (env "YS_FORMAT")) opts)
@@ -564,44 +573,61 @@ Options:
         opts (if (env "YS_STACK_TRACE") (assoc opts :stack-trace true) opts)
         opts (if (env "YS_UNORDERED") (assoc opts :unordered true) opts)
         opts (if (env "YS_XTRACE") (assoc opts :xtrace true) opts)
-        [file & args] args
-        arg1 (first args)
-        looks-like-expr
-        (fn []
-          (when (and
-                  (string? file)
-                  (re-find #"(?:^(?:\ |(?:_?[.:]\w))|\ $|\()" file))
-            (if (fs/exists? file)
-              (err (str "'" file "' looks like an expression,\n"
-                     "but is also the name of a file. Use --eval or -e."))
-              true)))
+
+        ; _ (WWW "opts" opts "args "args)
+        is-e (seq (:eval opts))
+        [arg1 arg2] args
         [opts args] (if (and
                           (not (seq (:eval opts)))
-                          (looks-like-expr)
-                          (or (nil? arg1)
-                            (= arg1 "-")
-                            (fs/exists? arg1)))
-                      [(assoc opts
-                         :file (or arg1 "-")
-                         :eval [file]
-                         :mode "code"
-                         :load true
-                         :to (or (:to opts) "yaml"))
-                       (drop 1 args)]
+                          (looks-like-expr arg1))
+                      (let [opts (assoc opts
+                                   :eval [arg1]
+                                   :mode (or (:mode opts) "code")
+                                   :load true
+                                   :to (or (:to opts) "yaml"))
+                            args (rest args)
+                            [opts args] (if (and arg2
+                                              (not is--)
+                                              (not (re-find #"^-" arg2)))
+                                          [(assoc opts :file arg2) (rest args)]
+                                          [opts args])
+                            file (or (:file opts)
+                                   (when is-- "-"))
+                            opts (if file
+                                   (assoc opts :file file)
+                                   opts)]
+                        [opts args])
                       [opts args])
-        opts (assoc opts :file (or
-                                 (:file opts)
-                                 file
-                                 (and
-                                   (:load opts)
-                                   (not (seq (:eval opts)))
-                                   "-")))]
-
-    (reset! global/opts opts)
-
+        ; _ (WWW "opts" opts "args" args)
+        file (:file opts)
+        file (or file
+               (and (seq (:eval opts)) (not is-e) (not is--) "-"))
+        ; _ (WWW file)
+        [file args] (if file
+                      [file args]
+                      (if (and (not is--)
+                            (seq args)
+                            (not (re-find #"^-." (first args))))
+                        [(first args) (rest args)]
+                        [nil args]))
+        file (or file
+               (and (not (seq (:eval opts))) (:load opts) "-"))
+        opts (if file (assoc opts :file file) opts)
+        args (vec args)]
     (when (env "YS_SHOW_OPTS")
       (println (yaml/generate-string{:opts opts :args args})))
+    [opts args error errs help]))
+
+(comment
+  (take 2 (get-opts [".foo" "bar" "baz"]))
+  (take 2 (get-opts [".foo"]))
+  #__)
 
+(defn -main [& argv]
+  (global/reset-env nil)
+  (let [[opts args error errs help] (get-opts argv)
+        out (:output opts)]
+    (reset! global/opts opts)
     (if out
       (with-open [out (io/writer out)]
         (binding [*out* out]
diff --git a/ys/test/cli-usage.t b/ys/test/cli-usage.t
@@ -14,41 +14,41 @@ HELP =: |
 
   Options:
 
-        --run                Run a YAMLScript program file (default)
-    -l, --load               Output (compact) JSON of YAMLScript evaluation
     -e, --eval YSEXPR        Evaluate a YAMLScript expression
                              multiple -e values joined by newline
+    -l, --load               Output (compact) JSON of YAMLScript evaluation
+    -f, --file FILE          Explicitly indicate input file
+
+#   -c, --compile            Compile YAMLScript to Clojure
+#   -b, --binary             Compile to a native binary executable
+
+#   -p, --print              Print the final evaluation result value
+#   -o, --output FILE        Output file for --load, --compile or --binary
+#   -s, --stream             Output all results from a multi-document stream
+
+#   -T, --to FORMAT          Output format for --load:
+#                              json, yaml, edn
+#   -J, --json               Output (pretty) JSON for --load
+#   -Y, --yaml               Output YAML for --load
+#   -E, --edn                Output EDN for --load
+#   -U, --unordered          Mappings don't preserve key order (faster)
 
-    -c, --compile            Compile YAMLScript to Clojure
-    -b, --binary             Compile to a native binary executable
-
-#     -p, --print              Print the result of --run in code mode
-#     -o, --output FILE        Output file for --load, --compile or --binary
-#     -s, --stream             Output all results from a multi-document stream
-#
-#     -T, --to FORMAT          Output format for --load:
-#                                json, yaml, edn
-#     -J, --json               Output (pretty) JSON for --load
-#     -Y, --yaml               Output YAML for --load
-#     -E, --edn                Output EDN for --load
-#     -U, --unordered          Mappings don't preserve key order (faster)
-#
-#     -m, --mode MODE          Add a mode tag: code, data, or bare (for -e)
-#     -C, --clojure            Treat input as Clojure code
-#
-#     -d                       Debug all compilation stages
-#     -D, --debug-stage STAGE  Debug a specific compilation stage:
-#                                parse, compose, resolve, build,
-#                                transform, construct, print
-#                              can be used multiple times
-#     -S, --stack-trace        Print full stack trace for errors
-#     -x, --xtrace             Print each expression before evaluation
-#
-#         --install            Install the libyamlscript shared library
-#         --upgrade            Upgrade both ys and libyamlscript
-#
-#         --version            Print version and exit
-#     -h, --help               Print this help and exit
+#   -m, --mode MODE          Add a mode tag: code, data, or bare (for -e)
+#   -C, --clojure            Treat input as Clojure code
+
+#   -d                       Debug all compilation stages
+#   -D, --debug-stage STAGE  Debug a specific compilation stage:
+#                              parse, compose, resolve, build,
+#                              transform, construct, print
+#                            can be used multiple times
+#   -S, --stack-trace        Print full stack trace for errors
+#   -x, --xtrace             Print each expression before evaluation
+
+#       --install            Install the libyamlscript shared library
+#       --upgrade            Upgrade both ys and libyamlscript
+
+#       --version            Print version and exit
+#   -h, --help               Print this help and exit
 
 #'
 
@@ -226,24 +226,4 @@ test::
         - ham
         - zucchini
 
-- note: Test args
-- cmnd:: "ys $DIR/show-args"
-  want: nil nil
-- cmnd:: "$DIR/show-args"
-  want: nil nil
-- cmnd:: "ys $DIR/show-args --"
-  want: ("--") ("--")
-- cmnd:: "$DIR/show-args --"
-  want: ("--") ("--")
-- cmnd:: "ys $DIR/show-args :foo -42 bar 3.14"
-  want: (":foo" "-42" "bar" "3.14") (:foo -42 "bar" 3.14)
-- cmnd:: "$DIR/show-args :foo -42 bar 3.14"
-  want: (":foo" "-42" "bar" "3.14") (:foo -42 "bar" 3.14)
-- cmnd:: "$DIR/show-args -a -- -b"
-  want: ("-a" "--" "-b") ("-a" "--" "-b")
-- cmnd:: "$DIR/show-args -- -b"
-  want: ("--" "-b") ("--" "-b")
-- cmnd:: "$DIR/show-args -a --"
-  want: ("-a" "--") ("-a" "--")
-
 done:
diff --git a/ys/test/yamlscript/cli_test.clj b/ys/test/yamlscript/cli_test.clj
@@ -64,7 +64,7 @@
     "'say' evaluates to a symbol")
 
   ;; Figure out why this stopped working
-  #_(has (ys "-ce" "std/say: 123")
+  #_(is (ys "-ce" "std/say: 123")
     "(std/say 123)"
     "-c prints Clojure code of compilation")
 
@@ -80,10 +80,6 @@
     "must be one of: json, yaml, edn"
     "Validate --to=...")
 
-  (has (ys "--run" "--load" "...")
-    "Error: Options --load and --run are mutually exclusive"
-    "Can't use multiple action options together")
-
   (has (ys "-J" "-Y" "...")
     "Error: Options --yaml and --json are mutually exclusive"
     "Can't use multiple data format options together")
@@ -96,22 +92,10 @@
     "Error: Options --version and --stack-trace are mutually exclusive"
     "Can't use other options with --version")
 
-  #_(has (ys "--mode=code" "--run" "...")
-    "Error: Options --mode and --run are mutually exclusive"
-    "Can't use --mode with certain actions")
-
-  #_(has (ys "--kill" "-e" "...")
-    "Error: Options --eval and --kill are mutually exclusive"
-    "Can't --eval with certain actions")
-
   (has (ys "-ple" "...")
     "Error: Options --print and --load are mutually exclusive"
     "Can't use --print with --load")
 
-  (has (ys "--run" "--to=json" "-e" "...")
-    "Error: Options --to and --run are mutually exclusive"
-    "Can't use --to with --run")
-
   (is (ys "-Y" "test/loader.ys")
     "foo: This is a string
 bar:
diff --git a/ys/test/yamlscript/getopts.clj b/ys/test/yamlscript/getopts.clj
diff --git a/ys/test/yamlscript/test.clj b/ys/test/yamlscript/test.clj
