luciano/specter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support transforms to NONE for set-elem and map-key

Browse source
This commit is contained in:
nathanmarz 2017-05-07 20:30:50 -04:00
parent 2dd6432c69
commit 426873da98
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/clj/com/rpl/specter.cljc
View file

@ -870,7 +870,8 @@
(defrichnav (defrichnav
^{:doc "Navigates to the given key in the map (not to the value). Navigates only if the ^{:doc "Navigates to the given key in the map (not to the value). Navigates only if the
key currently exists in the map."} key currently exists in the map. Can transform to NONE to remove the key/value
pair from the map."}
map-key map-key
[key] [key]
(select* [this vals structure next-fn] (select* [this vals structure next-fn]
@ -881,14 +882,17 @@
(transform* [this vals structure next-fn] (transform* [this vals structure next-fn]
(if (contains? structure key) (if (contains? structure key)
(let [newkey (next-fn vals key) (let [newkey (next-fn vals key)
oldval (get structure key)] dissoced (dissoc structure key)]
(-> structure (dissoc key) (assoc newkey oldval)) (if (identical? NONE newkey)
) dissoced
(assoc dissoced newkey (get structure key))
))
structure structure
))) )))
(defrichnav (defrichnav
^{:doc "Navigates to the given element in the set only if it exists in the set."} ^{:doc "Navigates to the given element in the set only if it exists in the set.
Can transform to NONE to remove the element from the set."}
set-elem set-elem
[elem] [elem]
(select* [this vals structure next-fn] (select* [this vals structure next-fn]
@ -898,7 +902,12 @@
)) ))
(transform* [this vals structure next-fn] (transform* [this vals structure next-fn]
(if (contains? structure elem) (if (contains? structure elem)
(-> structure (disj elem) (conj (next-fn vals elem))) (let [newelem (next-fn vals elem)
removed (disj structure elem)]
(if (identical? NONE newelem)
removed
(conj removed newelem)
))
structure structure
))) )))

2
test/com/rpl/specter/core_test.cljc
View file

@ -1531,12 +1531,14 @@
(is (= {:c 3} (setval (s/map-key :a) :b {:c 3}))) (is (= {:c 3} (setval (s/map-key :a) :b {:c 3})))
(is (= {:b 2} (setval (s/map-key :a) :b {:a 2}))) (is (= {:b 2} (setval (s/map-key :a) :b {:a 2})))
(is (= {:b 2} (setval (s/map-key :a) :b {:a 2 :b 1}))) (is (= {:b 2} (setval (s/map-key :a) :b {:a 2 :b 1})))
(is (= {:b 2} (setval (s/map-key :a) s/NONE {:a 1 :b 2})))
) )
(deftest set-elem-test (deftest set-elem-test
(is (= #{:b :d} (setval (s/set-elem :a) :x #{:b :d}))) (is (= #{:b :d} (setval (s/set-elem :a) :x #{:b :d})))
(is (= #{:x :a} (setval (s/set-elem :b) :x #{:b :a}))) (is (= #{:x :a} (setval (s/set-elem :b) :x #{:b :a})))
(is (= #{:a} (setval (s/set-elem :b) :a #{:b :a}))) (is (= #{:a} (setval (s/set-elem :b) :a #{:b :a})))
(is (= #{:b} (setval (s/set-elem :a) s/NONE #{:a :b})))
) )
#?(:clj #?(:clj