3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-06 06:51:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Parse values with unit

Browse source
This commit is contained in:
Florian Schroedl 2024-08-08 15:12:28 +02:00
parent 2d67a92d64
commit 8b8b909fb7
3 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
View file

@ -6,8 +6,7 @@
[app.main.ui.workspace.tokens.token :as wtt] [app.main.ui.workspace.tokens.token :as wtt]
[cuerdas.core :as str] [cuerdas.core :as str]
[promesa.core :as p] [promesa.core :as p]
[rumext.v2 :as mf] [rumext.v2 :as mf]))
[shadow.resource]))
(def StyleDictionary (def StyleDictionary
"The global StyleDictionary instance used as an external library for now, "The global StyleDictionary instance used as an external library for now,
@ -82,10 +81,12 @@
(fn [acc ^js cur] (fn [acc ^js cur]
(let [id (uuid (.-uuid (.-id cur))) (let [id (uuid (.-uuid (.-id cur)))
origin-token (get tokens id) origin-token (get tokens id)
resolved-value (wtt/parse-token-value (.-value cur)) parsed-value (wtt/parse-token-value (.-value cur))
resolved-token (if (not resolved-value) resolved-token (if (not parsed-value)
(assoc origin-token :errors [:style-dictionary/missing-reference]) (assoc origin-token :errors [:style-dictionary/missing-reference])
(assoc origin-token :resolved-value resolved-value))] (assoc origin-token
:resolved-value (:value parsed-value)
:resolved-unit (:unit parsed-value)))]
(assoc acc (wtt/token-identifier resolved-token) resolved-token))) (assoc acc (wtt/token-identifier resolved-token) resolved-token)))
{} sd-tokens)] {} sd-tokens)]
(when debug? (when debug?
@ -157,9 +158,12 @@
(#(resolve-sd-tokens+ % {:debug? true}))) (#(resolve-sd-tokens+ % {:debug? true})))
(defonce output (atom nil))
(require '[shadow.resource])
(let [example (-> (shadow.resource/inline "./data/example-tokens-set.json") (let [example (-> (shadow.resource/inline "./data/example-tokens-set.json")
(js/JSON.parse) (js/JSON.parse)
.-core)] .-core)]
(resolve-sd-tokens+ example {:debug? true})) (.then (resolve-sd-tokens+ example {:debug? true})
#(reset! output %)))
nil) nil)

11
frontend/src/app/main/ui/workspace/tokens/token.cljs
View file

@ -5,14 +5,15 @@
[cuerdas.core :as str])) [cuerdas.core :as str]))
(def parseable-token-value-regexp (def parseable-token-value-regexp
#"^\s*(-?[0-9]+\.?[0-9]*)\s*$") #"^\s*(-?[0-9]+\.?[0-9]*)(px|%)?\s*$")
(defn parse-token-value [value] (defn parse-token-value [value]
(cond (cond
(number? value) value (number? value) {:value value}
(string? value) (when-let [double-str (-> (re-find parseable-token-value-regexp value) (string? value) (when-let [[_ value unit] (re-find parseable-token-value-regexp value)]
(last))] (when-let [parsed-value (d/parse-double value)]
(d/parse-double double-str)))) {:value parsed-value
:unit unit}))))
(defn find-token-references (defn find-token-references
"Finds token reference values in `value-string` and returns a set with all contained namespaces." "Finds token reference values in `value-string` and returns a set with all contained namespaces."

21
frontend/test/token_tests/token_test.cljs
View file

@ -11,14 +11,19 @@
(t/deftest test-parse-token-value (t/deftest test-parse-token-value
(t/testing "parses double from a token value" (t/testing "parses double from a token value"
(t/is (= 100.1 (wtt/parse-token-value "100.1"))) (t/is (= {:value 100.1 :unit nil} (wtt/parse-token-value "100.1")))
(t/is (= -9 (wtt/parse-token-value "-9"))) (t/is (= {:value -9 :unit nil} (wtt/parse-token-value "-9"))))
(t/testing "trims white-space" (t/testing "trims white-space"
(t/is (= -1.3 (wtt/parse-token-value " -1.3 ")))) (t/is (= {:value -1.3 :unit nil} (wtt/parse-token-value " -1.3 "))))
(t/testing "returns nil for any invalid characters" (t/testing "parses unit: px"
(t/is (nil? (wtt/parse-token-value " -1.3a ")))) (t/is (= {:value 70.3 :unit "px"} (wtt/parse-token-value " 70.3px "))))
(t/testing "doesnt accept invalid double" (t/testing "parses unit: %"
(t/is (nil? (wtt/parse-token-value ".3")))))) (t/is (= {:value -10 :unit "%"} (wtt/parse-token-value "-10%"))))
(t/testing "parses unit: px")
(t/testing "returns nil for any invalid characters"
(t/is (nil? (wtt/parse-token-value " -1.3a "))))
(t/testing "doesnt accept invalid double"
(t/is (nil? (wtt/parse-token-value ".3")))))
(t/deftest find-token-references (t/deftest find-token-references
(t/testing "finds references inside curly braces in a string" (t/testing "finds references inside curly braces in a string"