diff --git a/README.md b/README.md index 9943a88..8215357 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Demo http://repo.cirru.org/writer.clj/ [![Clojars Project](https://img.shields.io/clojars/v/cirru/writer.svg)](https://clojars.org/cirru/writer) ```clojure -[cirru/writer "0.1.12"] +[cirru/writer "0.1.13"] ``` ```clojure diff --git a/calcit.cirru b/calcit.cirru index 1c09f8a..14f83c8 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -60,7 +60,7 @@ |T $ {} (:type :leaf) (:text |expr) (:by |root) (:at 1512206407629) |j $ {} (:type :leaf) (:text |insist-head?) (:by |root) (:at 1512211396738) |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1574575834662) (:text |options) - |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1574697454939) (:text |level) + |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615549547165) (:text |base-level) |x $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561823407) (:text |in-tail?) |v $ {} (:type :expr) (:by |root) (:at 1512204674273) :data $ {} @@ -83,10 +83,14 @@ :data $ {} |T $ {} (:type :leaf) (:text |prev-kind) (:by |root) (:at 1512205001632) |j $ {} (:type :leaf) (:text |nil) (:by |root) (:at 1512205008910) - |v $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562461508) + |x $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615549550931) :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562471098) (:text |bended?) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562472896) (:text |false) + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615549550765) (:text |level) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615549552701) (:text |base-level) + |u $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615549889939) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550171742) (:text |bended-size) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550173174) (:text |0) |r $ {} (:type :expr) (:by |root) (:at 1512205119825) :data $ {} |T $ {} (:type :leaf) (:text |if) (:by |root) (:at 1512205120229) @@ -107,6 +111,60 @@ :data $ {} |T $ {} (:type :leaf) (:text |first) (:by |root) (:at 1512205212954) |j $ {} (:type :leaf) (:text |exprs) (:by |root) (:at 1512205216624) + |n $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613547223682) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547223682) (:text |next-level) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613547223682) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547223682) (:text |inc) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547223682) (:text |level) + |q $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613560968664) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560970396) (:text |tail?) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561013789) + :data $ {} + |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613560970883) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560975040) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560983845) (:text |1) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613560985306) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560986866) (:text |count) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561634385) (:text |exprs) + |D $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561016146) (:text |and) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561017794) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561023263) (:text |vector?) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561024372) (:text |cursor) + |L $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561027862) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561028448) (:text |not) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561037329) (:text |head?) + |P $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561477597) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561478098) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561480894) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561484600) (:text |:leaf) + |N $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561831631) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561831988) (:text |not) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561832589) (:text |in-tail?) + |p $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551894433) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551904517) (:text |child-insist-head?) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551933471) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |or) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551933471) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |:boxed-expr) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551933471) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |:expr) |j $ {} (:type :expr) (:by |root) (:at 1512205226507) :data $ {} |T $ {} (:type :leaf) (:text |kind) (:by |root) (:at 1512205229007) @@ -148,6 +206,120 @@ :data $ {} |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1585369607399) (:text |[]) |j $ {} (:type :leaf) (:text |:leaf) (:by |root) (:at 1512211217791) + |v $ {} (:type :expr) (:by |root) (:at 1512208161561) + :data $ {} + |T $ {} (:type :leaf) (:text |result) (:by |root) (:at 1512208163462) + |j $ {} (:type :expr) (:by |root) (:at 1512208164225) + :data $ {} + |T $ {} (:type :leaf) (:text |cond) (:by |Sk6m_HRlG) (:at 1613546626736) + |b $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546627333) + :data $ {} + |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546628133) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |and) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |:leaf) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546717984) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |:simple-expr) + |b $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547670326) (:text |kind) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546635152) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |str) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |char-space) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |child) + |h $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546644725) + :data $ {} + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546650400) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text |str) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546650400) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text |render-newline) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613559322906) (:text |next-level) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text "|\", ") + |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text |child) + |L $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550212269) (:text |bended?) + |i $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546651450) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546652909) (:text |:else) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546654521) (:text |child) + |X $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546697874) + :data $ {} + |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546699220) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546698883) (:text |and) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546701929) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546701929) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546701929) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546701929) (:text |:leaf) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546704417) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546704417) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546704417) (:text |kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546704417) (:text |:leaf) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546708735) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546708735) (:text |str) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546708735) (:text |char-space) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546708735) (:text |child) + |e $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546627333) + :data $ {} + |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546628133) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |and) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547954646) (:text |:simple-expr) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546717984) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547957729) (:text |:leaf) + |b $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547670326) (:text |kind) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546635152) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |str) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |char-space) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |child) + |V $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561508390) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561591545) (:text |tail?) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561516825) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561517430) (:text |str) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561521678) (:text |char-space) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561523300) (:text |child) + |t $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550188615) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550193787) (:text |bended?) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550204022) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |and) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550204022) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |:leaf) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550204022) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |or) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550204022) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |:expr) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550204022) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |=) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |prev-kind) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550204022) (:text |:boxed-expr) |r $ {} (:type :expr) (:by |root) (:at 1512205273016) :data $ {} |T $ {} (:type :leaf) (:text |child) (:by |root) (:at 1512208160533) @@ -338,12 +510,7 @@ |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561557860) (:text |cursor) |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561580204) (:text |false) |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561557860) (:text |options) - |x $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562538572) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562166965) (:text |level) - |D $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562540140) (:text |if) - |L $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562540657) (:text |bended?) - |P $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562545174) (:text |next-level) + |x $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562166965) (:text |level) |y $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561867468) (:text |tail?) |D $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562072177) (:text |if) |L $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562077643) @@ -351,170 +518,6 @@ |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562077391) (:text |empty?) |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562079127) (:text |cursor) |P $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562081471) (:text "|\"$") - |v $ {} (:type :expr) (:by |root) (:at 1512208161561) - :data $ {} - |T $ {} (:type :leaf) (:text |result) (:by |root) (:at 1512208163462) - |j $ {} (:type :expr) (:by |root) (:at 1512208164225) - :data $ {} - |T $ {} (:type :leaf) (:text |cond) (:by |Sk6m_HRlG) (:at 1613546626736) - |b $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546627333) - :data $ {} - |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546628133) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |and) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |:leaf) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546717984) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |:simple-expr) - |b $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547670326) (:text |kind) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546635152) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |str) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |char-space) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |child) - |h $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546644725) - :data $ {} - |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546647991) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |and) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546647991) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |:leaf) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546647991) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |or) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546647991) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |:expr) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546647991) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546647991) (:text |:boxed-expr) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546650400) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text |str) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546650400) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text |render-newline) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613559322906) (:text |next-level) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text "|\", ") - |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546650400) (:text |child) - |i $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546651450) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546652909) (:text |:else) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546654521) (:text |child) - |X $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546697874) - :data $ {} - |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546699220) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546698883) (:text |and) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546701929) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546701929) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546701929) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546701929) (:text |:leaf) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546704417) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546704417) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546704417) (:text |kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546704417) (:text |:leaf) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546708735) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546708735) (:text |str) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546708735) (:text |char-space) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546708735) (:text |child) - |e $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546627333) - :data $ {} - |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546628133) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |and) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546629612) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547954646) (:text |:simple-expr) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546629612) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546717984) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547957729) (:text |:leaf) - |b $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547670326) (:text |kind) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613546635152) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |str) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |char-space) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613546635152) (:text |child) - |V $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561508390) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561591545) (:text |tail?) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561516825) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561517430) (:text |str) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561521678) (:text |char-space) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561523300) (:text |child) - |n $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613547223682) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547223682) (:text |next-level) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613547223682) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547223682) (:text |inc) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613547223682) (:text |level) - |p $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551894433) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551904517) (:text |child-insist-head?) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551933471) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |or) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551933471) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |:boxed-expr) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613551933471) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551933471) (:text |:expr) - |q $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613560968664) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560970396) (:text |tail?) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561013789) - :data $ {} - |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613560970883) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560975040) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560983845) (:text |1) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613560985306) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613560986866) (:text |count) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561634385) (:text |exprs) - |D $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561016146) (:text |and) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561017794) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561023263) (:text |vector?) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561024372) (:text |cursor) - |L $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561027862) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561028448) (:text |not) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561037329) (:text |head?) - |P $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561477597) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561478098) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561480894) (:text |prev-kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561484600) (:text |:leaf) - |N $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613561831631) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561831988) (:text |not) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613561832589) (:text |in-tail?) |T $ {} (:type :expr) (:by |root) (:at 1512205129908) :data $ {} |T $ {} (:type :leaf) (:text |recur) (:by |root) (:at 1512205171124) @@ -585,23 +588,21 @@ |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613548228911) (:text |:simple-expr) |f $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613554846924) (:text |kind) |u $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613551779603) (:text |false) - |yT $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562489370) + |yj $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615549561126) :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562490002) (:text |or) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562492089) (:text |bended?) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562502134) + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615549561660) (:text |if) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615549564682) (:text |next-level) + |f $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550220552) (:text |bended?) + |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615554045108) (:text |level) + |yL $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550222417) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550223124) (:text |if) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550226748) (:text |bended?) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615550227322) :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562502504) (:text |or) - |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562504395) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562504556) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562505808) (:text |kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562516474) (:text |:expr) - |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613562504395) - :data $ {} - |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562504556) (:text |=) - |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562505808) (:text |kind) - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613562522287) (:text |:boxed-expr) + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550227753) (:text |inc) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615550279038) (:text |bended-size) + |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615554052867) (:text |bended-size) |P $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613980050547) :data $ {} |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text |do) @@ -609,10 +610,12 @@ :data $ {} |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text |println) |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text "|\"loop:") - |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text |prev-kind) + |x $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980066408) (:text |insist-head?) |v $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text |head?) + |yD $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615553851418) (:text |bended-size) |t $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980054596) (:text |kind) - |x $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980066408) (:text |insist-head?) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text |prev-kind) + |y $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615547987846) (:text |level) |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1613980050547) :data $ {} |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980050547) (:text |println) @@ -634,7 +637,7 @@ :data $ {} |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980072530) (:text |pr-str) |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613980073432) (:text |child) - |D $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1613981389495) (:text |;) + |D $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615554080949) (:text |;) |generate-inline-expr $ {} (:type :expr) (:by |root) (:at 1512207754701) :data $ {} |T $ {} (:type :leaf) (:text |defn) (:by |root) (:at 1512207754701) @@ -1839,6 +1842,58 @@ |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1607410049256) (:text |:inline?) |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1607410051363) (:text |true) |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1607409703724) (:text |expected) + |nested-3-test $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |deftest) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546896568) (:text |nested-3-test) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |let) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |data) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |read-string) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |slurp) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546902735) (:text ||examples/ast/nested-3.edn) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |expected) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |slurp) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546901119) (:text ||examples/cirru/nested-3.cirru) + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |testing) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546899157) (:text "||writing case for nested-3") + |r $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |is) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |=) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |parse) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |expected) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |data) + |v $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |is) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |=) + |j $ {} (:type :expr) (:by |Sk6m_HRlG) (:at 1615546894713) + :data $ {} + |T $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |write-code) + |j $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |data) + |r $ {} (:type :leaf) (:by |Sk6m_HRlG) (:at 1615546894713) (:text |expected) |folding-test $ {} (:type :expr) (:by nil) (:at 1512060681864) :data $ {} |T $ {} (:type :leaf) (:text |deftest) (:by |root) (:at 1512060681864) diff --git a/examples/ast/nested-3.edn b/examples/ast/nested-3.edn new file mode 100644 index 0000000..05b49fd --- /dev/null +++ b/examples/ast/nested-3.edn @@ -0,0 +1 @@ +[["c" ["d" ["e"] [["a"] "d" ["f"] ["g"]]]]] \ No newline at end of file diff --git a/examples/cirru/nested-3.cirru b/examples/cirru/nested-3.cirru new file mode 100644 index 0000000..dc00716 --- /dev/null +++ b/examples/cirru/nested-3.cirru @@ -0,0 +1,5 @@ + +c $ d (e) + a + , d (f) + g diff --git a/examples/cirru/unfolding.cirru b/examples/cirru/unfolding.cirru index 68a1706..9f0e0ad 100644 --- a/examples/cirru/unfolding.cirru +++ b/examples/cirru/unfolding.cirru @@ -2,8 +2,8 @@ set add 1 $ , x y - add 5 $ - add 2 + add 5 $ + add 2 a b (c d e) f diff --git a/package.json b/package.json index 20904c0..d7cb89b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cirru-writer-clj", - "version": "0.1.12", + "version": "0.1.13", "description": "Cirru writer in Clojure", "main": "target/main.js", "directories": { @@ -32,6 +32,6 @@ "shortid": "^2.2.16" }, "devDependencies": { - "shadow-cljs": "^2.11.18" + "shadow-cljs": "^2.11.23" } } diff --git a/release.edn b/release.edn index ad597e2..ae256da 100644 --- a/release.edn +++ b/release.edn @@ -1,4 +1,4 @@ -{:version "0.1.12", +{:version "0.1.13", :group-id "cirru", :artifact-id "writer", :skip-tag true, diff --git a/src/cirru_writer/core.cljs b/src/cirru_writer/core.cljs index 407365a..1611e11 100644 --- a/src/cirru_writer/core.cljs +++ b/src/cirru_writer/core.cljs @@ -48,8 +48,8 @@ (defn render-newline [x] (str "\n" (render-spaces x))) -(defn generate-tree [expr insist-head? options level in-tail?] - (loop [acc "", exprs expr, head? true, prev-kind nil, bended? false] +(defn generate-tree [expr insist-head? options base-level in-tail?] + (loop [acc "", exprs expr, head? true, prev-kind nil, bended-size 0, level base-level] (if (empty? exprs) acc (let [cursor (first exprs) @@ -70,14 +70,7 @@ tail? (if (empty? cursor) "$" - (str - "$ " - (generate-tree - cursor - false - options - (if bended? next-level level) - tail?))) + (str "$ " (generate-tree cursor false options level tail?))) (= kind :leaf) (generate-leaf cursor) (and head? insist-head?) (generate-inline-expr cursor) (= kind :simple-expr) @@ -111,17 +104,17 @@ (render-newline next-level)) (generate-tree cursor child-insist-head? options next-level false)) :else (throw (js/Error. "Unknown"))) + bended? (and (= kind :leaf) (or (= prev-kind :expr) (= prev-kind :boxed-expr))) result (cond tail? (str char-space child) (and (= prev-kind :leaf) (= kind :leaf)) (str char-space child) (and (= prev-kind :leaf) (= kind :simple-expr)) (str char-space child) (and (= prev-kind :simple-expr) (= kind :leaf)) (str char-space child) - (and (= kind :leaf) (or (= prev-kind :expr) (= prev-kind :boxed-expr))) - (str (render-newline next-level) ", " child) + bended? (str (render-newline next-level) ", " child) :else child)] (comment do - (println "loop:" prev-kind kind head? insist-head?) + (println "loop:" prev-kind kind head? insist-head? level bended-size) (println " =>" (pr-str acc)) (println " =>" exprs) (println " =>" (pr-str child))) @@ -136,7 +129,8 @@ (if (contains? #{:leaf :simple-expr} prev-kind) :simple-expr :expr) (if (= prev-kind :leaf) :simple-expr :expr))) kind) - (or bended? (or (= kind :expr) (= kind :boxed-expr)))))))) + (if bended? (inc bended-size) bended-size) + (if bended? next-level level)))))) (defn generate-statements [exprs options] (->> exprs diff --git a/src/cirru_writer/test.cljs b/src/cirru_writer/test.cljs index daa124c..5ad7a08 100644 --- a/src/cirru_writer/test.cljs +++ b/src/cirru_writer/test.cljs @@ -148,6 +148,15 @@ (is (= (parse expected) data)) (is (= (write-code data) expected))))) +(deftest + nested-3-test + (let [data (read-string (slurp "examples/ast/nested-3.edn")) + expected (slurp "examples/cirru/nested-3.cirru")] + (testing + "writing case for nested-3" + (is (= (parse expected) data)) + (is (= (write-code data) expected))))) + (deftest parentheses-test (let [data (read-string (slurp "examples/ast/parentheses.edn")) diff --git a/yarn.lock b/yarn.lock index eef91ca..5b627c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31,14 +31,14 @@ base64-js@^1.0.2: integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: - version "4.11.9" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" - integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== bn.js@^5.0.0, bn.js@^5.1.1: - version "5.1.3" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" - integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" @@ -232,9 +232,9 @@ elliptic@^6.5.3: minimalistic-crypto-utils "^1.0.1" events@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" - integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -533,10 +533,10 @@ shadow-cljs-jar@1.3.2: resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b" integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg== -shadow-cljs@^2.11.18: - version "2.11.18" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.18.tgz#f83fe776c9001afdf92611e6bef6da8aed926aab" - integrity sha512-7EAXl1xk2GjhViUeexn7cqAPx0lkEl2J40nAbPPCrAbfLfOWn5tjV4P3Be6IqTInSHMx04tFxDRV+0xFdIhl5A== +shadow-cljs@^2.11.23: + version "2.11.23" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.23.tgz#6dd04fa20c6b66e9d0a1fb050a9fa798b127390d" + integrity sha512-jVTvvKSKubapqQjZs7nuhJch+71usUKErlqV+03VfCLIslmp8rwCLZK3EjrjI5kr8YJALhXG4lCdPJBuorwuKg== dependencies: node-libs-browser "^2.2.1" readline-sync "^1.4.7"