Merge pull request #31 from ProjectFrank/main

Fix bug where records with deletions are not handled

Author: plexus

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## Fixed
 
+- Fix issue (Fails with records with deleted keys)[https://github.com/lambdaisland/deep-diff2/issues/29]
+
 ## Changed
 
 # 2.3.127 (2022-07-01 / a8186a5)

deps.edn

@@ -1,5 +1,5 @@
 {:paths ["resources" "src"]
- :deps  {fipp                        {:mvn/version "0.6.26"}
+ :deps  {fipp/fipp                   {:mvn/version "0.6.26"}
          org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
          lambdaisland/clj-diff       {:mvn/version "1.3.67"}
          mvxcvi/arrangement          {:mvn/version "2.0.0"}}
@@ -13,7 +13,7 @@
            :chui
            {:extra-deps  {lambdaisland/chui    {:local/root "../chui"}
                           thheller/shadow-cljs {:mvn/version "2.18.0"}
-                          garden               {:mvn/version "1.3.10"}}
+                          garden/garden        {:mvn/version "1.3.10"}}
             :extra-paths ["../chui/resources" "../chui/dev"]}
 
            :test

src/lambdaisland/deep_diff2/diff_impl.cljc

@@ -107,7 +107,7 @@
       (fn [[m idx] k]
         [(cond-> m
            (contains? del idx)
-           (assoc (->Deletion k) (exp k))
+           (assoc (->Deletion k) (get exp k))
 
            (not (contains? del idx))
            (assoc k (diff (get exp k) (get act k)))

test/lambdaisland/deep_diff2/diff_test.cljc

@@ -96,7 +96,9 @@
       (is (= {:a (diff/->Mismatch 1 2)}
              (diff/diff (map->ARecord {:a 1}) (map->ARecord {:a 2}))))
       (is (= {(diff/->Insertion :a) 1}
-             (diff/diff (map->ARecord {}) (map->ARecord {:a 1}))))))
+             (diff/diff (map->ARecord {}) (map->ARecord {:a 1}))))
+      (is (= {(diff/->Deletion :a) 1}
+             (diff/diff (map->ARecord {:a 1}) (map->ARecord {}))))))
 
   (is (= [{:x (diff/->Mismatch 1 2)}]
          (diff/diff [{:x 1}] [{:x 2}])))