github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-25 23:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Rename :tokens-file to :tokens-source

Browse Source
This commit is contained in:
Andrés Moya 2026-07-23 11:38:09 +02:00
parent fcbeab7855
commit fdb5970165
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/app/common/files/changes.cljc
View File

@ -432,9 +432,9 @@
[:type [:= :set-base-font-size]]
[:base-font-size :string]]]
[:set-tokens-file
[:map {:title "SetTokensFile"}
[:type [:= :set-tokens-file]]
[:set-tokens-source
[:map {:title "SetTokensSource"}
[:type [:= :set-tokens-source]]
[:file-id ::sm/uuid]
[:library-id [:maybe ::sm/uuid]]]]])
@ -1070,9 +1070,9 @@
[data {:keys [base-font-size]}]
(ctf/set-base-font-size data base-font-size))
(defmethod process-change :set-tokens-file
(defmethod process-change :set-tokens-source
[data {:keys [library-id]}]
(cfo/set-tokens-file data library-id))
(cfo/set-tokens-source data library-id))
;; === Operations

8
common/src/app/common/files/changes_builder.cljc
View File

@ -1089,17 +1089,17 @@
:base-font-size previous-font-size})
(apply-changes-local))))
(defn set-tokens-file
(defn set-tokens-source
[changes library-id]
(assert-file-data! changes)
(let [file-data (::file-data (meta changes))
file-id (:id file-data)
prev-val (:tokens-file file-data)]
prev-val (:tokens-source file-data)]
(-> changes
(update :redo-changes conj {:type :set-tokens-file
(update :redo-changes conj {:type :set-tokens-source
:file-id file-id
:library-id library-id})
(update :undo-changes conj {:type :set-tokens-file
(update :undo-changes conj {:type :set-tokens-source
:file-id file-id
:library-id prev-val})
(apply-changes-local))))

14
common/src/app/common/files/tokens.cljc
View File

@ -453,22 +453,22 @@
:active-set-ids active-set-ids)))
(defn ensure-tokens-lib
"Ensure file-data has a :tokens-lib or :tokens-file, and also a :tokens-status, creating them if necessary."
"Ensure file-data has a :tokens-lib or :tokens-source, and also a :tokens-status, creating them if necessary."
[file-data]
(cond-> file-data
(nil? (:tokens-file file-data))
(nil? (:tokens-source file-data))
(update :tokens-lib #(or % (ctob/make-tokens-lib)))
:always
(update :tokens-status #(or % (ctos/make-tokens-status)))))
(defn get-tokens-file
(defn get-tokens-source
[file-data]
(:tokens-file file-data))
(:tokens-source file-data))
(defn set-tokens-file
[file-data tokens-file]
(assoc file-data :tokens-file tokens-file))
(defn set-tokens-source
[file-data tokens-source]
(assoc file-data :tokens-source tokens-source))
(defn get-tokens-lib
[file-data]

2
common/src/app/common/types/file.cljc
View File

@ -87,7 +87,7 @@
[:components {:optional true} schema:components]
[:typographies {:optional true} schema:typographies]
[:plugin-data {:optional true} schema:plugin-data]
[:tokens-file {:optional true} ::sm/uuid] ;; The tokens-lib may be in this file or in an external library
[:tokens-source {:optional true} ::sm/uuid] ;; The tokens-lib may be in this file or in an external library
[:tokens-lib {:optional true} ctob/schema:tokens-lib]
[:tokens-status {:optional true} ctos/schema:tokens-status]])

40
common/test/common_tests/files/tokens_test.cljc
View File

@ -234,26 +234,26 @@
(t/is (contains? file-data' :tokens-status))
(t/is (ctos/tokens-status? (:tokens-status file-data')))))
(t/testing "ensure-tokens-lib should not add a tokens-lib if there is a tokens-file"
(let [tokens-file (uuid/next)
(t/testing "ensure-tokens-lib should not add a tokens-lib if there is a tokens-source"
(let [tokens-source (uuid/next)
tokens-status (ctos/make-tokens-status)
file (-> (thf/sample-file :file1)
(assoc-in [:data :tokens-file] tokens-file)
(assoc-in [:data :tokens-source] tokens-source)
(assoc-in [:data :tokens-status] tokens-status))
file-data (ctf/file-data file)
file-data' (cfo/ensure-tokens-lib file-data)]
(t/is (not (contains? file-data' :tokens-lib)))
(t/is (= tokens-file (:tokens-file file-data')))
(t/is (= tokens-source (:tokens-source file-data')))
(t/is (= tokens-status (:tokens-status file-data')))))
(t/testing "ensure-tokens-lib should not add a tokens-lib if there is a tokens-file, but should add a tokens-status if it's missing"
(let [tokens-file (uuid/next)
(t/testing "ensure-tokens-lib should not add a tokens-lib if there is a tokens-source, but should add a tokens-status if it's missing"
(let [tokens-source (uuid/next)
file (-> (thf/sample-file :file1)
(assoc-in [:data :tokens-file] tokens-file))
(assoc-in [:data :tokens-source] tokens-source))
file-data (ctf/file-data file)
file-data' (cfo/ensure-tokens-lib file-data)]
(t/is (not (contains? file-data' :tokens-lib)))
(t/is (= tokens-file (:tokens-file file-data')))
(t/is (= tokens-source (:tokens-source file-data')))
(t/is (contains? file-data' :tokens-status))
(t/is (ctos/tokens-status? (:tokens-status file-data'))))))
@ -266,21 +266,21 @@
(t/testing "returns nil when no tokens-lib"
(t/is (nil? (cfo/get-tokens-lib {})))))
(t/deftest test-get-tokens-file
(t/testing "returns tokens-file from file data"
(let [file-id (thi/new-id! :tokens-file)
file-data {:tokens-file file-id}]
(t/is (= file-id (cfo/get-tokens-file file-data)))))
(t/deftest test-get-tokens-source
(t/testing "returns tokens-source from file data"
(let [file-id (thi/new-id! :tokens-source)
file-data {:tokens-source file-id}]
(t/is (= file-id (cfo/get-tokens-source file-data)))))
(t/testing "returns nil when no tokens-file"
(t/is (nil? (cfo/get-tokens-file {})))))
(t/testing "returns nil when no tokens-source"
(t/is (nil? (cfo/get-tokens-source {})))))
(t/deftest test-set-tokens-file
(t/testing "sets tokens-file on file data"
(let [file-id (thi/new-id! :tokens-file)
(t/deftest test-set-tokens-source
(t/testing "sets tokens-source on file data"
(let [file-id (thi/new-id! :tokens-source)
file-data {:other :data}
file-data' (cfo/set-tokens-file file-data file-id)]
(t/is (= file-id (:tokens-file file-data')))
file-data' (cfo/set-tokens-source file-data file-id)]
(t/is (= file-id (:tokens-source file-data')))
(t/is (= :data (:other file-data'))))))
(t/deftest test-get-tokens-status

10
frontend/src/app/main/data/helpers.cljs
View File

@ -38,16 +38,16 @@
([state file-id]
(dm/get-in state [:files file-id :data])))
(defn lookup-tokens-file-data
(defn lookup-tokens-source-data
[state]
(let [current-file-data (lookup-file-data state)
tokens-file-id (or (cfo/get-tokens-file current-file-data) (:id current-file-data))]
(lookup-file-data state tokens-file-id)))
tokens-source-id (or (cfo/get-tokens-source current-file-data) (:id current-file-data))]
(lookup-file-data state tokens-source-id)))
(defn lookup-tokens-lib
[state]
(let [tokens-file-data (lookup-tokens-file-data state)]
(cfo/get-tokens-lib tokens-file-data)))
(let [tokens-source-data (lookup-tokens-source-data state)]
(cfo/get-tokens-lib tokens-source-data)))
(defn lookup-tokens-status
[state]

2
frontend/src/app/main/data/workspace/libraries.cljs
View File

@ -1631,7 +1631,7 @@
(when (contains? cf/flags :token-lib-sync)
(rx/of (dch/commit-changes (-> (pcb/empty-changes nil)
(pcb/with-file-data file-data)
(pcb/set-tokens-file library-id)))))
(pcb/set-tokens-source library-id)))))
(->> (rp/cmd! :link-file-to-library {:file-id file-id :library-id library-id})
(rx/merge-map (fn [libraries-to-load]
(as-> libraries-to-load $

2
frontend/src/app/main/data/workspace/tokens/library_edit.cljs
View File

@ -278,7 +278,7 @@
(ptk/reify ::toggle-token-theme-active
ptk/WatchEvent
(watch [it state _]
(let [data (dsh/lookup-tokens-file-data state)
(let [data (dsh/lookup-tokens-source-data state)
tokens-status (dsh/lookup-tokens-status state)
tokens-lib (dsh/lookup-tokens-lib state)
changes (-> (pcb/empty-changes it)