🔧 Make TokenSet an abstract data type

This commit is contained in:
Andrés Moya 2025-06-02 18:31:41 +02:00 committed by Andrés Moya
parent 6de9de9e38
commit f0f01af55c
10 changed files with 246 additions and 161 deletions

View file

@ -175,7 +175,7 @@
ptk/WatchEvent
(watch [it state _]
(let [data (dsh/lookup-file-data state)
name (ctob/normalize-set-name name (:name token-set))
name (ctob/normalize-set-name name (ctob/get-name token-set))
tokens-lib (get data :tokens-lib)]
(if (ctob/get-set tokens-lib name)
@ -185,7 +185,7 @@
:timeout 9000}))
(let [changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/rename-token-set (:name token-set) name))]
(pcb/rename-token-set (ctob/get-name token-set) name))]
(rx/of (set-selected-token-set-name name)
(dch/commit-changes changes))))))))
@ -202,7 +202,7 @@
(when-let [set (ctob/duplicate-set name tokens-lib {:suffix suffix})]
(let [changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/set-token-set (:name set) is-group set))]
(pcb/set-token-set (ctob/get-name set) is-group set))]
(rx/of (set-selected-token-set-name name)
(dch/commit-changes changes))))))))
@ -346,7 +346,7 @@
token-type (:type token)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/set-token (:name token-set)
(pcb/set-token (ctob/get-name token-set)
(:name token)
token))]
@ -371,7 +371,7 @@
token-type (:type token)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/set-token (:name token-set)
(pcb/set-token (ctob/get-name token-set)
(:name token)
token'))]

View file

@ -17,7 +17,7 @@
(get :tokens-lib)
(ctob/get-sets)
(first)
:name)))
(ctob/get-name))))
(defn get-selected-token-set [state]
(when-let [set-name (get-selected-token-set-name state)]
@ -31,4 +31,4 @@
(defn get-all-tokens-in-selected-set [state]
(some-> (get-selected-token-set state)
:tokens))
(ctob/get-tokens-map)))

View file

@ -80,7 +80,7 @@
;; select the first one from the list of sets
selected-token-set-tokens
(when selected-token-set
(get selected-token-set :tokens))
(ctob/get-tokens-map selected-token-set))
tokens
(mf/with-memo [active-theme-tokens selected-token-set-tokens]
@ -120,7 +120,7 @@
(not (ctob/get-set tokens-lib selected-token-set-name)))))
(let [match (->> (ctob/get-sets tokens-lib)
(first)
(:name))]
(ctob/get-name))]
(st/emit! (dwtl/set-selected-token-set-name match)))))
[:*

View file

@ -212,7 +212,7 @@
[{:keys [id set label tree-depth tree-path tree-index is-selected is-active is-draggable is-editing
on-select on-drop on-toggle on-start-edition on-reset-edition on-edit-submit]}]
(let [set-name (get set :name)
(let [set-name (ctob/get-name set)
can-edit? (mf/use-ctx ctx/can-edit?)
on-click