Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-08 08:09:14 -05:00
Code Issues Activity

🔧 Make tokens again a flat ordered map

Browse source
This commit is contained in:
Andrés Moya 2024-09-17 00:51:33 +02:00
parent 5f703d6a79
commit 0e15da5ede
3 changed files with 76 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/src/app/common/data.cljc
View file

@ -78,9 +78,9 @@
(declare index-of) (declare index-of)
#_(defn oassoc-before (defn oassoc-before
"Assoc a k v pair, in the order position just before the other key" "Assoc a k v pair, in the order position just before the other key"
[o k v before-k] [o before-k k v]
(if-let [index (index-of (keys o) before-k)] (if-let [index (index-of (keys o) before-k)]
(-> (ordered-map) (-> (ordered-map)
(into (take index o)) (into (take index o))
@ -89,12 +89,12 @@
(oassoc o k v))) (oassoc o k v)))
(defn oassoc-in-before (defn oassoc-in-before
[o [old-k & old-ks] [k & ks] v] [o [before-k & before-ks] [k & ks] v]
(if-let [index (index-of (keys o) old-k)] (if-let [index (index-of (keys o) before-k)]
(let [new-v (if ks (let [new-v (if ks
(oassoc-in-before (get o k) old-ks ks v) (oassoc-in-before (get o k) before-ks ks v)
v)] v)]
(if (= k old-k) (if (= k before-k)
(-> (ordered-map) (-> (ordered-map)
(into (take index o)) (into (take index o))
(assoc k new-v) (assoc k new-v)

72
common/src/app/common/types/tokens_lib.cljc
View file

@ -142,56 +142,41 @@
ITokenSet ITokenSet
(add-token [_ token] (add-token [_ token]
(dm/assert! "expected valid token" (check-token! token)) (dm/assert! "expected valid token" (check-token! token))
(let [path (split-path (:name token) ".")] (TokenSet. name
(TokenSet. name description
description (dt/now)
(dt/now) (assoc tokens (:name token) token)))
(d/oassoc-in tokens path token))))
(update-token [this token-name f] (update-token [this token-name f]
(let [path (split-path token-name ".") (if-let [token (get tokens token-name)]
token (get-in tokens path)] (let [token' (-> (make-token (f token))
(if token (assoc :modified-at (dt/now)))]
(let [token' (-> (make-token (f token)) (check-token! token')
(assoc :modified-at (dt/now))) (TokenSet. name
path' (get-path token' ".")] description
(check-token! token') (dt/now)
(TokenSet. name (if (= (:name token) (:name token'))
description (assoc tokens (:name token') token')
(dt/now) (-> tokens
(if (= (:name token) (:name token')) (d/oassoc-before (:name token) (:name token') token')
(d/oassoc-in tokens path token') (dissoc (:name token))))))
(-> tokens this))
(d/oassoc-in-before path path' token')
(d/dissoc-in path)))))
this)))
(delete-token [_ token-name] (delete-token [_ token-name]
(let [path (split-path token-name ".")] (TokenSet. name
(TokenSet. name description
description (dt/now)
(dt/now) (dissoc tokens token-name)))
(d/dissoc-in tokens path))))
(get-tokens [_] (get-tokens [_]
(->> (tree-seq d/ordered-map? vals tokens) (vals tokens)))
(filter (partial instance? Token)))))
(def schema:token-node
[:schema {:registry {::node [:or ::token
[:and
[:map-of {:gen/max 5} :string [:ref ::node]]
[:fn d/ordered-map?]]]}}
[:ref ::node]])
(sm/register! ::token-node schema:token-node)
(def schema:token-set (def schema:token-set
[:and [:map {:title "TokenSet"} [:and [:map {:title "TokenSet"}
[:name :string] [:name :string]
[:description [:maybe :string]] [:description [:maybe :string]]
[:modified-at ::sm/inst] [:modified-at ::sm/inst]
[:tokens [:and [:map-of {:gen/max 5} :string ::token-node] [:tokens [:and [:map-of {:gen/max 5} :string ::token]
[:fn d/ordered-map?]]]] [:fn d/ordered-map?]]]]
[:fn (partial instance? TokenSet)]]) [:fn (partial instance? TokenSet)]])
@ -239,10 +224,19 @@
(get-set [_ set-name] "get one set looking for name") (get-set [_ set-name] "get one set looking for name")
(get-set-group [_ set-group-path] "get the attributes of a set group")) (get-set-group [_ set-group-path] "get the attributes of a set group"))
(def schema:token-set-node
[:schema {:registry {::node [:or ::token-set
[:and
[:map-of {:gen/max 5} :string [:ref ::node]]
[:fn d/ordered-map?]]]}}
[:ref ::node]])
(sm/register! ::token-set-node schema:token-set-node)
(def schema:token-sets (def schema:token-sets
[:and [:and
[:map-of {:title "TokenSets"} [:map-of {:title "TokenSets"}
:string ::token-set] :string ::token-set-node]
[:fn d/ordered-map?]]) [:fn d/ordered-map?]])
(sm/register! ::token-sets schema:token-sets) (sm/register! ::token-sets schema:token-sets)

126
common/test/common_tests/types/tokens_lib_test.cljc
View file

@ -425,49 +425,49 @@
(t/testing "grouping" (t/testing "grouping"
(t/deftest split-and-join (t/deftest split-and-join
(let [name "group.subgroup.name" (let [name "group/subgroup/name"
path (ctob/split-path name ".") path (ctob/split-path name "/")
name' (ctob/join-path path ".")] name' (ctob/join-path path "/")]
(t/is (= (first path) "group")) (t/is (= (first path) "group"))
(t/is (= (second path) "subgroup")) (t/is (= (second path) "subgroup"))
(t/is (= (nth path 2) "name")) (t/is (= (nth path 2) "name"))
(t/is (= name' name)))) (t/is (= name' name))))
(t/deftest remove-spaces (t/deftest remove-spaces
(let [name "group . subgroup . name" (let [name "group / subgroup / name"
path (ctob/split-path name ".")] path (ctob/split-path name "/")]
(t/is (= (first path) "group")) (t/is (= (first path) "group"))
(t/is (= (second path) "subgroup")) (t/is (= (second path) "subgroup"))
(t/is (= (nth path 2) "name")))) (t/is (= (nth path 2) "name"))))
(t/deftest group-and-ungroup (t/deftest group-and-ungroup
(let [token1 (ctob/make-token :name "token1" :type :boolean :value true) (let [token-set1 (ctob/make-token-set :name "token-set1")
token2 (ctob/make-token :name "some group.token2" :type :boolean :value true) token-set2 (ctob/make-token-set :name "some group/token-set2")
token1' (ctob/group-item token1 "big group" ".") token-set1' (ctob/group-item token-set1 "big group" "/")
token2' (ctob/group-item token2 "big group" ".") token-set2' (ctob/group-item token-set2 "big group" "/")
token1'' (ctob/ungroup-item token1' ".") token-set1'' (ctob/ungroup-item token-set1' "/")
token2'' (ctob/ungroup-item token2' ".")] token-set2'' (ctob/ungroup-item token-set2' "/")]
(t/is (= (:name token1') "big group.token1")) (t/is (= (:name token-set1') "big group/token-set1"))
(t/is (= (:name token2') "big group.some group.token2")) (t/is (= (:name token-set2') "big group/some group/token-set2"))
(t/is (= (:name token1'') "token1")) (t/is (= (:name token-set1'') "token-set1"))
(t/is (= (:name token2'') "some group.token2")))) (t/is (= (:name token-set2'') "some group/token-set2"))))
(t/deftest get-groups-str (t/deftest get-groups-str
(let [token1 (ctob/make-token :name "token1" :type :boolean :value true) (let [token-set1 (ctob/make-token-set :name "token-set1")
token2 (ctob/make-token :name "some-group.token2" :type :boolean :value true) token-set2 (ctob/make-token-set :name "some-group/token-set2")
token3 (ctob/make-token :name "some-group.some-subgroup.token3" :type :boolean :value true)] token-set3 (ctob/make-token-set :name "some-group/some-subgroup/token-set3")]
(t/is (= (ctob/get-groups-str token1 ".") "")) (t/is (= (ctob/get-groups-str token-set1 "/") ""))
(t/is (= (ctob/get-groups-str token2 ".") "some-group")) (t/is (= (ctob/get-groups-str token-set2 "/") "some-group"))
(t/is (= (ctob/get-groups-str token3 ".") "some-group.some-subgroup")))) (t/is (= (ctob/get-groups-str token-set3 "/") "some-group/some-subgroup"))))
(t/deftest get-final-name (t/deftest get-final-name
(let [token1 (ctob/make-token :name "token1" :type :boolean :value true) (let [token-set1 (ctob/make-token-set :name "token-set1")
token2 (ctob/make-token :name "some-group.token2" :type :boolean :value true) token-set2 (ctob/make-token-set :name "some-group/token-set2")
token3 (ctob/make-token :name "some-group.some-subgroup.token3" :type :boolean :value true)] token-set3 (ctob/make-token-set :name "some-group/some-subgroup/token-set3")]
(t/is (= (ctob/get-final-name token1 ".") "token1")) (t/is (= (ctob/get-final-name token-set1 "/") "token-set1"))
(t/is (= (ctob/get-final-name token2 ".") "token2")) (t/is (= (ctob/get-final-name token-set2 "/") "token-set2"))
(t/is (= (ctob/get-final-name token3 ".") "token3")))) (t/is (= (ctob/get-final-name token-set3 "/") "token-set3"))))
(t/testing "grouped tokens" (t/testing "grouped tokens"
(t/deftest grouped-tokens (t/deftest grouped-tokens
@ -495,56 +495,14 @@
:value true))) :value true)))
set (ctob/get-set tokens-lib "test-token-set") set (ctob/get-set tokens-lib "test-token-set")
tokens-list (ctob/get-tokens set) tokens-list (vals (:tokens set))]
tokens-tree (:tokens set)
[node-token1 node-group1 node-group2]
(ctob/get-children tokens-tree)
[node-token2 node-token3 node-subgroup11]
(ctob/get-children (second node-group1))
[node-token4]
(ctob/get-children (second node-subgroup11))
[node-token5]
(ctob/get-children (second node-group2))]
(t/is (= (count tokens-list) 5)) (t/is (= (count tokens-list) 5))
(t/is (= (:name (nth tokens-list 0)) "token1")) (t/is (= (:name (nth tokens-list 0)) "token1"))
(t/is (= (:name (nth tokens-list 1)) "group1.token2")) (t/is (= (:name (nth tokens-list 1)) "group1.token2"))
(t/is (= (:name (nth tokens-list 2)) "group1.token3")) (t/is (= (:name (nth tokens-list 2)) "group1.token3"))
(t/is (= (:name (nth tokens-list 3)) "group1.subgroup11.token4")) (t/is (= (:name (nth tokens-list 3)) "group1.subgroup11.token4"))
(t/is (= (:name (nth tokens-list 4)) "group2.token5")) (t/is (= (:name (nth tokens-list 4)) "group2.token5"))))
(t/is (= (first node-token1) "token1"))
(t/is (= (ctob/group? (second node-token1)) false))
(t/is (= (:name (second node-token1)) "token1"))
(t/is (= (first node-group1) "group1"))
(t/is (= (ctob/group? (second node-group1)) true))
(t/is (= (count (second node-group1)) 3))
(t/is (= (first node-token2) "token2"))
(t/is (= (ctob/group? (second node-token2)) false))
(t/is (= (:name (second node-token2)) "group1.token2"))
(t/is (= (first node-token3) "token3"))
(t/is (= (ctob/group? (second node-token3)) false))
(t/is (= (:name (second node-token3)) "group1.token3"))
(t/is (= (first node-subgroup11) "subgroup11"))
(t/is (= (ctob/group? (second node-subgroup11)) true))
(t/is (= (count (second node-subgroup11)) 1))
(t/is (= (first node-token4) "token4"))
(t/is (= (ctob/group? (second node-token4)) false))
(t/is (= (:name (second node-token4)) "group1.subgroup11.token4"))
(t/is (= (first node-token5) "token5"))
(t/is (= (ctob/group? (second node-token5)) false))
(t/is (= (:name (second node-token5)) "group2.token5"))))
(t/deftest update-token-in-groups (t/deftest update-token-in-groups
(let [tokens-lib (-> (ctob/make-tokens-lib) (let [tokens-lib (-> (ctob/make-tokens-lib)
@ -571,13 +529,10 @@
token-set (ctob/get-set tokens-lib "test-token-set") token-set (ctob/get-set tokens-lib "test-token-set")
token-set' (ctob/get-set tokens-lib' "test-token-set") token-set' (ctob/get-set tokens-lib' "test-token-set")
group1' (get-in token-set' [:tokens "group1"]) token (get-in token-set [:tokens "group1.test-token-2"])
token (get-in token-set [:tokens "group1" "test-token-2"]) token' (get-in token-set' [:tokens "group1.test-token-2"])]
token' (get-in token-set' [:tokens "group1" "test-token-2"])]
(t/is (= (ctob/set-count tokens-lib') 1)) (t/is (= (ctob/set-count tokens-lib') 1))
(t/is (= (count group1') 2))
(t/is (= (d/index-of (keys group1') "test-token-2") 0))
(t/is (= (:name token') "group1.test-token-2")) (t/is (= (:name token') "group1.test-token-2"))
(t/is (= (:description token') "some description")) (t/is (= (:description token') "some description"))
(t/is (= (:value token') false)) (t/is (= (:value token') false))
@ -608,13 +563,10 @@
token-set (ctob/get-set tokens-lib "test-token-set") token-set (ctob/get-set tokens-lib "test-token-set")
token-set' (ctob/get-set tokens-lib' "test-token-set") token-set' (ctob/get-set tokens-lib' "test-token-set")
group1' (get-in token-set' [:tokens "group1"]) token (get-in token-set [:tokens "group1.test-token-2"])
token (get-in token-set [:tokens "group1" "test-token-2"]) token' (get-in token-set' [:tokens "group1.updated-name"])]
token' (get-in token-set' [:tokens "group1" "updated-name"])]
(t/is (= (ctob/set-count tokens-lib') 1)) (t/is (= (ctob/set-count tokens-lib') 1))
(t/is (= (count group1') 2))
(t/is (= (d/index-of (keys group1') "updated-name") 0))
(t/is (= (:name token') "group1.updated-name")) (t/is (= (:name token') "group1.updated-name"))
(t/is (= (:description token') nil)) (t/is (= (:description token') nil))
(t/is (= (:value token') true)) (t/is (= (:value token') true))
@ -645,15 +597,11 @@
token-set (ctob/get-set tokens-lib "test-token-set") token-set (ctob/get-set tokens-lib "test-token-set")
token-set' (ctob/get-set tokens-lib' "test-token-set") token-set' (ctob/get-set tokens-lib' "test-token-set")
group1' (get-in token-set' [:tokens "group1"]) token (get-in token-set [:tokens "group1.test-token-2"])
group2' (get-in token-set' [:tokens "group2"]) token' (get-in token-set' [:tokens "group2.updated-name"])]
token (get-in token-set [:tokens "group1" "test-token-2"])
token' (get-in token-set' [:tokens "group2" "updated-name"])]
(t/is (= (ctob/set-count tokens-lib') 1)) (t/is (= (ctob/set-count tokens-lib') 1))
(t/is (= (count group1') 1)) (t/is (= (d/index-of (keys (:tokens token-set')) "group2.updated-name") 1))
(t/is (= (count group2') 1))
(t/is (= (d/index-of (keys group2') "updated-name") 0))
(t/is (= (:name token') "group2.updated-name")) (t/is (= (:name token') "group2.updated-name"))
(t/is (= (:description token') nil)) (t/is (= (:description token') nil))
(t/is (= (:value token') true)) (t/is (= (:value token') true))
@ -676,7 +624,7 @@
token-set (ctob/get-set tokens-lib "test-token-set") token-set (ctob/get-set tokens-lib "test-token-set")
token-set' (ctob/get-set tokens-lib' "test-token-set") token-set' (ctob/get-set tokens-lib' "test-token-set")
token' (get-in token-set' [:tokens "group1" "test-token-2"])] token' (get-in token-set' [:tokens "group1.test-token-2"])]
(t/is (= (ctob/set-count tokens-lib') 1)) (t/is (= (ctob/set-count tokens-lib') 1))
(t/is (= (count (:tokens token-set')) 1)) (t/is (= (count (:tokens token-set')) 1))