add cljr support per @dmiller

Author: seancorfield

.gitignore

@@ -3,9 +3,18 @@
 /.cpcache
 /.lein-failures
 /.lein-repl-history
-/.lsp
+/.lsp/.cache
 /.nrepl-port
-/.portal
+/.portal/vs-code.edn
 /.socket-repl-port
 /cljs-test-runner-out
 target
+
+
+#Visual Studio artifacts
+bin/
+obj/
+.vs/
+*.user
+*.suo
+*.nupkg

src/main/clojure/clojure/tools/cli.cljc

@@ -143,7 +143,8 @@
          (recur options (into extra-args (vec (rest args))) nil)
 
          (and (opt? opt) (nil? spec))
-         (throw #?(:clj (Exception. (str "'" opt "' is not a valid argument"))
+         (throw #?(:clj  (Exception. (str "'" opt "' is not a valid argument"))
+                   :cljr (Exception. (str "'" opt "' is not a valid argument"))	
                    :cljs (js/Error. (str "'" opt "' is not a valid argument"))))
 
          (and (opt? opt) (spec :flag))
@@ -251,6 +252,7 @@
         (let [msg (str "Warning: The following options to parse-opts are unrecognized: "
                        (s/join ", " unknown-keys))]
           #?(:clj  (binding [*out* *err*] (println msg))
+             :cljr (binding [*out* *err*] (println msg))
              :cljs (binding [*print-fn* *print-err-fn*] (println msg)))))))
 
   (select-keys map spec-keys))
@@ -262,6 +264,7 @@
         long-opt (or long-opt (:long-opt spec-map))
         [long-opt req] (when long-opt
                          (rest (re-find #"^(--[^ =]+)(?:[ =](.*))?" long-opt)))
+	    #?@(:cljr (req (if (= req "") nil req)))                                   ;;; Regular expression variation
         id (when long-opt
              (keyword (nth (re-find #"^--(\[no-\])?(.*)" long-opt) 2)))
         validate (:validate spec-map)
@@ -393,7 +396,7 @@
   (let [{:keys [validate-fn validate-msg]} spec]
     (or (loop [[vfn & vfns] validate-fn [msg & msgs] validate-msg]
           (when vfn
-            (if (try (vfn value) (catch #?(:clj Throwable :cljs :default) _))
+            (if (try (vfn value) (catch #?(:clj Throwable :cljr Exception :cljs :default) _))
               (recur vfns msgs)
               [::error (validation-error value opt optarg msg)])))
         [value nil])))
@@ -403,7 +406,7 @@
         [value error] (if parse-fn
                         (try
                           [(parse-fn value) nil]
-                          (catch #?(:clj Throwable :cljs :default) e
+                          (catch #?(:clj Throwable :cljr Exception :cljs :default) e
                             [nil (parse-error opt optarg (str e))]))
                         [value nil])]
     (cond error
@@ -507,7 +510,7 @@
                   (or default-desc
                       (when (contains? spec :default)
                         (if (some? default)
-                          (str default)
+                          #?(:cljr (pr-str default) :default (str default)) ;; in order to get the proper case for booleans
                           "nil"))
                       (when default-fn
                         "<computed>")

src/main/dotnet/packager/clojure.tools.cli.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+  </PropertyGroup>
+
+
+	<PropertyGroup>
+		<PackageId>clojure.tools.cli</PackageId>
+		<RootNamespace>clojure.tools</RootNamespace>
+		<Title>clojure.tools.cli</Title>
+		<Product>clojure.tools.cli</Product>
+		<AssemblyTitle>clojure.tools.cli</AssemblyTitle>
+		<Authors>Gareth Jones, Sung Pae, Sean Corfield</Authors>
+		<Description>Something appropriate.</Description>
+		<Copyright>Copyright © Rich Hickey and contributors 2023</Copyright>
+		<PackageLicenseExpression>EPL-1.0</PackageLicenseExpression>
+		<RepositoryUrl>https://github.com/clojure/tools.cku</RepositoryUrl>
+		<Company>Clojure contributors</Company>
+		<PackageTags>Clojure;ClojureCLR</PackageTags>
+		<Version>1.0.214</Version>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<EmbeddedResource CopyToOutputDirectory="Never" Include="..\..\clojure\clojure\tools\**\*" />
+	</ItemGroup>
+	
+</Project>

src/test/clojure/clojure/tools/cli_test.cljc

@@ -59,18 +59,18 @@
             :long-opt "--[no-]foo"})))
   (testing "throws AssertionError on unset :id, duplicate :short-opt or :long-opt,
             multiple :default(-fn) entries per :id, or both :assoc-fn/:update-fn present"
-    (is (thrown? #?(:clj AssertionError :cljs :default)
+    (is (thrown? #?(:clj AssertionError :cljr Exception :cljs :default)
                  (compile-option-specs [["-a" :id nil]])))
-    (is (thrown? #?(:clj AssertionError :cljs :default)
+    (is (thrown? #?(:clj AssertionError :cljr Exception :cljs :default)
                  (compile-option-specs [{:id :a :short-opt "-a"} {:id :b :short-opt "-a"}])))
-    (is (thrown? #?(:clj AssertionError :cljs :default)
+    (is (thrown? #?(:clj AssertionError :cljr Exception :cljs :default)
                  (compile-option-specs [{:id :alpha :long-opt "--alpha"} {:id :beta :long-opt "--alpha"}])))
-    (is (thrown? #?(:clj AssertionError :cljs :default)
+    (is (thrown? #?(:clj AssertionError :cljr Exception :cljs :default)
                  (compile-option-specs [{:id :alpha :default 0} {:id :alpha :default 1}])))
-    (is (thrown? #?(:clj AssertionError :cljs :default)
+    (is (thrown? #?(:clj AssertionError :cljr Exception :cljs :default)
                  (compile-option-specs [{:id :alpha :default-fn (constantly 0)}
                                         {:id :alpha :default-fn (constantly 1)}])))
-    (is (thrown? #?(:clj AssertionError :cljs :default)
+    (is (thrown? #?(:clj AssertionError :cljr Exception :cljs :default)
                  (compile-option-specs [{:id :alpha :assoc-fn assoc :update-fn identity}]))))
   (testing "desugars `--long-opt=value`"
     (is (= (map (juxt :id :long-opt :required)
@@ -99,12 +99,16 @@
                    (with-out-str
                      #?(:clj (binding [*err* *out*]
                                (compile-option-specs [[nil "--alpha" :validate nil :flag true]]))
+                        :cljr (binding [*err* *out*]
+                                (compile-option-specs [[nil "--alpha" :validate nil :flag true]]))							   
                         :cljs (binding [*print-err-fn* *print-fn*]
                                 (compile-option-specs [[nil "--alpha" :validate nil :flag true]]))))))
       (is (re-find #"Warning:.* :validate"
                    (with-out-str
                      #?(:clj (binding [*err* *out*]
                                (compile-option-specs [{:id :alpha :validate nil}]))
+                        :cljr (binding [*err* *out*]
+                               (compile-option-specs [{:id :alpha :validate nil}]))
                         :cljs (binding [*print-err-fn* *print-fn*]
                                 (compile-option-specs [{:id :alpha :validate nil}])))))))))
 
@@ -113,6 +117,7 @@
 
 (defn parse-int [x]
   #?(:clj  (Integer/parseInt x)
+     :cljr (Int32/Parse x)
      :cljs (do (assert (re-seq #"^\d" x))
                (js/parseInt x))))
 
@@ -440,10 +445,6 @@
            "Usage: myprog [--alpha|--beta] arg1 arg2"))))
 
 (comment
-  ;; Chas Emerick's PhantomJS test runner
-  (spit "target/runner.js"
-        (slurp (clojure.java.io/resource "cemerick/cljs/test/runner.js")))
-
   ;; CLJS test runner; same as `lein cljsbuild test`
   (defn run-cljs-tests []
     (println