bugfix (apply instead of map in process function), major refactoring

Author: reflechant

project.clj

@@ -4,8 +4,8 @@
   :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
             :url "https://www.eclipse.org/legal/epl-2.0/"}
   :dependencies [[org.clojure/clojure "1.10.1"]
-                 [org.clojure/core.async "1.3.610"]
                  [org.clojure/data.json "1.0.0"]
+                 [org.clojure/core.async "1.3.610"]
                  [org.clojure/tools.cli "1.0.194"]
                  [lambdaisland/deep-diff2 "2.0.108"]
                  [juji/editscript "0.4.6"]]

src/json_diff/core.clj

@@ -1,11 +1,11 @@
 (ns json-diff.core
-  (:require [clojure.data.json :as json]
+  (:require [clojure.java.io :as io]
+            [clojure.data.json :as json]
             [clojure.core.async :refer [>! <!! go chan]]
+            [clojure.tools.cli :refer [parse-opts]]
             [lambdaisland.deep-diff2 :as ddiff]
-            [clojure.java.io :as io]
-            [editscript.core :as edcore]
-            ;; [editscript.edit :as edit]
-            [clojure.tools.cli :refer [parse-opts]])
+            [editscript.core :refer [diff] :rename {diff compact-diff}])
+
   (:gen-class))
 
 (def cli-options
@@ -14,45 +14,44 @@
     :parse-fn #(keyword %)
     :validate [#(% #{:visual :patch}) "possible modes are 'visual' or 'patch'"]]])
 
-(defn parse
-  "opens JSON file and parses it"
-  [file-name]
-  (with-open [f (io/reader file-name)]
-    (json/read f)))
-
 (defn parse-async
   "opens JSON file and parses it asynchronously, returns channel"
   [file-name]
-  (go (parse file-name)))
+  (go (with-open [f (io/reader file-name)]
+        (json/read f))))
 
 (defn process
   [f & files]
   (->> files
        (map parse-async)
-       (map #(<!! %))
-       (map f)))
+       (map <!!)
+       (apply f)))
 
 (defn patch
-  "returns compact patch between two JSON objects"
+  "prints compact patch between two JSON objects"
   [left right]
-  (println (edcore/diff left right {:algo :quick})))
+  (println (compact-diff left right {:algo :quick})))
 
 (defn diff
-  "returns visual diff between two JSON objects"
+  "prints visual diff between two JSON objects"
   [left right]
   (ddiff/pretty-print
    (ddiff/diff left right)))
 
+(defn print-error-exit
+  "prints error message and exits with error code"
+  [msg code]
+  (println msg)
+  (System/exit code))
+
 (defn -main
   "main function"
   [& args]
   (let [{files :arguments
          errors :errors
          {:keys [mode]} :options} (parse-opts args cli-options)]
     (cond
-      errors (do (apply println errors)
-                 (System/exit 1))
-      (not= 2 (count files)) (do (println "you need to pass two JSON files!")
-                                   (System/exit 1))
+      errors (print-error-exit (str errors) 1)
+      (not= 2 (count files)) (print-error-exit "you need to pass two JSON files!" 1)
       (= :visual mode) (apply process diff files)
       (= :patch mode) (apply process patch files))))