diff --git a/calcit.cirru b/calcit.cirru index 27611fa..6357278 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -243,7 +243,7 @@ |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1515895708075) :data $ {} |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1515895708881) (:text |str) - |L $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610465806326) (:text "||states: ") + |L $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582927810) (:text "||states: ") |T $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |pr-str) (:by |root) (:at 1504774121421) @@ -1117,12 +1117,37 @@ |r $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |x) (:by |root) (:at 1504774121421) - |v $ {} (:type :expr) (:by nil) (:at 1504774121421) + |t $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582017691) :data $ {} - |T $ {} (:type :leaf) (:text |dashed->camel-iter) (:by |rJoDgvdeG) (:at 1610029358891) - |j $ {} (:type :leaf) (:text ||) (:by |root) (:at 1504774121421) - |r $ {} (:type :leaf) (:text |x) (:by |root) (:at 1504774121421) - |v $ {} (:type :leaf) (:text |false) (:by |root) (:at 1504774121421) + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623581995024) (:text |dashed-letter-pattern) + |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582020543) (:text |.!replace) + |L $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582022718) (:text |x) + |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582024048) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582024418) (:text |fn) + |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582025583) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582147255) (:text |cc) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582159844) (:text |pos) + |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582157511) (:text |prop) + |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582110898) + :data $ {} + |T $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582106149) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623585089269) (:text |aget) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582170252) (:text |cc) + |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623585089775) (:text |1) + |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582120166) (:text |.!toUpperCase) + |dashed-letter-pattern $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623581995727) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623581995727) (:text |def) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623581995727) (:text |dashed-letter-pattern) + |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623581995727) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623581997824) (:text |new) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582002058) (:text |js/RegExp) + |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582015695) (:text "|\"-[a-z]") + |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582013317) (:text "|\"g") |purify-events $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |defn) (:by |root) (:at 1504774121421) @@ -1405,77 +1430,6 @@ |T $ {} (:type :leaf) (:text |assoc) (:by |root) (:at 1504774121421) |j $ {} (:type :leaf) (:text |:event) (:by |root) (:at 1507356354798) |r $ {} (:type :leaf) (:text |event) (:by |root) (:at 1504774121421) - |dashed->camel-iter $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |defn) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |dashed->camel-iter) - |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |acc) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |promoted?) - |v $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |if) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |=) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text ||) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |acc) - |v $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |let) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |cursor) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |get) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |0) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece-followed) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610192055634) (:text |substr) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |1) - |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |if) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |=) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |cursor) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text ||-) - |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |recur) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |acc) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece-followed) - |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |true) - |v $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |recur) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |str) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |acc) - |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |if) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |promoted?) - |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610029445264) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |upper-case) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |cursor) - |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |cursor) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |piece-followed) - |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610029445264) (:text |false) |upper-case $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610192084569) :data $ {} |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610192086424) (:text |defn) @@ -2377,9 +2331,8 @@ |T $ {} (:type :leaf) (:text |aset) (:by |root) (:at 1504774121421) |j $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} - |T $ {} (:type :leaf) (:text |aget) (:by |root) (:at 1504774121421) + |T $ {} (:type :leaf) (:text |.-style) (:by |rJoDgvdeG) (:at 1623582306411) |j $ {} (:type :leaf) (:text |element) (:by |root) (:at 1504774121421) - |r $ {} (:type :leaf) (:text ||style) (:by |root) (:at 1504774121421) |r $ {} (:type :leaf) (:text |k) (:by |root) (:at 1504774121421) |v $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1613290359578) :data $ {} @@ -2391,14 +2344,11 @@ |T $ {} (:type :leaf) (:text |&doseq) (:by |rJoDgvdeG) (:at 1610191910805) |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1511710866263) :data $ {} - |T $ {} (:type :leaf) (:text |event-name) (:by |root) (:at 1504774121421) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1612062693159) + |T $ {} (:type :leaf) (:text |entry) (:by |rJoDgvdeG) (:at 1623584104389) + |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623584102520) :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612062693159) (:text |keys) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1612062693159) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612062693159) (:text |:event) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612062693159) (:text |virtual-element) + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584102520) (:text |:event) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584102520) (:text |virtual-element) |r $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |let) (:by |root) (:at 1504774121421) @@ -2411,6 +2361,13 @@ :data $ {} |T $ {} (:type :leaf) (:text |event->prop) (:by |root) (:at 1504774121421) |j $ {} (:type :leaf) (:text |event-name) (:by |root) (:at 1504774121421) + |D $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623584106186) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584109099) (:text |event-name) + |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623584109376) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584110032) (:text |first) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584111705) (:text |entry) |v $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |aset) (:by |root) (:at 1504774121421) @@ -6779,7 +6736,7 @@ |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610612157618) (:text |p) |r $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} - |T $ {} (:type :leaf) (:text |case) (:by |root) (:at 1504774121421) + |T $ {} (:type :leaf) (:text |case-default) (:by |rJoDgvdeG) (:at 1623584543089) |j $ {} (:type :leaf) (:text |prop-name) (:by |root) (:at 1504774121421) |r $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} @@ -6793,15 +6750,12 @@ :data $ {} |T $ {} (:type :leaf) (:by |root) (:at 1541076694462) (:text |style->string) |j $ {} (:type :leaf) (:by |root) (:at 1541076694462) (:text |prop-value) - |x $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1612277942442) + |n $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623584541095) :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612277942442) (:text |prop-name) - |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1612277942442) - :data $ {} - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612277942442) (:text |aset) - |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612277942442) (:text |target) - |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612277942442) (:text |prop-name) - |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1612277942442) (:text |prop-value) + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584541095) (:text |aset) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584541095) (:text |target) + |r $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584541095) (:text |prop-name) + |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623584541095) (:text |prop-value) |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610612147209) (:text |let[]) |L $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1610612147611) :data $ {} @@ -6838,7 +6792,7 @@ |T $ {} (:type :leaf) (:text |if) (:by |root) (:at 1504774121421) |j $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} - |T $ {} (:type :leaf) (:text |=) (:by |root) (:at 1504774121421) + |T $ {} (:type :leaf) (:text |identical?) (:by |rJoDgvdeG) (:at 1623584532031) |j $ {} (:type :leaf) (:text |prop-name) (:by |root) (:at 1504774121421) |r $ {} (:type :leaf) (:text ||value) (:by |root) (:at 1504774121421) |r $ {} (:type :expr) (:by nil) (:at 1504774121421) @@ -7276,10 +7230,7 @@ :data $ {} |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1572507524060) (:text |js/console.warn) |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1572505606809) (:text "|\"Unknown effects target:") - |v $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1572507525441) - :data $ {} - |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1572507526646) (:text |pr-str) - |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1572505559083) (:text |coord) + |v $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1572505559083) (:text |coord) |rm-element $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |defn) (:by |root) (:at 1504774121421) @@ -7297,12 +7248,11 @@ |j $ {} (:type :leaf) (:text |target) (:by |root) (:at 1505376315269) |T $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} - |T $ {} (:type :leaf) (:text |.remove) (:by |root) (:at 1504774121421) + |T $ {} (:type :leaf) (:text |.!remove) (:by |rJoDgvdeG) (:at 1623584509658) |j $ {} (:type :leaf) (:text |target) (:by |root) (:at 1504774121421) |j $ {} (:type :expr) (:by |root) (:at 1505376316231) :data $ {} - |T $ {} (:type :leaf) (:text |.warn) (:by |root) (:at 1505376324118) - |j $ {} (:type :leaf) (:text |js/console) (:by |root) (:at 1505376319552) + |j $ {} (:type :leaf) (:text |js/console.warn) (:by |rJoDgvdeG) (:at 1623584507875) |r $ {} (:type :leaf) (:text "||Respo: Element already removed! Probably by :inner-text.") (:by |root) (:at 1505376369651) |find-target $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} @@ -7711,7 +7661,7 @@ |T $ {} (:type :expr) (:by |root) (:at 1509168137711) :data $ {} |j $ {} (:type :leaf) (:text |x) (:by |root) (:at 1509168137711) - |r $ {} (:type :leaf) (:text |20) (:by |rJoDgvdeG) (:at 1611312880691) + |r $ {} (:type :leaf) (:text |20) (:by |rJoDgvdeG) (:at 1623584447767) |r $ {} (:type :expr) (:by |root) (:at 1509168137711) :data $ {} |T $ {} (:type :leaf) (:text |dispatch!) (:by |root) (:at 1509168137711) @@ -7822,7 +7772,7 @@ :data $ {} |T $ {} (:type :leaf) (:text |count) (:by |root) (:at 1509168435203) |j $ {} (:type :leaf) (:text |acc) (:by |root) (:at 1509168438004) - |T $ {} (:type :leaf) (:text |40) (:by |rJoDgvdeG) (:at 1612108689031) + |T $ {} (:type :leaf) (:text |40) (:by |rJoDgvdeG) (:at 1623584942046) |T $ {} (:type :expr) (:by |root) (:at 1509168181449) :data $ {} |T $ {} (:type :leaf) (:text |js/setTimeout) (:by |root) (:at 1509168183634) @@ -8465,11 +8415,29 @@ |T $ {} (:type :leaf) (:text |=) (:by |root) (:at 1504774121421) |j $ {} (:type :leaf) (:text |type-x) (:by |root) (:at 1504774121421) |r $ {} (:type :leaf) (:text |type-y) (:by |root) (:at 1504774121421) - |r $ {} (:type :expr) (:by nil) (:at 1504774121421) + |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582843058) :data $ {} - |T $ {} (:type :leaf) (:text |compare) (:by |root) (:at 1504774121421) - |j $ {} (:type :leaf) (:text |x) (:by |root) (:at 1504774121421) - |r $ {} (:type :leaf) (:text |y) (:by |root) (:at 1504774121421) + |T $ {} (:type :expr) (:by nil) (:at 1504774121421) + :data $ {} + |T $ {} (:type :leaf) (:text |compare) (:by |root) (:at 1504774121421) + |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582819541) + :data $ {} + |T $ {} (:type :leaf) (:text |x) (:by |root) (:at 1504774121421) + |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582854439) (:text |turn-string) + |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582856142) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582856142) (:text |turn-string) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582857761) (:text |y) + |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582843725) (:text |if) + |L $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582844828) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582848282) (:text |keyword?) + |j $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582848632) (:text |x) + |j $ {} (:type :expr) (:by nil) (:at 1504774121421) + :data $ {} + |T $ {} (:type :leaf) (:text |compare) (:by |root) (:at 1504774121421) + |j $ {} (:type :leaf) (:text |x) (:by |root) (:at 1504774121421) + |r $ {} (:type :leaf) (:text |y) (:by |root) (:at 1504774121421) |v $ {} (:type :expr) (:by nil) (:at 1504774121421) :data $ {} |T $ {} (:type :leaf) (:text |compare) (:by |root) (:at 1504774121421) @@ -12288,15 +12256,17 @@ |D $ {} (:type :leaf) (:text |do) (:by |rJoDgvdeG) (:at 1511713086289) |T $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1511713060905) :data $ {} - |T $ {} (:type :leaf) (:text |aset) (:by |rJoDgvdeG) (:at 1610291312683) + |T $ {} (:type :leaf) (:text |set!) (:by |rJoDgvdeG) (:at 1623582254767) |r $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1511713072930) :data $ {} |T $ {} (:type :leaf) (:text |str) (:by |rJoDgvdeG) (:at 1511713073414) |j $ {} (:type :leaf) (:text |font-size) (:by |rJoDgvdeG) (:at 1511713075227) |r $ {} (:type :leaf) (:text "||px ") (:by |rJoDgvdeG) (:at 1511713077510) |v $ {} (:type :leaf) (:text |font-family) (:by |rJoDgvdeG) (:at 1511713080294) - |f $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610291320230) (:text |shared-canvas-context) - |l $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610291322217) (:text ||font) + |f $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1623582250155) + :data $ {} + |T $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1610291320230) (:text |shared-canvas-context) + |D $ {} (:type :leaf) (:by |rJoDgvdeG) (:at 1623582251718) (:text |.-font) |j $ {} (:type :expr) (:by |rJoDgvdeG) (:at 1511713086784) :data $ {} |T $ {} (:type :leaf) (:text |.-width) (:by |rJoDgvdeG) (:at 1511713089353) @@ -12325,4 +12295,4 @@ :init-fn |respo.main/main! :compact-output? true :storage-key |calcit.cirru - :version |0.14.26 + :version |0.14.27 diff --git a/compact.cirru b/compact.cirru index c8b0243..dbb2f66 100644 --- a/compact.cirru +++ b/compact.cirru @@ -2,7 +2,7 @@ {} (:package |respo) :configs $ {} (:init-fn |respo.main/main!) (:reload-fn |respo.main/reload!) :modules $ [] |memof/compact.cirru |lilac/compact.cirru |calcit-test/compact.cirru - :version |0.14.26 + :version |0.14.27 :files $ {} |respo.app.style.widget $ {} :ns $ quote @@ -175,7 +175,11 @@ defn event->string (x) substr (turn-string x) 3 |dashed->camel $ quote - defn dashed->camel (x) (dashed->camel-iter | x false) + defn dashed->camel (x) + .!replace x dashed-letter-pattern $ fn (cc pos prop) + .!toUpperCase $ aget cc 1 + |dashed-letter-pattern $ quote + def dashed-letter-pattern $ new js/RegExp "\"-[a-z]" "\"g" |purify-events $ quote defn purify-events (events) -> events (to-pairs) @@ -215,15 +219,6 @@ :msg $ str "|Unhandled event: " (.-type event) assoc :original-event event assoc :event event - |dashed->camel-iter $ quote - defn dashed->camel-iter (acc piece promoted?) - if (= piece |) acc $ let - cursor $ get piece 0 - piece-followed $ substr piece 1 - if (= cursor |-) (recur acc piece-followed true) - recur - str acc $ if promoted? (upper-case cursor) cursor - , piece-followed false |upper-case $ quote defn upper-case (x) if @@ -367,10 +362,11 @@ style-name $ turn-string (first entry) k $ dashed->camel style-name v $ last entry - aset (aget element |style) k $ get-style-value v k + aset (.-style element) k $ get-style-value v k &doseq - event-name $ keys (:event virtual-element) + entry $ :event virtual-element let + event-name $ first entry name-in-string $ event->prop event-name aset element name-in-string $ fn (event) listener-builder event-name @@ -1010,14 +1006,13 @@ defn add-prop (target op) let[] (p prop-value) op $ let prop-name $ dashed->camel (turn-string p) - case prop-name + case-default prop-name (aset target prop-name prop-value) |style $ aset target prop-name (style->string prop-value) - prop-name $ aset target prop-name prop-value |replace-prop $ quote defn replace-prop (target op) let[] (p prop-value) op $ let prop-name $ dashed->camel (turn-string p) - if (= prop-name |value) + if (identical? prop-name |value) if /= prop-value $ .-value target aset target prop-name prop-value @@ -1066,11 +1061,10 @@ aset (.-style target) style-name nil |run-effect $ quote defn run-effect (target op-data coord) - if (some? target) (op-data target) - js/console.warn "\"Unknown effects target:" $ pr-str coord + if (some? target) (op-data target) (js/console.warn "\"Unknown effects target:" coord) |rm-element $ quote defn rm-element (target op) - if (some? target) (.remove target) (.warn js/console "|Respo: Element already removed! Probably by :inner-text.") + if (some? target) (.!remove target) (js/console.warn "|Respo: Element already removed! Probably by :inner-text.") |find-target $ quote defn find-target (root coord) cond @@ -1244,7 +1238,11 @@ let type-x $ type-as-int x type-y $ type-as-int y - if (= type-x type-y) (compare x y) (compare type-x type-y) + if (= type-x type-y) + if (keyword? x) + compare (turn-string x) (turn-string y) + compare x y + compare type-x type-y |type-as-int $ quote defn type-as-int (x) cond @@ -1804,7 +1802,7 @@ defn text-width (content font-size font-family) if (some? shared-canvas-context) do - aset shared-canvas-context |font $ str font-size "|px " font-family + set! (.-font shared-canvas-context) (str font-size "|px " font-family) .-width $ .!measureText shared-canvas-context content , nil |time! $ quote diff --git a/package.json b/package.json index b9ee225..f7d0fb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "version": "0.14.26", + "version": "0.14.27", "dependencies": { - "@calcit/procs": "^0.3.36" + "@calcit/procs": "^0.3.37" }, "scripts": { "test": "cr --once --emit-js --init-fn=respo.test.main/main! && target=node entry=./test.js yarn webpack && node js-out/bundle.js" diff --git a/yarn.lock b/yarn.lock index 7566560..664ed69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@calcit/procs@^0.3.36": - version "0.3.36" - resolved "https://registry.npmjs.org/@calcit/procs/-/procs-0.3.36.tgz#1c7d7a712ed5cc118b5df2d1aaa2fde2fc86c635" - integrity sha512-c+ACKjKue0Prhiixim3IcWp0c2JKTOXLc9uWVjBL59pZ2nFoKJGdz6j7HtZxLs98B9ehiig5HAZqeK9GcfKmWw== +"@calcit/procs@^0.3.37": + version "0.3.37" + resolved "https://registry.npmjs.org/@calcit/procs/-/procs-0.3.37.tgz#71c746f7ba3f2411624f2c64f6bad9e3099fa336" + integrity sha512-BpUCnFibBLbxdAZGrxAOIHCi3w7MkYvufKyDaeHDxw3UlNeEpXjmYJaEZ47p8wdvolOGncSq9xcq6uJTN4KGeg== dependencies: "@calcit/ternary-tree" "0.0.13" "@cirru/parser.ts" "^0.0.3" @@ -216,9 +216,9 @@ integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== acorn@^8.2.1: - version "8.3.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88" - integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw== + version "8.4.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" + integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== ajv-keywords@^3.5.2: version "3.5.2" @@ -252,9 +252,9 @@ buffer-from@^1.0.0: integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== caniuse-lite@^1.0.30001219: - version "1.0.30001236" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" - integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== + version "1.0.30001237" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz#4b7783661515b8e7151fc6376cfd97f0e427b9e5" + integrity sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw== chrome-trace-event@^1.0.2: version "1.0.3"