Fixing unit test errors. 2 Errors for diff namespace, 2 errors for printer namespace

Author: evinasgu

.gitignore

@@ -4,6 +4,7 @@ target
 repl
 bin
 scratch.clj
+/out/
 /checkouts/
 /target/
 /.cljs_node_repl/

src/lambdaisland/deep_diff/diff.cljc

@@ -167,14 +167,17 @@
            Diff
            (-diff-similar [x y] (diff-atom x y))))
 
+#?(:cljs (extend-type js/Object
+           Diff
+           (-diff-similar [x y] (diff-atom (js->clj x) (js->clj y)))))
+
 #?(:clj (extend Object
           Diff
           {:-diff-similar (fn [exp act]
                             (if (.isArray (.getClass ^Object exp))
                               (diff-seq exp act)
                               (diff-atom exp act)))}))
 
-
 (extend-protocol Diff
   #?(:clj java.util.List
      :cljs cljs.core/List)
@@ -184,8 +187,14 @@
       [cljs.core/PersistentVector
        (-diff-similar [exp act] (diff-seq exp act))
 
+       cljs.core/EmptyList
+       (-diff-similar [exp act] (diff-seq exp act))
+
        cljs.core/PersistentHashMap
-       (-diff-similar [exp act] (diff-map exp act))])
+       (-diff-similar [exp act] (diff-map exp act))
+
+       array
+       (-diff-similar [exp act] (diff-seq exp act))])
 
   #?(:clj java.util.Set
      :cljs cljs.core/PersistentHashSet)
@@ -194,6 +203,7 @@
           act-seq (seq act)]
       (set (diff-seq exp-seq (concat (filter act exp-seq)
                                      (remove exp act-seq))))))
+
   #?(:clj java.util.Map
      :cljs cljs.core/PersistentArrayMap)
   (-diff-similar [exp act] (diff-map exp act)))
@@ -204,11 +214,23 @@
   (-left-undiff [s] (map left-undiff (remove #(instance? Insertion %) s)))
   (-right-undiff [s] (map right-undiff (remove #(instance? Deletion %) s)))
 
+  #?(:cljs cljs.core/EmptyList)
+  #?(:cljs (-left-undiff [s] (map left-undiff (remove #(instance? Insertion %) s))))
+  #?(:cljs (-right-undiff [s] (map right-undiff (remove #(instance? Deletion %) s))))
+
+  #?(:cljs cljs.core/PersistentVector)
+  #?(:cljs (-left-undiff [s] (map left-undiff (remove #(instance? Insertion %) s))))
+  #?(:cljs (-right-undiff [s] (map right-undiff (remove #(instance? Deletion %) s))))
+
   #?(:clj java.util.Set
      :cljs cljs.core/PersistentHashSet)
   (-left-undiff [s] (set (left-undiff (seq s))))
   (-right-undiff [s] (set (right-undiff (seq s))))
 
+  #?(:cljs cljs.core/KeySeq)
+  #?(:cljs (-left-undiff [s] (map left-undiff (remove #(instance? Insertion %) s))))
+  #?(:cljs (-right-undiff [s] (map right-undiff (remove #(instance? Deletion %) s))))
+
   #?(:clj java.util.Map
      :cljs cljs.core/PersistentArrayMap)
   (-left-undiff [m]
@@ -222,6 +244,18 @@
                 (map (juxt (comp right-undiff key) (comp right-undiff val))))
           m))
 
+  #?(:cljs cljs.core/PersistentHashMap)
+  #?(:cljs (-left-undiff [m]
+    (into {}
+          (comp (remove #(instance? Insertion (key %)))
+                (map (juxt (comp left-undiff key) (comp left-undiff val))))
+          m)))
+  #?(:cljs (-right-undiff [m]
+    (into {}
+          (comp (remove #(instance? Deletion (key %)))
+                (map (juxt (comp right-undiff key) (comp right-undiff val))))
+          m)))
+
   Mismatch
   (-left-undiff [m] (get m :-))
   (-right-undiff [m] (get m :+))
@@ -238,3 +272,12 @@
   (-right-undiff [m] m))
 
 #?(:clj (extend Object Undiff {:-left-undiff identity :-right-undiff identity}))
+#?(:cljs (extend-type cljs.core/UUID
+  Undiff
+  (-left-undiff [m] m)
+  (-right-undiff [m] m)))
+
+#?(:cljs (extend-type js/Object
+  Undiff
+  (-left-undiff [m] m)
+  (-right-undiff [m] m)))

test/lambdaisland/deep_diff/diff_test.cljc

@@ -265,9 +265,6 @@
          (diff/diff-seq [:a :b :c] [:a :c :d]))))
 
 
-
-
-
 (comment
   (use 'kaocha.repl)
   (run)

…/lambdaisland/deep_diff/printer_test.clj …lambdaisland/deep_diff/printer_test.cljctest/lambdaisland/deep_diff/printer_test.clj renamed to test/lambdaisland/deep_diff/printer_test.cljc test/lambdaisland/deep_diff/printer_test.clj renamed to test/lambdaisland/deep_diff/printer_test.cljc

@@ -2,37 +2,40 @@
   (:require [clojure.test :refer [deftest testing is are]]
             [lambdaisland.deep-diff.diff :as diff]
             [lambdaisland.deep-diff.printer :as printer])
-  (:import (java.sql Timestamp)
-           (java.util Date
-                      GregorianCalendar
-                      TimeZone)))
+  #?(:clj
+     (:import (java.sql Timestamp)
+              (java.util Date
+                         GregorianCalendar
+                         TimeZone))))
 
 (defn- printed
   [diff]
   (let [printer (printer/puget-printer {})]
     (with-out-str (-> diff
                       (printer/format-doc printer)
                       (printer/print-doc printer)))))
-
-(defn- calendar
-  [date]
-  (doto (GregorianCalendar. (TimeZone/getTimeZone "GMT"))
-    (.setTime date)))
+#?(:clj
+   (defn- calendar
+     [date]
+     (doto (GregorianCalendar. (TimeZone/getTimeZone "GMT"))
+       (.setTime date))))
 
 (deftest print-doc-test
   (testing "date"
     (is (= "\u001B[31m-#inst \"2019-04-09T14:57:46.128-00:00\"\u001B[0m \u001B[32m+#inst \"2019-04-10T14:57:46.128-00:00\"\u001B[0m\n"
            (printed (diff/diff #inst "2019-04-09T14:57:46.128-00:00"
                                #inst "2019-04-10T14:57:46.128-00:00")))))
 
-  (testing "timestamp"
-    (is (= "\u001B[31m-#inst \"1970-01-01T00:00:00.000000000-00:00\"\u001B[0m \u001B[32m+#inst \"1970-01-01T00:00:01.000000101-00:00\"\u001B[0m\n"
-           (printed (diff/diff (Timestamp. 0)
-                               (doto (Timestamp. 1000) (.setNanos 101)))))))
+  #?(:clj
+     (testing "timestamp"
+       (is (= "\u001B[31m-#inst \"1970-01-01T00:00:00.000000000-00:00\"\u001B[0m \u001B[32m+#inst \"1970-01-01T00:00:01.000000101-00:00\"\u001B[0m\n"
+              (printed (diff/diff (Timestamp. 0)
+                                  (doto (Timestamp. 1000) (.setNanos 101))))))))
 
-  (testing "calendar"
-    (is (= "\u001B[31m-#inst \"1970-01-01T00:00:00.000+00:00\"\u001B[0m \u001B[32m+#inst \"1970-01-01T00:00:01.001+00:00\"\u001B[0m\n"
-           (printed (diff/diff (calendar (Date. 0)) (calendar (Date. 1001)))))))
+  #?(:clj
+     (testing "calendar"
+       (is (= "\u001B[31m-#inst \"1970-01-01T00:00:00.000+00:00\"\u001B[0m \u001B[32m+#inst \"1970-01-01T00:00:01.001+00:00\"\u001B[0m\n"
+              (printed (diff/diff (calendar (Date. 0)) (calendar (Date. 1001))))))))
 
   (testing "uuid"
     (is (= "\u001B[31m-#uuid \"e41b325a-ce9d-4fdd-b51d-280d9c91314d\"\u001B[0m \u001B[32m+#uuid \"0400be9a-619f-4c6a-a735-6245e4955995\"\u001B[0m\n"