Adding greedy-merge and greed-distinct-merge

Author: RacecarBTF

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.2
+- Adding `greedy-merge` and `greedy-distinct-merge`, and adding documentation for these methods
+
 ## 0.1.1
 - Accidentally made `index-merge-with` private
 

README.md

@@ -13,7 +13,11 @@ At this point, merging is divided into 3 types of comparisons:
   * `concat-merge`/`concat-merge-with` - Puts all items into one vector
   * `distinct-merge`/`distinct-merge-with` - Puts all items into one deduplicated vector
   * `index-merge`/`index-merge-with` - Handled with recursive calls using all values at each index and puts the results in a vector
-* **Other** - All functions that end with `-with` take a first parameter of a function that will handle these situations. All functions that lack this ending use the value from the last argument passed in
+* **Other**
+  * All functions that end with `-with` take a first parameter of a function that will handle these situations. All functions that lack this ending use the value from the last argument passed in
+  * There are two other special merge methods that handle these scenarios
+    * `greedy-merge` - Does a `concat-merge-with` and puts other values into a single vector
+    * `greedy-distinct-merge` - Does a `distinct-merge-with` and puts other values into a single deduplicated vector
 
 ## Merge Requests
 In order to make recommendations to this library, either please

project.clj

@@ -1,8 +1,8 @@
-(defproject clojure-deep-merge "0.1.1"
+(defproject clojure-deep-merge "0.1.2"
   :url "https://github.com/JasonStiefel/clojure-deep-merge"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.8.0"]]
+  :dependencies [[org.clojure/clojure "1.10.0"]]
   :main ^:skip-aot clojure-deep-merge.core
   :target-path "target/%s"
   :profiles {:uberjar {:aot :all}})

src/deep/merge.clj

@@ -43,8 +43,10 @@
 ;;;;;;;;;;;;;;;;;;;;;
 (def concat-merge-with (partial deep-coll-merge-with concat-coll-merge))
 (def concat-merge (partial concat-merge-with #(last %&)))
+(def greedy-merge (partial concat-merge-with #(into [] %&)))
 (def distinct-merge-with (partial deep-coll-merge-with distinct-concat-coll-merge))
 (def distinct-merge (partial distinct-merge-with #(last %&)))
+(def greedy-distinct-merge (partial distinct-merge-with #(into [] (distinct %&))))
 (defn index-merge-with
   [non-collection-merge-method & vals]
   (apply deep-coll-merge-with (partial index-coll-merge non-collection-merge-method) non-collection-merge-method vals))