Solving errors

Author: evinasgu

deps.edn

@@ -1,24 +1,22 @@
 {:paths ["resources" "src" "test"]
  :deps  {org.clojure/clojure           {:mvn/version "1.10.0"}
          ;;mvxcvi/puget                {:mvn/version "1.1.2"}
-         github-lambdaisland/puget
-         {:git/url "https://github.com/lambdaisland/puget"
-          :sha "ea860be1f0c6a5e406c45a414802c41e902d010c"}
+         github-lambdaisland/puget     {:git/url "https://github.com/lambdaisland/puget"
+                                        :sha "ea860be1f0c6a5e406c45a414802c41e902d010c"}
          fipp                          {:mvn/version "0.6.17"}
          org.clojure/core.rrb-vector   {:mvn/version "0.0.14"}
          ;;tech.droit/clj-diff         {:mvn/version "1.0.1"}
          org.clojars.rymndhng/clj-diff {:mvn/version "1.1.1-SNAPSHOT"}
          mvxcvi/arrangement            {:mvn/version "1.2.0"}
          com.andrewmcveigh/cljs-time   {:mvn/version "0.5.2"}}
 
- :aliases
- {:cljs
-  {:extra-deps {org.clojure/clojurescript   {:mvn/version "1.10.597"}}}
+ :aliases {:cljs
+           {:extra-deps {org.clojure/clojurescript   {:mvn/version "1.10.597"}}}
 
-  :dev
-  {}
+           :dev
+           {}
 
-  :test
-  {:extra-deps {lambdaisland/kaocha      {:mvn/version "0.0-581"}
-                lambdaisland/kaocha-cljs {:mvn/version "0.0-68"}
-                org.clojure/test.check   {:mvn/version "0.10.0-alpha4"}}}}}
+           :test
+           {:extra-deps {lambdaisland/kaocha      {:mvn/version "RELEASE"}
+                         lambdaisland/kaocha-cljs {:mvn/version "RELEASE"}
+                         org.clojure/test.check   {:mvn/version "0.10.0-alpha4"}}}}}

src/lambdaisland/deep_diff/diff.cljc

@@ -97,11 +97,11 @@
          (diff-seq-insertions ins)
          (into []))))
 
-(defn- val-type [val]
+#?(:clj (defn- val-type [val]
   (let [t (type val)]
     (if (class? t)
       (symbol (.getName ^Class t))
-      t)))
+      t))))
 
 (defn- diff-map [exp act]
   (first
@@ -136,41 +136,56 @@
     (diff-similar exp act)
     (diff-atom exp act)))
 
-(extend nil
-  Diff
-  {:diff-similar diff-atom})
-
-(extend Object
-  Diff
-  {:diff-similar (fn [exp act]
-                   (if (.isArray (.getClass ^Object exp))
-                     (diff-seq exp act)
-                     (diff-atom exp act)))})
+#?(:clj (extend nil
+          Diff
+          {:diff-similar diff-atom})
+   :cljs (extend-type nil ;; I am not pretty sure about this. Lets wait for unit tests
+           Diff
+           {:diff-similar diff-atom}))
+
+#?(:clj (extend Object
+          Diff
+          {:diff-similar (fn [exp act]
+                           (if (.isArray (.getClass ^Object exp))
+                             (diff-seq exp act)
+                             (diff-atom exp act)))})
+   :cljs (extend-type object
+           Diff
+           {:diff-similar (fn [exp act]
+                            (if (array?  exp)
+                              (diff-seq exp act)
+                              (diff-atom exp act)))}))
 
 (extend-protocol Diff
-  java.util.List
+  #?(:clj java.util.List
+     :cljs cljs.core.list)
   (diff-similar [exp act] (diff-seq exp act))
 
-  java.util.Set
+  #?(:clj java.util.Set
+     :cljs cljs.core.set)
   (diff-similar [exp act]
     (let [exp-seq (seq exp)
           act-seq (seq act)]
       (set (diff-seq exp-seq (concat (filter act exp-seq)
                                      (remove exp act-seq))))))
 
-  java.util.Map
+  #?(:clj java.util.Map
+     :cljs cljs.core.map)
   (diff-similar [exp act] (diff-map exp act)))
 
 (extend-protocol Undiff
-  java.util.List
+  #?(:clj java.util.List
+     :cljs cljs.core.list)
   (left-undiff [s] (map left-undiff (remove #(instance? Insertion %) s)))
   (right-undiff [s] (map right-undiff (remove #(instance? Deletion %) s)))
 
-  java.util.Set
+  #?(:clj java.util.Set
+     :cljs cljs.core.set)
   (left-undiff [s] (set (left-undiff (seq s))))
   (right-undiff [s] (set (right-undiff (seq s))))
 
-  java.util.Map
+  #?(:clj java.util.Map
+     :cljs cljs.core.map)
   (left-undiff [m]
     (into {}
           (comp (remove #(instance? Insertion (key %)))
@@ -192,5 +207,8 @@
   Deletion
   (left-undiff [m] (get m :-)))
 
-(extend nil Undiff {:left-undiff identity :right-undiff identity})
-(extend Object Undiff {:left-undiff identity :right-undiff identity})
+#?(:clj (extend nil Undiff {:left-undiff identity :right-undiff identity})
+   :cljs (extend-type nil Undiff {:left-undiff identity :right-undiff identity}))
+
+$?(:clj (extend Object Undiff {:left-undiff identity :right-undiff identity})
+        :cljs (extend-type object Undiff {:left-undiff identity :right-undiff identity}))

src/lambdaisland/deep_diff/printer.cljc

@@ -59,8 +59,6 @@
 (def ^:private ^ThreadLocal thread-local-utc-timestamp-format
   (proxy [ThreadLocal] []
     (initialValue []
-      ;; (doto (SimpleDateFormat. "yyyy-MM-dd'T'HH:mm:ss")
-      ;;   (.setTimeZone (TimeZone/getTimeZone "GMT"))))))
       #?(:clj (doto (SimpleDateFormat. "yyyy-MM-dd'T'HH:mm:ss")
                 (.setTimeZone (TimeZone/getTimeZone "GMT")))
          :cljs (doto (cljs-time.format/formatter "yyyy-MM-dd'T'HH:mm:ss"))))))
@@ -138,7 +136,7 @@
 
    #?(:clj 'java.util.UUID
        :cljs 'cljs.core.uuid)
-    (tagged-handler 'uuid str)}
+    (tagged-handler 'uuid str)})
 
 (defn- print-handler-resolver [extra-handlers]
   (fn [^Class klz]

tests.edn

@@ -1,7 +1,4 @@
 #kaocha/v1
-{:tests [{:id :unit
-          :test-paths ["test"]
-          :source-paths ["src"]}
+{:tests [{:id :clj}
          {:id :cljs
-          :type :kaocha.type/cljs
-          :test-paths ["test"]}]}
+          :type :kaocha.type/cljs}]}