CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-14 14:27:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Use tdd to resolve parsing token

Browse Source
This commit is contained in:
Eva Marco
2026-03-10 13:00:40 +01:00
parent 90a0b46bb5
commit 52897d4232
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
common/src/app/common/types/token.cljc
View File

@@ -607,7 +607,8 @@
"400" #{"book" "normal" "buch" "regular"},
"500" #{"kräftig" "medium" "kraeftig"},
"600" #{"demi-bold" "halbfett" "demibold" "demi bold" "semibold" "semi bold" "semi-bold"},
"700" #{"dreiviertelfett" "bold"},
"700" #{"dreivi
ertelfett" "bold"},
"800" #{"extrabold" "fett" "extra-bold" "ultrabold" "ultra-bold" "extra bold" "ultra bold"},
"900" #{"heavy" "black" "extrafett"},
"950" #{"extra-black" "extra black" "ultra-black" "ultra black"}})
@@ -637,3 +638,42 @@
(when (font-weight-values weight)
(cond-> {:weight weight}
italic? (assoc :style "italic")))))
(defn inside-ref?
[value position]
(let [left-part (str/slice value 0 position)
last-index-open (str/last-index-of left-part "{")
last-index-close (str/last-index-of left-part "}")]
(cond
(and (nil? last-index-open) (nil? last-index-close)) false
(and (nil? last-index-open) (some? last-index-close)) false
(and (some? last-index-open) (nil? last-index-close)) true
:else
(< last-index-close last-index-open))))
(defn start-ref-position
[value position]
(let [left-part (str/slice value 0 position)
last-index-open (str/last-index-of left-part "{")]
last-index-open))
(defn end-ref-position
[value position]
(let [right-part (str/slice value position)
next-index-close (str/index-of right-part "}")]
(if (some? next-index-close)
(+ position next-index-close 1)
position)))
(defn insert-ref
[value position name]
(let [reference (str "{" name "}")]
(if (inside-ref? value position)
(let [first-part (str/slice value 0 (start-ref-position value position))
second-part (str/slice value (end-ref-position value position))]
{:result (str first-part reference second-part)
:position (+ (count first-part) (count reference))})
(let [first-part (str/slice value 0 position)
second-part (str/slice value position)]
{:result (str first-part reference second-part)
:position (+ position (count reference))}))))

18
common/test/common_tests/types/token_test.cljc
View File

@@ -24,3 +24,21 @@
(t/is (false? (sm/validate cto/schema:token-name "Hey Foo.Bar")))
(t/is (false? (sm/validate cto/schema:token-name "Hey😈Foo.Bar")))
(t/is (false? (sm/validate cto/schema:token-name "Hey%Foo.Bar"))))
(t/deftest token-value-with-refs
(t/testing "empty value"
(t/is (= (cto/insert-ref "" 0 "token1")
{:result "{token1}" :position 8})))
(t/testing "value without references"
(t/is (= (cto/insert-ref "ABC" 0 "token1")
{:result "{token1}ABC" :position 8}))
(t/is (= (cto/insert-ref "23 + " 5 "token1")
{:result "23 + {token1}" :position 13}))
(t/is (= (cto/insert-ref "23 + " 5 "token1")
{:result "23 + {token1}" :position 13})))
(t/testing "value with closed references"
(t/is (= (cto/insert-ref "{token2}" 8 "token1")
{:result "{token2}{token1}" :position 16}))
(t/is (= (cto/insert-ref "{token2}" 6 "token1")
{:result "{token1}" :position 8}))))