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

🐛 Fix path content json decoding mechanism

Browse source
This commit is contained in:
Andrey Antukh 2025-04-23 16:12:11 +02:00
parent 1981946480
commit 122e5a4b57
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
common/src/app/common/types/path/impl.cljc
View file

@ -586,9 +586,6 @@
(def ^:private check-segments
(sm/check-fn schema:segments))
(sm/register! ::path/segment schema:segment)
(sm/register! ::path/segments schema:segments)
(defn path-data?
[o]
(instance? PathData o))
@ -596,24 +593,34 @@
(declare from-string)
(declare from-plain)
;; Mainly used on backend: features/components_v2.clj
(sm/register! ::path/segment schema:segment)
(sm/register! ::path/segments schema:segments)
(sm/register!
{:type ::path/content
:pred path-data?
:type-properties
{:gen/gen (->> (sg/generator schema:segments)
(sg/filter not-empty)
(sg/fmap #(from-plain %)))
:encode/json identity
:decode/json (fn [s]
(cond
(string? s)
(from-string s)
:compile
(fn [_ _ _]
(let [decoder (delay (sm/decoder schema:segments sm/json-transformer))
generator (->> (sg/generator schema:segments)
(sg/filter not-empty)
(sg/fmap from-plain))]
{:pred path-data?
:type-properties
{:gen/gen generator
:encode/json identity
:decode/json (fn [s]
(cond
(string? s)
(from-string s)
(vector? s)
(from-plain s)
(vector? s)
(let [decode-fn (deref decoder)]
(-> (decode-fn s)
(from-plain)))
:else
s))}})
:else
s))}}))})
(def check-path-content
(sm/check-fn ::path/content))