From a5bbe765b9395776bf489590637324d48f5c6e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Fri, 25 Apr 2025 13:07:33 +0200 Subject: [PATCH] :wrench: Move style-dictionary and tinycolor to main.data --- .../main/{ui/workspace/tokens => data}/style_dictionary.cljs | 4 ++-- .../src/app/main/{ui/workspace/tokens => data}/tinycolor.cljs | 2 +- frontend/src/app/main/data/workspace/tokens/application.cljs | 4 ++-- frontend/src/app/main/ui/workspace/tokens/form.cljs | 4 ++-- frontend/src/app/main/ui/workspace/tokens/sidebar.cljs | 2 +- frontend/src/app/main/ui/workspace/tokens/token.cljs | 2 +- frontend/src/app/main/ui/workspace/tokens/update.cljs | 4 ++-- frontend/test/frontend_tests/tokens/helpers/state.cljs | 2 +- .../test/frontend_tests/tokens/style_dictionary_test.cljs | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename frontend/src/app/main/{ui/workspace/tokens => data}/style_dictionary.cljs (99%) rename frontend/src/app/main/{ui/workspace/tokens => data}/tinycolor.cljs (97%) diff --git a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs b/frontend/src/app/main/data/style_dictionary.cljs similarity index 99% rename from frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs rename to frontend/src/app/main/data/style_dictionary.cljs index b3e7fe37a3..5960e77119 100644 --- a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs +++ b/frontend/src/app/main/data/style_dictionary.cljs @@ -1,4 +1,4 @@ -(ns app.main.ui.workspace.tokens.style-dictionary +(ns app.main.data.style-dictionary (:require ["@tokens-studio/sd-transforms" :as sd-transforms] ["style-dictionary$default" :as sd] @@ -6,8 +6,8 @@ [app.common.schema :as sm] [app.common.transit :as t] [app.common.types.tokens-lib :as ctob] + [app.main.data.tinycolor :as tinycolor] [app.main.ui.workspace.tokens.errors :as wte] - [app.main.ui.workspace.tokens.tinycolor :as tinycolor] [app.main.ui.workspace.tokens.token :as wtt] [app.main.ui.workspace.tokens.warnings :as wtw] [app.util.time :as dt] diff --git a/frontend/src/app/main/ui/workspace/tokens/tinycolor.cljs b/frontend/src/app/main/data/tinycolor.cljs similarity index 97% rename from frontend/src/app/main/ui/workspace/tokens/tinycolor.cljs rename to frontend/src/app/main/data/tinycolor.cljs index 4a8a68bf1f..2ec94feced 100644 --- a/frontend/src/app/main/ui/workspace/tokens/tinycolor.cljs +++ b/frontend/src/app/main/data/tinycolor.cljs @@ -1,4 +1,4 @@ -(ns app.main.ui.workspace.tokens.tinycolor +(ns app.main.data.tinycolor "Bindings for tinycolor2 which supports a wide range of css compatible colors. This library was chosen as it is already used by StyleDictionary, diff --git a/frontend/src/app/main/data/workspace/tokens/application.cljs b/frontend/src/app/main/data/workspace/tokens/application.cljs index 87b7d22189..1b6ce54049 100644 --- a/frontend/src/app/main/data/workspace/tokens/application.cljs +++ b/frontend/src/app/main/data/workspace/tokens/application.cljs @@ -14,6 +14,8 @@ [app.common.types.tokens-lib :as ctob] [app.main.data.event :as ev] [app.main.data.helpers :as dsh] + [app.main.data.style-dictionary :as sd] + [app.main.data.tinycolor :as tinycolor] [app.main.data.workspace :as udw] [app.main.data.workspace.colors :as wdc] [app.main.data.workspace.shape-layout :as dwsl] @@ -21,8 +23,6 @@ [app.main.data.workspace.transforms :as dwt] [app.main.data.workspace.undo :as dwu] [app.main.store :as st] - [app.main.ui.workspace.tokens.style-dictionary :as sd] - [app.main.ui.workspace.tokens.tinycolor :as tinycolor] [app.main.ui.workspace.tokens.token :as wtt] [beicon.v2.core :as rx] [clojure.set :as set] diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs index 1b11a7a758..58768169b9 100644 --- a/frontend/src/app/main/ui/workspace/tokens/form.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs @@ -12,6 +12,8 @@ [app.common.data.macros :as dm] [app.common.types.tokens-lib :as ctob] [app.main.data.modal :as modal] + [app.main.data.style-dictionary :as sd] + [app.main.data.tinycolor :as tinycolor] [app.main.data.workspace.tokens.application :as dwta] [app.main.data.workspace.tokens.library-edit :as dwtl] [app.main.refs :as refs] @@ -26,8 +28,6 @@ [app.main.ui.workspace.tokens.components.controls.input-token-color-bullet :refer [input-token-color-bullet*]] [app.main.ui.workspace.tokens.components.controls.input-tokens :refer [input-tokens*]] [app.main.ui.workspace.tokens.errors :as wte] - [app.main.ui.workspace.tokens.style-dictionary :as sd] - [app.main.ui.workspace.tokens.tinycolor :as tinycolor] [app.main.ui.workspace.tokens.token :as wtt] [app.main.ui.workspace.tokens.update :as wtu] [app.main.ui.workspace.tokens.warnings :as wtw] diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs index 870618d3d8..abde6140b3 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs @@ -13,6 +13,7 @@ [app.main.data.event :as ev] [app.main.data.modal :as modal] [app.main.data.notifications :as ntf] + [app.main.data.style-dictionary :as sd] [app.main.data.workspace.tokens.application :as dwta] [app.main.data.workspace.tokens.library-edit :as dwtl] [app.main.refs :as refs] @@ -31,7 +32,6 @@ [app.main.ui.workspace.tokens.errors :as wte] [app.main.ui.workspace.tokens.sets :as tsets] [app.main.ui.workspace.tokens.sets-context-menu :refer [token-set-context-menu*]] - [app.main.ui.workspace.tokens.style-dictionary :as sd] [app.main.ui.workspace.tokens.theme-select :refer [theme-select]] [app.main.ui.workspace.tokens.token-pill :refer [token-pill*]] [app.util.array :as array] diff --git a/frontend/src/app/main/ui/workspace/tokens/token.cljs b/frontend/src/app/main/ui/workspace/tokens/token.cljs index 6056d0966b..850dadf507 100644 --- a/frontend/src/app/main/ui/workspace/tokens/token.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/token.cljs @@ -2,7 +2,7 @@ (:require [app.common.data :as d] [app.common.data.macros :as dm] - [app.main.ui.workspace.tokens.tinycolor :as tinycolor] + [app.main.data.tinycolor :as tinycolor] [clojure.set :as set] [cuerdas.core :as str])) diff --git a/frontend/src/app/main/ui/workspace/tokens/update.cljs b/frontend/src/app/main/ui/workspace/tokens/update.cljs index 85924e5f95..79a8bf7a4d 100644 --- a/frontend/src/app/main/ui/workspace/tokens/update.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/update.cljs @@ -11,11 +11,11 @@ [app.common.types.token :as ctt] [app.common.types.tokens-lib :as ctob] [app.main.data.helpers :as dsh] + [app.main.data.style-dictionary :as sd] [app.main.data.workspace.shapes :as dwsh] [app.main.data.workspace.thumbnails :as dwt] [app.main.data.workspace.tokens.application :as dwta] [app.main.data.workspace.undo :as dwu] - [app.main.ui.workspace.tokens.style-dictionary :as wtsd] [app.util.time :as dt] [beicon.v2.core :as rx] [clojure.data :as data] @@ -185,7 +185,7 @@ (when-let [tokens-lib (-> (dsh/lookup-file-data state) (get :tokens-lib))] (let [tokens (-> (ctob/get-active-themes-set-tokens tokens-lib) - (wtsd/resolve-tokens+))] + (sd/resolve-tokens+))] (->> (rx/from tokens) (rx/mapcat (fn [sd-tokens] (let [undo-id (js/Symbol)] diff --git a/frontend/test/frontend_tests/tokens/helpers/state.cljs b/frontend/test/frontend_tests/tokens/helpers/state.cljs index 25fa2805ba..4a6972a9a5 100644 --- a/frontend/test/frontend_tests/tokens/helpers/state.cljs +++ b/frontend/test/frontend_tests/tokens/helpers/state.cljs @@ -2,7 +2,7 @@ (:require [app.common.types.tokens-lib :as ctob] [app.main.data.helpers :as dsh] - [app.main.ui.workspace.tokens.style-dictionary :as sd] + [app.main.data.style-dictionary :as sd] [beicon.v2.core :as rx] [potok.v2.core :as ptk])) diff --git a/frontend/test/frontend_tests/tokens/style_dictionary_test.cljs b/frontend/test/frontend_tests/tokens/style_dictionary_test.cljs index d44756b81f..428c5bdbdd 100644 --- a/frontend/test/frontend_tests/tokens/style_dictionary_test.cljs +++ b/frontend/test/frontend_tests/tokens/style_dictionary_test.cljs @@ -2,7 +2,7 @@ (:require [app.common.transit :as tr] [app.common.types.tokens-lib :as ctob] - [app.main.ui.workspace.tokens.style-dictionary :as sd] + [app.main.data.style-dictionary :as sd] [beicon.v2.core :as rx] [cljs.test :as t :include-macros true] [promesa.core :as p]))