Merge pull request #26 from PromptECO/output-dir

Output dir

Author: njordhov

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog 
 
-## 0.5.1
+## 0.6.0 
+
+- New `output-dir` option to specify a directory for formatted files
+
+## 0.5.2
 
 - New `spread` format to accommodate line-oriented codecov tooling
 

CONTRIBUTING.md

@@ -4,12 +4,14 @@ This development environment is built on [shadow-cljs](https://github.com/thhell
 
 ## Starting a Watcher
 
-To start a shadow-cljs watcher, which will recompile the code whenever any files change, use the following command (you can use `-d` to run it in the background):
+To start a shadow-cljs watcher, which will recompile the code whenever any files change, use the following command:
 
 ```bash
-docker-compose run --rm shadow-cljs watch script
+docker-compose run -v `pwd`:/home --rm shadow-cljs watch script
 ```
 
+The `-v` option mounts the current directory. Optionally, use `-d` to run the container in the background.
+
 Wait until the watch server has completed starting up, then [open the build monitor](http://localhost:9630/builds) in a web browser:
 
 ```bash

README.md

@@ -62,7 +62,13 @@ docker run -v `pwd`:/home ghcr.io/prompteco/clariform *.clar
 
 This assumes that the current directory contains Clarity contracts with a ".clar" file extension.
 
-The formatted contracts will be written to output.
+The formatted contracts will be written to output. 
+
+Use the `--output-dir` option to specify a directory for formatted contracts: 
+
+```
+docker run -v `pwd`:/home ghcr.io/prompteco/clariform --output-dir "out" *.clar
+```
 
 ### Troubleshooting
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clariform",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "private": true,
   "scripts": {
     "repl": "npx shadow-cljs node-repl",

src/main/clariform/core.cljs

@@ -15,11 +15,13 @@
    [clariform.ast.parser :as parser]
    [clariform.format :as format
     :refer [format-code]]
+   [cljs-node-io.core :as node-io]
+   [cljs-node-io.file :as node-file]
    [clariform.io :as io]
    [clariform.transform :as transform
     :refer [transform]]))
 
-(def version-string "0.5.2")
+(def version-string "0.6.0")
 
 (defn printerr [& vals]
   (binding [*print-fn* *print-err-fn*]
@@ -51,19 +53,20 @@
                   (exit 1 (pr-str err))))))
           (recur))))))  
 
-(defn format-all [{:keys [arguments options summary errors] :as opts}]
-  (let [resources (io/resources-seq arguments)
+(defn format-all [{:keys [arguments options summary errors] :as opts} & {:keys [output-dir]}]
+  (let [resources (doall (io/resources-seq arguments))
         multiple (some? (next resources))
         con-chan (io/contracts-chan resources)]
     (go-loop [{:keys [locator error text] :as res} (<! con-chan)]
-      (binding [*out* (pprint/get-pretty-writer *out*)]
-        (when (some? res)
-          (when error
-            (printerr (ex-message error))
-            (recur (<! con-chan)))
-          (when multiple
-            (pprint/fresh-line)
-            (println ";;" (io/file-path locator)))
+      (when (some? res)
+        (when (some? error)
+          (printerr (ex-message error))
+          (recur (<! con-chan)))
+        (when multiple
+          (println "") ;; pprint/fresh-line fails!
+          (when (some? locator)
+            (println ";; " (.toString locator))))
+        (binding [*out* (pprint/get-pretty-writer *out*)]
           (let [parser-options (select-keys options [:strict])
                 ast (format/parse-code text parser-options)]
             (if (insta/failure? ast)
@@ -82,7 +85,20 @@
                 (try
                   (let [formatted (-> (transform ast)
                                       (format-code options))]
-                    (print formatted))
+                        ;_ (node-io/spit "contracts-out/file61-locator.clar" (pr-str locator))
+                        ;dir (if true output-dir #_(node-io/as-file output-dir))
+                        ;_ (node-io/spit "contracts-out/file62-dir.clar" (pr-str dir))
+                        ;filepath (case :prod
+                        ;           :prod (node-io/filepath (str output-dir) #_"contracts-out" (str locator) #_"contracts/basic.clar")
+                        ;           :test "contracts-out/contracts/basic.clar")]
+                    ;(node-io/spit "contracts-out/file70-filepath.clar" (pr-str filepath))
+                    ; (apply node-io/make-parents (string/split filepath #"/"))
+                    (if-some [path (and (some? output-dir)
+                                        (node-io/filepath (str output-dir) (str locator)))]
+                      (do #_(node-io/spit "contracts-out/filexx.clar" (pr-str path))
+                          (apply node-io/make-parents (string/split path #"/"))              
+                          (node-io/spit path formatted))
+                      (print formatted)))
                   (catch ExceptionInfo e
                     (printerr (ex-message e))))))
             (pprint/fresh-line)
@@ -99,6 +115,7 @@
     :validate [#{"retain" "adjust" "indent" "auto" "align" "tight" "spread" "compact"} 
                "Must be one of 'retain', 'adjust', 'indent', 'auto', 'align', 'tight', 'spread' or 'compact'"]]
    [nil "--strict" "Expect strict Clarity syntax"]
+   ["-o" "--output-dir DIR" "Output directory"]
    [nil "--verbose"]
    [nil "--debug"]])
 
@@ -120,7 +137,7 @@
     (some? (:check options))
     (check-all params)
     :else
-    (format-all params)))
+    (format-all params :output-dir (:output-dir options))))
 
 (defonce command (atom nil))