diff --git a/calcit.cirru b/calcit.cirru index 9687f14..ba305a9 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -136,19 +136,61 @@ :data $ {} |T $ {} (:type :leaf) (:text |render-button) (:id |r1Ne3wAFYab) (:by |root) (:at 1508642404409) |j $ {} (:type :leaf) (:text ||Merge) (:id |rJxxc0YFTb) (:by |root) (:at 1508642794463) - |r $ {} (:type :leaf) (:text |on-merge) (:id |H1-zcRtYp-) (:by |root) (:at 1508642795937) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304625936) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304632316) (:text |fn) (:id |JNInQSje6F) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304625936) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304625936) (:text |e) (:id |mK56cJuV5n) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304628641) (:text |d!) (:id |4xZb1yDbIM) + :id |nQAHTJDoAK + |v $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304625936) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304629474) (:text |d!) (:id |hlGMWGTAwf) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304625936) (:text |:reel/merge) (:id |CzGG64E6qD) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304625936) (:text |nil) (:id |ZPHY_PnvqZ) + :id |CkoU_ZFh8f + :id |hrmGHRDRUj |v $ {} (:type :leaf) (:text |true) (:id |HJxF8HqFTZ) (:by |root) (:at 1508644177480) |v5 $ {} (:type :expr) (:id |Skeee5FaW) (:by |root) (:at 1508642439874) :data $ {} |T $ {} (:type :leaf) (:text |render-button) (:id |r1Ne3wAFYab) (:by |root) (:at 1508642404409) |j $ {} (:type :leaf) (:text ||Reset) (:id |rJxxc0YFTb) (:by |root) (:at 1508642441733) - |r $ {} (:type :leaf) (:text |on-reset) (:id |H1-zcRtYp-) (:by |root) (:at 1508642443174) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304615632) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304617376) (:text |fn) (:id |SE-FOUIOKF) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304615632) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304615632) (:text |e) (:id |rb0A9CA20r) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304620071) (:text |d!) (:id |rZR1uR5YPo) + :id |RyKdWaE6qp + |v $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304615632) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304620824) (:text |d!) (:id |In32Xx2RVd) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304615632) (:text |:reel/reset) (:id |i7OpN8I0sM) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304615632) (:text |nil) (:id |1ikm9iwjUW) + :id |q8Lu4grk5R + :id |MzXffzJTb5 |v $ {} (:type :leaf) (:text |true) (:id |Syec8H9Y6-) (:by |root) (:at 1508644179625) |x5 $ {} (:type :expr) (:id |rksBr5K6b) (:by |root) (:at 1508642439874) :data $ {} |T $ {} (:type :leaf) (:text |render-button) (:id |r1Ne3wAFYab) (:by |root) (:at 1508642404409) |j $ {} (:type :leaf) (:text ||Step) (:id |rJxxc0YFTb) (:by |root) (:at 1508643388541) - |r $ {} (:type :leaf) (:text |on-step) (:id |H1-zcRtYp-) (:by |root) (:at 1508643395781) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304605919) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304607880) (:text |fn) (:id |nUe4xvwj4t) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304605919) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304605919) (:text |e) (:id |tqDEiFK2bR) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304605919) (:text |d!) (:id |co2TJTY0e5) + :id |jabbtjLYwJ + |v $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304605919) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304605919) (:text |d!) (:id |woGNjOtpul) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304605919) (:text |:reel/step) (:id |_yTS4B1iuP) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304605919) (:text |nil) (:id |UWRQTJvpI9) + :id |gDIRkUTQFw + :id |nPiNcn2bNu |v $ {} (:type :expr) (:id |ByW-UH9tpb) (:by |root) (:at 1508643892933) :data $ {} |T $ {} (:type :leaf) (:text |:stopped?) (:id |BkWu4EcKab) (:by |root) (:at 1508643894102) @@ -157,7 +199,21 @@ :data $ {} |T $ {} (:type :leaf) (:text |render-button) (:id |r1xr9CtKpbleaf) (:by |root) (:at 1508642447285) |j $ {} (:type :leaf) (:text ||Run) (:id |H1rw50tt6W) (:by |root) (:at 1508642448866) - |r $ {} (:type :leaf) (:text |on-run) (:id |BJGFcCKKTZ) (:by |root) (:at 1508642450327) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304593215) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304596023) (:text |fn) (:id |lpPvvr3ATX) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304593215) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304593215) (:text |e) (:id |OzCfYNeoec) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304597320) (:text |d!) (:id |WGpym-_Eyc) + :id |Q5Yc9qoyw8 + |v $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304593215) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304598029) (:text |d!) (:id |slpSMXTeSK) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304593215) (:text |:reel/run) (:id |vlNKnCR45d) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304593215) (:text |nil) (:id |ilVtGqRQV6) + :id |qbYFfBs1MB + :id |nCIpAddMwB |v $ {} (:type :expr) (:id |Byb62Hctpb) (:by |root) (:at 1508643892933) :data $ {} |T $ {} (:type :leaf) (:text |:stopped?) (:id |BkWu4EcKab) (:by |root) (:at 1508643894102) @@ -166,7 +222,21 @@ :data $ {} |T $ {} (:type :leaf) (:text |render-button) (:id |SJyiAYYpbleaf) (:by |root) (:at 1508642457910) |j $ {} (:type :leaf) (:text ||Close) (:id |SJ7fi0YF6W) (:by |root) (:at 1508642459249) - |r $ {} (:type :leaf) (:text |on-toggle) (:id |SkNXj0ttTb) (:by |root) (:at 1508642539201) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304550646) + :data $ {} + |T $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304549431) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304555546) (:text |d!) (:id |E6YNcFfTX1) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304549431) (:text |:reel/toggle) (:id |-jr1s-wVYJ) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304549431) (:text |nil) (:id |ivqJ0onzp4) + :id |GisPRBBaSi + |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304551954) (:text |fn) (:id |t9iA-EhizN) + |L $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304552227) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304552496) (:text |e) (:id |UY_SwqYPeA) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304553206) (:text |d!) (:id |lnZalGFZJR) + :id |PEI_Gm9eZ + :id |zaMm8dI-J |v $ {} (:type :expr) (:id |Bkx4IS9F6W) (:by |root) (:at 1508644172168) :data $ {} |D $ {} (:type :leaf) (:text |not) (:id |Sk-4UHctTW) (:by |root) (:at 1508644173126) @@ -183,7 +253,12 @@ |j $ {} (:type :expr) (:id |r1-ZAxhFTW) (:by |root) (:at 1508651209509) :data $ {} |T $ {} (:type :leaf) (:text |:style) (:id |SJlWCl3FT-) (:by |root) (:at 1508651210359) - |j $ {} (:type :leaf) (:text |ui/row) (:id |SJSGRlhtTZ) (:by |root) (:at 1508651215697) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304467492) + :data $ {} + |T $ {} (:type :leaf) (:text |ui/row) (:id |SJSGRlhtTZ) (:by |root) (:at 1508651215697) + |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304468483) (:text |merge) (:id |zaTkZPwHLM) + |L $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304470784) (:text |ui/expand) (:id |i2Ono28dVo) + :id |PxAQdNa7OJ |T $ {} (:type :expr) (:id |ryUtfosMlU3W) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |B1vFfojGxLhW) (:text |comp-records) (:by |root) (:at 1507357346880) @@ -409,73 +484,6 @@ |j $ {} (:type :expr) (:id |BJermGDvn-) (:by |root) (:at 1507451420773) :data $ {} |T $ {} (:type :leaf) (:text |{}) (:id |S1SmGPv2W) (:by |root) (:at 1507451421144) - |on-merge $ {} (:type :expr) (:id |ry67XjoMlU3b) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |ryAQ7oiGgLhZ) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |ryk4msiGeUhW) (:text |on-merge) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |B1EVmojMxLnW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |ryrEmijflI3W) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |BJLEXoszl8nW) (:text |dispatch!) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:text |m!) (:id |H1ebY3vvn-) (:by |root) (:at 1507454074274) - |x $ {} (:type :expr) (:id |Skw4miizeLhW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |S1O4moiGeUhW) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |H1t47sjGl8nW) (:text |:reel/merge) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:id |ByqEXoiflU2W) (:text |nil) (:by |root) (:at 1507454143968) - |on-reset $ {} (:type :expr) (:id |r1uaQjiGlIn-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |SyYTmsjfgLhW) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rJ967ijGgIn-) (:text |on-reset) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |B1s6QsiGlLn-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |Hyhp7ssGlUhW) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |r1pp7soGgL3-) (:text |dispatch!) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |ByAp7ssMeI2Z) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |ry1RXsozlI3W) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |HygRQooMgUhW) (:text |:reel/reset) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:id |rkZ0QoofeI2W) (:text |nil) (:by |root) (:at 1507357346880) - |on-run $ {} (:type :expr) (:id |B1SUMiiMl82Z) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |S1UIMjszlI2Z) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rywLzisfeInb) (:text |on-run) (:by |root) (:at 1507357346880) - |x $ {} (:type :expr) (:id |ry2UzjoGxU3-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |SyTIGssGxUnZ) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |SJCIzooGg82W) (:text |dispatch!) (:by |root) (:at 1507357346880) - |y $ {} (:type :expr) (:id |SyywfjjfgL2W) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |SyePGijMlL2b) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |SyWDMisflLnW) (:text |:reel/run) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:id |H1MvGiiGe83-) (:text |nil) (:by |root) (:at 1507455829295) - |on-step $ {} (:type :expr) (:id |rk-wUMcYaW) (:by |root) (:at 1508643407418) - :data $ {} - |T $ {} (:type :leaf) (:text |defn) (:id |SkfDUz9tpW) (:by |root) (:at 1508643407418) - |j $ {} (:type :leaf) (:text |on-step) (:id |HyQw8McKpZ) (:by |root) (:at 1508643407418) - |r $ {} (:type :expr) (:id |ByVw8M9FaW) (:by |root) (:at 1508643407418) - :data $ {} - |T $ {} (:type :leaf) (:text |e) (:id |H11wf9FT-) (:by |root) (:at 1508643415317) - |j $ {} (:type :leaf) (:text |d!) (:id |BkZyDf5Ya-) (:by |root) (:at 1508643416918) - |r $ {} (:type :leaf) (:text |m!) (:id |B1e-wzctpb) (:by |root) (:at 1508643418225) - |v $ {} (:type :expr) (:id |rk7vf5FpZ) (:by |root) (:at 1508643418650) - :data $ {} - |T $ {} (:type :leaf) (:text |d!) (:id |rk7vf5FpZleaf) (:by |root) (:at 1508643419458) - |j $ {} (:type :leaf) (:text |:reel/step) (:id |rJEPz5tTb) (:by |root) (:at 1508643917859) - |r $ {} (:type :leaf) (:text |nil) (:id |BJbDPM5t6b) (:by |root) (:at 1508643423433) - |on-toggle $ {} (:type :expr) (:id |rkUc7sifxUhW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |rkPqQjjzgLhW) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rku9miofxI3W) (:text |on-toggle) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |r1Y9miozxI3Z) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |HyqqQooMxU2Z) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |r1i5QjozgInW) (:text |dispatch!) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |H1hcXjoMxUh-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |Skpc7sjflIn-) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |H1CqXooflL3Z) (:text |:reel/toggle) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:id |HkkjXjsMeI2-) (:text |nil) (:by |root) (:at 1507357346880) |render-button $ {} (:type :expr) (:id |rJxnPCKKa-) (:by |root) (:at 1508642404409) :data $ {} |T $ {} (:type :leaf) (:text |defn) (:id |rJZ3DAKtpZ) (:by |root) (:at 1508642408166) @@ -718,6 +726,21 @@ :data $ {} |T $ {} (:type :leaf) (:id |r155jjfxI2W) (:text |ns) (:by |root) (:at 1507357346880) |j $ {} (:type :leaf) (:id |rJi5siGeI3b) (:text |reel.updater) (:by |root) (:at 1507357346880) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304389453) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304390289) (:text |:require) (:id |P3jczBrHXg) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304390441) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304391569) (:text |[]) (:id |uFr1lv05JF) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304395114) (:text |respo.cursor) (:id |bDL75KOjMc) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304396018) (:text |:refer) (:id |s7rYrlvs6B) + |v $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304396155) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304396413) (:text |[]) (:id |7Nd0sY6Xx) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304397873) (:text |update-states) (:id |aNmMZOSNjQ) + :id |B-ocWzNM1O + :id |uDdy8WNkZl + :id |s8pZMu102a :defs $ {} |updater $ {} (:type :expr) (:id |r18jjiMgIhb) (:by nil) (:at 1507357346880) :data $ {} @@ -737,44 +760,12 @@ |r $ {} (:type :expr) (:id |Hyb2iizlU3Z) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |HyGhoifeL2b) (:text |:states) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779218923) - :data $ {} - |T $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779195549) - :data $ {} - |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779197975) (:text |assoc-in) (:id |y1TmTBL3SG) - |L $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779201970) (:text |store) (:id |bA58fDZgH) - |P $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779206806) - :data $ {} - |T $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779202808) - :data $ {} - |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779202413) (:text |[]) (:id |Isq8eilc-) - |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779205291) (:text |:states) (:id |qFvkLU-Lo) - :id |PgtFTHrvC4 - |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779214077) (:text |concat) (:id |APxXNpZXF5) - |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779216099) (:text |op) (:id |DsvAT99mP) - |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779230410) - :data $ {} - |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779230674) (:text |[]) (:id |P7Ox34A_l) - |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779232422) (:text |:data) (:id |FaZoG3VxFJ) - :id |RK-lkaVDYD - :id |6hA4FYJ9Dg - |R $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779236616) (:text |new-state) (:id |lJhWECCvttleaf) - :id |eUF_HukPz - |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779219517) (:text |let) (:id |mfSP1e5yC) - |L $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779220955) - :data $ {} - |T $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779225151) - :data $ {} - |T $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1584779221121) - :data $ {} - |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779220798) (:text |cursor) (:id |ePwcbTPUlc) - |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779221797) (:text |[]) (:id |cyutw9rZvu) - |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779224545) (:text |new-state) (:id |-shtdcSZG6) - :id |gPAmkBUWr - |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1584779227287) (:text |op-data) (:id |ZrumeQ0iLJ) - :id |6jbR5YAN5 - :id |sP3A5gizcD - :id |IWqcaR5sfB + |b $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304401417) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304402874) (:text |update-states) (:id |9QZ-sygFF) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304403982) (:text |store) (:id |7oysUqRBwl) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304405683) (:text |op-data) (:id |C42AxYFxt) + :id |4JwKwZKhIN |v $ {} (:type :expr) (:id |Hy53sofg83Z) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |BJjhijfeI2b) (:text |:task/add) (:by |root) (:at 1507357346880) @@ -1367,6 +1358,15 @@ |T $ {} (:type :leaf) (:id |r1NnNiiMlIh-) (:text |:data) (:by |root) (:at 1507357346880) |j $ {} (:type :leaf) (:id |B1B34iozeUhW) (:text |states) (:by |root) (:at 1507357346880) |r $ {} (:type :leaf) (:id |ByU3VsifxL3b) (:text ||) (:by |root) (:at 1507357346880) + |D $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304171515) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304172927) (:text |cursor) (:id |ZjencueAMTleaf) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304173132) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304175376) (:text |:cursor) (:id |RnYure7WIf) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304177217) (:text |states) (:id |GbF4juDr2P) + :id |BLvVmFen6 + :id |ZjencueAMT |r $ {} (:type :expr) (:id |SkwnVoifg8n-) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |ryd34ooMgL2Z) (:text |div) (:by |root) (:at 1507357346880) @@ -1408,7 +1408,25 @@ |r $ {} (:type :expr) (:id |B16a4iiGxLh-) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |HyAa4iozxUnW) (:text |:on-input) (:by |root) (:at 1515690437585) - |j $ {} (:type :leaf) (:id |HJe0VjjzeUhW) (:text |on-input) (:by |root) (:at 1507357346880) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304166953) + :data $ {} + |T $ {} (:type :leaf) (:id |HJe0VjjzeUhW) (:text |fn) (:by |Oj4l0GxFU) (:at 1590304167293) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304168080) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304167752) (:text |e) (:id |bI_Jq_s2uf) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304169075) (:text |d!) (:id |b_6hguTa5X) + :id |aXTDLxBp7 + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304169958) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304169958) (:text |d!) (:id |9VFY0Rl9I6) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304169958) (:text |cursor) (:id |yDE5PZHnc_) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304169958) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304169958) (:text |:value) (:id |-1NOLoDJHg) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304169958) (:text |e) (:id |GsdNE-9MH4) + :id |v0AJfWlQh1 + :id |2HVlBvVidu + :id |hJmsQb8B_1 |v $ {} (:type :expr) (:id |SyPm_qtpW) (:by |root) (:at 1508644894529) :data $ {} |T $ {} (:type :leaf) (:text |:on-keydown) (:id |SyPm_qtpWleaf) (:by |root) (:at 1515690440441) @@ -1419,7 +1437,6 @@ :data $ {} |T $ {} (:type :leaf) (:text |e) (:id |SJgyV_5YT-) (:by |root) (:at 1508644903229) |j $ {} (:type :leaf) (:text |d!) (:id |S1mJVd9Yp-) (:by |root) (:at 1508644904639) - |r $ {} (:type :leaf) (:text |m!) (:id |ryx-NO9FTZ) (:by |root) (:at 1508644905356) |r $ {} (:type :expr) (:id |HJgYHuqFa-) (:by |root) (:at 1508644929146) :data $ {} |D $ {} (:type :leaf) (:text |if) (:id |r1-YSucKpW) (:by |root) (:at 1508644929838) @@ -1441,8 +1458,12 @@ |r $ {} (:type :leaf) (:id |ByScNijzeUn-) (:text |state) (:by |root) (:at 1507357346880) |j $ {} (:type :expr) (:id |ByZPLO9Ypb) (:by |root) (:at 1507366069752) :data $ {} - |T $ {} (:type :leaf) (:text |m!) (:id |HJAnNGUhWleaf) (:by |root) (:at 1508644983235) + |T $ {} (:type :leaf) (:text |d!) (:id |HJAnNGUhWleaf) (:by |Oj4l0GxFU) (:at 1590304130347) |j $ {} (:type :leaf) (:text ||) (:id |Sk4TVM8nZ) (:by |root) (:at 1507366075925) + |b $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304134750) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304135116) (:text |[]) (:id |7mXrxomOo) + :id |YUmPW2oZAJ |v $ {} (:type :expr) (:id |SynAVjozxLnZ) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |r1TC4osfxUnZ) (:text |=<) (:by |root) (:at 1507358820823) @@ -1461,10 +1482,27 @@ |r $ {} (:type :expr) (:id |Hyeq6tfB4f) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |SJhJrosflL3b) (:text |:on-click) (:by |root) (:at 1515690431926) - |j $ {} (:type :expr) (:id |rJpyHjoGeI2W) (:by nil) (:at 1507357346880) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304196912) :data $ {} - |T $ {} (:type :leaf) (:id |SyCkrsjMgLnb) (:text |on-click) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |B1yeSioGlI2Z) (:text |state) (:by |root) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304196912) (:text |fn) (:id |33voxCscSv) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304196912) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304196912) (:text |e) (:id |yDWNWoXMo4) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304206777) (:text |d!) (:id |fr5_tv6W_l) + :id |ZooDLBDzZ1 + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304196912) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304208204) (:text |d!) (:id |OApU6-I5hg) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304196912) (:text |:task/add) (:id |00eE_3PL-S) + |r $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304196912) (:text |state) (:id |32awuV8-QH) + :id |7bS-CBNVb_ + |v $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304196912) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304200024) (:text |d!) (:id |fYtwRL9FBN) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304196912) (:text ||) (:id |u-S0APOEY4) + |b $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304201427) (:text |cursor) (:id |KiOZsc9Lu) + :id |OQCHpkEwk6 + :id |C6_Mkb-lrO |r $ {} (:type :expr) (:id |H1ZeBsofxLhW) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |ByGgSiifeL3W) (:text |<>) (:by |root) (:at 1507358827886) @@ -1499,46 +1537,6 @@ :data $ {} |T $ {} (:type :leaf) (:id |S1_ZSsjGgLnZ) (:text |comp-task) (:by |root) (:at 1507357346880) |j $ {} (:type :leaf) (:id |rJFWrisMeUh-) (:text |task) (:by |root) (:at 1507357346880) - |on-click $ {} (:type :expr) (:id |r1wY4isGl8nZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |HJOtVjsGgI3Z) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |BJYYVooMg8nb) (:text |on-click) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |SJct4jjze8nW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |ryjYVjjzeUhZ) (:text |state) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |HJpY4sifgLnW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |SkCK4oiMgU2Z) (:text |fn) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |BJJ9NioMgIhW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |Sylc4osMgUhb) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |B1-qNjjfeU3Z) (:text |dispatch!) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:text |mutate!) (:id |rylPpEGL3b) (:by |root) (:at 1507366081135) - |r $ {} (:type :expr) (:id |SkfqNssGxU2W) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |B1794joGe83b) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rkN9EoiGeUn-) (:text |:task/add) (:by |root) (:at 1508651522012) - |r $ {} (:type :leaf) (:id |ByScNijzeUn-) (:text |state) (:by |root) (:at 1507357346880) - |t $ {} (:type :expr) (:id |HJAnNGUhW) (:by |root) (:at 1507366069752) - :data $ {} - |T $ {} (:type :leaf) (:text |mutate!) (:id |HJAnNGUhWleaf) (:by |root) (:at 1507366071708) - |j $ {} (:type :leaf) (:text ||) (:id |Sk4TVM8nZ) (:by |root) (:at 1507366075925) - |on-input $ {} (:type :expr) (:id |SkqWBojzg8nb) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |BJjbSosflI2Z) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |HknZHioGgL3Z) (:text |on-input) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |HJbzBosGgU3-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |SkGGroifxUh-) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |H1XfrioGlLnZ) (:text |dispatch!) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:text |mutate!) (:id |HJtsEGUhb) (:by |root) (:at 1507366050590) - |x $ {} (:type :expr) (:id |H1VGrisfg8h-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |BySGBojMgUhZ) (:text |mutate!) (:by |root) (:at 1507366041209) - |x $ {} (:type :expr) (:id |ry9MBsiMgU3b) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |HkiGHisMxI3Z) (:text |:value) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |HJhzSoszx83b) (:text |e) (:by |root) (:at 1507357346880) |style-container $ {} (:type :expr) (:id |ryyFVsizg82W) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |HyxK4jjGxU3W) (:text |def) (:by |root) (:at 1507357346880) @@ -2001,13 +1999,25 @@ |r $ {} (:type :expr) (:id |r1WBotGHNf) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |SyfnWisMgUnb) (:text |:on-click) (:by |root) (:at 1515690395896) - |j $ {} (:type :expr) (:id |SyXhZiiGeI3W) (:by nil) (:at 1507357346880) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304272485) :data $ {} - |T $ {} (:type :leaf) (:id |SJEn-jozg8nZ) (:text |on-toggle) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |rkHn-oozxI3-) (:by nil) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304272485) (:text |fn) (:id |Cd8bE6hdXp) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304272485) :data $ {} - |T $ {} (:type :leaf) (:id |HkIh-isMxU3W) (:text |:id) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |B1D3-ssMx82b) (:text |task) (:by |root) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304272485) (:text |e) (:id |V9bw-vDGNZ) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304278500) (:text |d!) (:id |kT2q6TmTuG) + :id |iOcze9o6cM + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304272485) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304279355) (:text |d!) (:id |1UtJUuXTN9) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304272485) (:text |:task/toggle) (:id |vF50CnbMjM) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304276460) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304276460) (:text |:id) (:id |gTuHIgqokF) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304276460) (:text |task) (:id |rhu7E5ckh8) + :id |B8Cf5OjY4I + :id |CwF3VTLR-m + :id |uvK_2a05fS |v $ {} (:type :expr) (:id |SkO3biize82-) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |ByY2bioGxL3b) (:text |=<) (:by |root) (:at 1507358339946) @@ -2033,13 +2043,34 @@ |r $ {} (:type :expr) (:id |SJfsFzSEz) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |HJ-RbsjMeInZ) (:text |:on-input) (:by |root) (:at 1515690392313) - |j $ {} (:type :expr) (:id |BJz0-sifl8hb) (:by nil) (:at 1507357346880) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304239489) :data $ {} - |T $ {} (:type :leaf) (:id |SJ70ZojfxLhW) (:text |on-input) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |rJNAZsizlI3-) (:by nil) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304239489) (:text |fn) (:id |_xkdnv7aw-) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304239489) :data $ {} - |T $ {} (:type :leaf) (:id |SJHCbssMeLhZ) (:text |:id) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |Hy8AbijMx8h-) (:text |task) (:by |root) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304239489) (:text |e) (:id |OZHG7cKVox) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304247523) (:text |d!) (:id |C2rQD64IJ-) + :id |YUQ4q87RAc + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304239489) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304246494) (:text |d!) (:id |a2FbnNDlSV) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304239489) (:text |:task/edit) (:id |B8K8zfoBvY) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304239489) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304239489) (:text |[]) (:id |41gUrUINAd) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304242852) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304243932) (:text |:id) (:id |F0mbtwY2u2) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304244538) (:text |task) (:id |Sy-rpBlFjC) + :id |zYARPfGZwT + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304239489) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304239489) (:text |:value) (:id |Ad7lLzWMyk) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304239489) (:text |e) (:id |5EfS31S4Ko) + :id |J5ucDzS1X8 + :id |EF69JuLvBc + :id |aqAx7xHI-A + :id |_wsewce08X |v $ {} (:type :expr) (:id |S1P0WssGl8h-) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |SJu0boozlUnb) (:text |:style) (:by |root) (:at 1507357346880) @@ -2085,81 +2116,29 @@ |r $ {} (:type :expr) (:id |HyhjtzB4z) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |SkbgGssGgI3Z) (:text |:on-click) (:by |root) (:at 1515690401224) - |j $ {} (:type :expr) (:id |BJMgGoozgIh-) (:by nil) (:at 1507357346880) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304256495) :data $ {} - |T $ {} (:type :leaf) (:id |SkmgMsifxInW) (:text |on-remove) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |rkElGssfe8hb) (:by nil) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304256495) (:text |fn) (:id |sJBL-C8vcK) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304256495) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304256495) (:text |e) (:id |UKIzrPZuJu) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304262402) (:text |d!) (:id |kSrALJqE_i) + :id |7UOuwXQcAZ + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304256495) :data $ {} - |T $ {} (:type :leaf) (:id |H1rlziiMgL2b) (:text |:id) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |B1LxfojfgUhZ) (:text |task) (:by |root) (:at 1507357346880) + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304263087) (:text |d!) (:id |5xLFXxJ2Tx) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304256495) (:text |:task/remove) (:id |fC7JCZItCT) + |r $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304260011) + :data $ {} + |T $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304260011) (:text |:id) (:id |NMds8g1qXe) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304260011) (:text |task) (:id |GmGwCUfHut) + :id |yuq8AwzC90 + :id |v7Ekmuu1nl + :id |vG03vVuZn5 |r $ {} (:type :expr) (:id |SkDxMssMg8h-) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |BJOlMjiGl8hW) (:text |<>) (:by |root) (:at 1507358342151) |j $ {} (:type :leaf) (:id |S1FefisGx8nZ) (:text ||Remove) (:by |root) (:at 1507357346880) - |on-input $ {} (:type :expr) (:id |r1zBbsizgLh-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |SyXrZjozlU3W) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |SyEHWssMxInZ) (:text |on-input) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |SySrbjizx8hW) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |S1UHZoofeU2-) (:text |task-id) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |rJDSbiofgUhZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |r1uHZosGxL2W) (:text |fn) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |rkFrZsozx82-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |BycB-ooGgI3W) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rkjSbjiMgU3Z) (:text |dispatch!) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |H1hH-oszeUnZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |rk6rWsifgI3-) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |SkRSZioGxL2W) (:text |:task/edit) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |ry1L-jsMlU2Z) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |BkgUZjozl8nb) (:text |[]) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |HybU-ojMxL2Z) (:text |task-id) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |Syf8-jofeInZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |H1QIbjszx82b) (:text |:value) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |Bk48-osMeLnZ) (:text |e) (:by |root) (:at 1507357346880) - |on-remove $ {} (:type :expr) (:id |Hysu-sifgLnZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |Bkh_WojfxI3-) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |Hk6u-ijfxU3Z) (:text |on-remove) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |HyAdZoszgUnZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |rJyFZjsGlL3-) (:text |task-id) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |r1gtWjjMg8hZ) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |BJ-Y-sizgU3W) (:text |fn) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |rJGt-siMeU3Z) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |rkQtWoiMeLnZ) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rJEF-sofx8hW) (:text |dispatch!) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |rkSt-ojGxLhb) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |BkLF-siGx8nb) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |BJvtWsjMeL2-) (:text |:task/remove) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:id |BydKbsofxU3W) (:text |task-id) (:by |root) (:at 1507357346880) - |on-toggle $ {} (:type :expr) (:id |Sk8D-iiGe8nb) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |H1wwbosflL3b) (:text |defn) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |BJOwWsjGe82Z) (:text |on-toggle) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |HJtwbioGg82Z) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |ryqw-jszxL3W) (:text |task-id) (:by |root) (:at 1507357346880) - |v $ {} (:type :expr) (:id |BysDZssGg82b) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |By3DZsoGlLhZ) (:text |fn) (:by |root) (:at 1507357346880) - |j $ {} (:type :expr) (:id |rk6P-ioGe8h-) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |r10PbsiMlIhZ) (:text |e) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |rykdWjoMgU2-) (:text |dispatch!) (:by |root) (:at 1507357346880) - |r $ {} (:type :expr) (:id |SJldbioGeU3W) (:by nil) (:at 1507357346880) - :data $ {} - |T $ {} (:type :leaf) (:id |Sk-O-ojzg8h-) (:text |dispatch!) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |r1fO-jjGgI2Z) (:text |:task/toggle) (:by |root) (:at 1507357346880) - |r $ {} (:type :leaf) (:id |Hk7dbiizgU3W) (:text |task-id) (:by |root) (:at 1507357346880) |style-container $ {} (:type :expr) (:id |S1oeMssMeInW) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |BknlGjszxUhZ) (:text |def) (:by |root) (:at 1507357346880) @@ -3031,7 +3010,12 @@ |r $ {} (:type :expr) (:id |r19HNijGgI2W) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |B1jHVijfxUnb) (:text |comp-todolist) (:by |root) (:at 1507357346880) - |j $ {} (:type :leaf) (:id |SJ3HEjjfeIhb) (:text |states) (:by |root) (:at 1507357346880) + |j $ {} (:type :expr) (:by |Oj4l0GxFU) (:at 1590304311062) + :data $ {} + |T $ {} (:type :leaf) (:id |SJ3HEjjfeIhb) (:text |states) (:by |root) (:at 1507357346880) + |D $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304311733) (:text |>>) (:id |tbrlL0uoCM) + |j $ {} (:type :leaf) (:by |Oj4l0GxFU) (:at 1590304313707) (:text |:todolist) (:id |x4Cf1UJ3TI) + :id |HvV5jMegA |r $ {} (:type :expr) (:id |Sy6HNjszg8nW) (:by nil) (:at 1507357346880) :data $ {} |T $ {} (:type :leaf) (:id |Bk0rVjozx8h-) (:text |:tasks) (:by |root) (:at 1507357346880) diff --git a/meyvn.edn b/meyvn.edn deleted file mode 100644 index b8ddd03..0000000 --- a/meyvn.edn +++ /dev/null @@ -1,9 +0,0 @@ - -{:pom {:group-id "respo", - :artifact-id "reel", - :version "0.3.5", - :name "Time travel demo for Respo"} - :packaging {:jar {:enabled true - :remote-repository {:id "clojars" - :url "https://clojars.org/repo"}}} - :scm {:enabled true}} diff --git a/package.json b/package.json index 76617ba..318eb16 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,11 @@ "author": "jiyinyiyong", "license": "MIT", "devDependencies": { - "http-server": "^0.12.1", - "shadow-cljs": "2.8.93" + "http-server": "^0.12.3", + "shadow-cljs": "2.9.8" }, "dependencies": { + "node-notifier": "7.0.1", "shortid": "^2.2.15" } } diff --git a/release.edn b/release.edn index 800d4cb..5d27d6f 100644 --- a/release.edn +++ b/release.edn @@ -1,4 +1,4 @@ -{:version "0.4.0" +{:version "0.4.1-a1" :group-id "respo" :artifact-id "reel" :skip-tag true diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 2f8ceb3..629a48f 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,10 +4,10 @@ :dependencies [ [mvc-works/hsl "0.1.2"] [mvc-works/shell-page "0.1.10"] - [respo "0.12.0"] + [respo "0.12.1"] [respo/ui "0.3.14"] [respo/value "0.3.0"] - [cumulo/util "0.1.10"] + [cumulo/util "0.1.11"] [cirru/favored-edn "0.1.3"] [org.clojure/core.incubator "0.1.4"] ] diff --git a/src/reel/comp/container.cljs b/src/reel/comp/container.cljs index 713687f..f3e3c92 100644 --- a/src/reel/comp/container.cljs +++ b/src/reel/comp/container.cljs @@ -13,5 +13,5 @@ (let [store (:store reel), states (:states store)] (div {:style (merge ui/global)} - (comp-todolist states (:tasks store)) + (comp-todolist (>> states :todolist) (:tasks store)) (comp-reel (>> states :reel) reel nil)))) diff --git a/src/reel/comp/reel.cljs b/src/reel/comp/reel.cljs index 28d53a7..eec92cc 100644 --- a/src/reel/comp/reel.cljs +++ b/src/reel/comp/reel.cljs @@ -10,16 +10,6 @@ [reel.style :as style] [favored-edn.core :refer [write-edn]])) -(defn on-merge [e dispatch! m!] (dispatch! :reel/merge nil)) - -(defn on-reset [e dispatch!] (dispatch! :reel/reset nil)) - -(defn on-run [e dispatch!] (dispatch! :reel/run nil)) - -(defn on-step [e d! m!] (d! :reel/step nil)) - -(defn on-toggle [e dispatch!] (dispatch! :reel/toggle nil)) - (defn render-button [guide on-click enabled?] (div {:style (merge ui/link {:user-select :none} (if (not enabled?) {:color (hsl 0 0 90)})), @@ -45,13 +35,13 @@ {:style (merge ui/flex ui/column style-reel user-styles)} (div {} - (render-button "Merge" on-merge true) - (render-button "Reset" on-reset true) - (render-button "Step" on-step (:stopped? reel)) - (render-button "Run" on-run (:stopped? reel)) - (render-button "Close" on-toggle (not (:stopped? reel)))) + (render-button "Merge" (fn [e d!] (d! :reel/merge nil)) true) + (render-button "Reset" (fn [e d!] (d! :reel/reset nil)) true) + (render-button "Step" (fn [e d!] (d! :reel/step nil)) (:stopped? reel)) + (render-button "Run" (fn [e d!] (d! :reel/run nil)) (:stopped? reel)) + (render-button "Close" (fn [e d!] (d! :reel/toggle nil)) (not (:stopped? reel)))) (div - {:style ui/row} + {:style (merge ui/expand ui/row)} (comp-records (:records reel) (:pointer reel)) (div {:style (merge ui/column ui/flex {:overflow :auto, :padding "0 8px"})} diff --git a/src/reel/comp/task.cljs b/src/reel/comp/task.cljs index f6f0897..1b77a2d 100644 --- a/src/reel/comp/task.cljs +++ b/src/reel/comp/task.cljs @@ -5,12 +5,6 @@ [respo.comp.space :refer [=<]] [respo-ui.core :as ui])) -(defn on-input [task-id] (fn [e dispatch!] (dispatch! :task/edit [task-id (:value e)]))) - -(defn on-remove [task-id] (fn [e dispatch!] (dispatch! :task/remove task-id))) - -(defn on-toggle [task-id] (fn [e dispatch!] (dispatch! :task/toggle task-id))) - (def style-container {:margin "8px 0", :height 32}) (def style-done @@ -27,17 +21,17 @@ {:style style-container} (div {:style (merge style-done (if (:done? task) {:background-color (hsl 42 100 60)})), - :on-click (on-toggle (:id task))}) + :on-click (fn [e d!] (d! :task/toggle (:id task)))}) (=< 8 nil) (input {:value (:text task), :placeholder "Content of task", - :on-input (on-input (:id task)), + :on-input (fn [e d!] (d! :task/edit [(:id task) (:value e)])), :style ui/input}) (=< 8 nil) (button {:style (merge ui/button {:background-color (hsl 6 100 60), :color :white, :border :none}), - :on-click (on-remove (:id task))} + :on-click (fn [e d!] (d! :task/remove (:id task)))} (<> "Remove")))) diff --git a/src/reel/comp/todolist.cljs b/src/reel/comp/todolist.cljs index eb5000a..ba0c02a 100644 --- a/src/reel/comp/todolist.cljs +++ b/src/reel/comp/todolist.cljs @@ -5,16 +5,12 @@ [respo-ui.core :as ui] [reel.comp.task :refer [comp-task]])) -(defn on-click [state] (fn [e dispatch! mutate!] (dispatch! :task/add state) (mutate! ""))) - -(defn on-input [e dispatch! mutate!] (mutate! (:value e))) - (def style-container {:padding 8, :overflow :auto}) (defcomp comp-todolist (states tasks) - (let [state (or (:data states) "")] + (let [cursor (:cursor states), state (or (:data states) "")] (div {:style (merge ui/fullscreen style-container)} (div @@ -23,8 +19,10 @@ {:placeholder "Task to add...", :value state, :style ui/input, - :on-input on-input, - :on-keydown (fn [e d! m!] (if (= (:keycode e) 13) (do (d! :task/add state) (m! ""))))}) + :on-input (fn [e d!] (d! cursor (:value e))), + :on-keydown (fn [e d!] (if (= (:keycode e) 13) (do (d! :task/add state) (d! [] ""))))}) (=< 8 nil) - (button {:style ui/button, :on-click (on-click state)} (<> "Add"))) + (button + {:style ui/button, :on-click (fn [e d!] (d! :task/add state) (d! cursor ""))} + (<> "Add"))) (list-> {} (->> tasks (map (fn [task] [(:id task) (comp-task task)]))))))) diff --git a/src/reel/updater.cljs b/src/reel/updater.cljs index 0e8f8b8..77b1b23 100644 --- a/src/reel/updater.cljs +++ b/src/reel/updater.cljs @@ -1,11 +1,9 @@ -(ns reel.updater ) +(ns reel.updater (:require [respo.cursor :refer [update-states]])) (defn updater [store op op-data op-id op-time] (case op - :states - (let [[cursor new-state] op-data] - (assoc-in store (concat [:states] op [:data]) new-state)) + :states (update-states store op-data) :task/add (update store :tasks (fn [tasks] (cons {:id op-id, :done? false, :text op-data} tasks))) :task/remove diff --git a/yarn.lock b/yarn.lock index fd00b59..b330c7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,12 +21,12 @@ assert@^1.1.1: async-limiter@~1.0.0: version "1.0.1" - resolved "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-limiter%2Fdownload%2Fasync-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + resolved "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha1-3TeelPDbgxCwgpH51kwyCXZmF/0= async@^2.6.2: version "2.6.3" - resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz?cache=0&sync_timestamp=1582540512270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync%2Fdownload%2Fasync-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" integrity sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8= dependencies: lodash "^4.17.14" @@ -41,10 +41,15 @@ basic-auth@^1.0.3: resolved "https://registry.npm.taobao.org/basic-auth/download/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884" integrity sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ= -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.npm.taobao.org/bn.js/download/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - integrity sha1-LN4J617jQfSEdGuwMJsyU7GxRC8= +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: + version "4.11.9" + resolved "https://registry.npm.taobao.org/bn.js/download/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" + integrity sha1-JtVWgpRY+dHoH8SJUkk9C6NQeCg= + +bn.js@^5.1.1: + version "5.1.2" + resolved "https://registry.npm.taobao.org/bn.js/download/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0" + integrity sha1-yWhpAtPJoncp9DqxD515wgBNp7A= brorand@^1.0.1: version "1.1.0" @@ -82,7 +87,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -browserify-rsa@^4.0.0: +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: version "4.0.1" resolved "https://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= @@ -91,17 +96,19 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg= - dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" + version "4.2.0" + resolved "https://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11" + integrity sha1-VF0LGwfmssmSEQgr8bEsznoLDhE= + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.2" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" browserify-zlib@^0.2.0: version "0.2.0" @@ -137,7 +144,7 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -colors@^1.3.3: +colors@^1.4.0: version "1.4.0" resolved "https://registry.npm.taobao.org/colors/download/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha1-xQSRR51MG9rtLJztMs98fcI2D3g= @@ -170,7 +177,7 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.0.0" -create-hash@^1.1.0, create-hash@^1.1.2: +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: version "1.2.0" resolved "https://registry.npm.taobao.org/create-hash/download/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" integrity sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY= @@ -181,7 +188,7 @@ create-hash@^1.1.0, create-hash@^1.1.2: ripemd160 "^2.0.1" sha.js "^2.4.0" -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: version "1.1.7" resolved "https://registry.npm.taobao.org/create-hmac/download/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" integrity sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8= @@ -212,7 +219,7 @@ crypto-browserify@^3.11.0: debug@^3.0.0, debug@^3.1.1: version "3.2.6" - resolved "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + resolved "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz?cache=0&sync_timestamp=1589881689076&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha1-6D0X3hbYp++3cX7b5fsQE17uYps= dependencies: ms "^2.1.1" @@ -236,7 +243,7 @@ diffie-hellman@^5.0.0: domain-browser@^1.1.1: version "1.2.0" - resolved "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" + resolved "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1590072213865&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto= ecstatic@^3.3.2: @@ -249,7 +256,7 @@ ecstatic@^3.3.2: minimist "^1.1.0" url-join "^2.0.5" -elliptic@^6.0.0: +elliptic@^6.0.0, elliptic@^6.5.2: version "6.5.2" resolved "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" integrity sha1-BcVnjXFzwEnYykM1UiJKSV0ON2I= @@ -263,13 +270,13 @@ elliptic@^6.0.0: minimalistic-crypto-utils "^1.0.0" eventemitter3@^4.0.0: - version "4.0.0" - resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" - integrity sha1-1lF2FjiH7lnzhtZMgmELaWpKdOs= + version "4.0.4" + resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.4.tgz?cache=0&sync_timestamp=1589283064603&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventemitter3%2Fdownload%2Feventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" + integrity sha1-tUY6zmNaCD0Bi9x8kXtMXxCoU4Q= events@^3.0.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/events/download/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" + resolved "https://registry.npm.taobao.org/events/download/events-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fevents%2Fdownload%2Fevents-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" integrity sha1-hCea8bNMt1qoi/X/KR9tC9mzGlk= evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: @@ -281,19 +288,25 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: safe-buffer "^5.1.1" follow-redirects@^1.0.0: - version "1.10.0" - resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" - integrity sha1-AfUmOu6SHGpU+5Fmfwj0FVzhaes= + version "1.11.0" + resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" + integrity sha1-r6FPCLoSpSljFA/kMhJliJe8Dss= dependencies: debug "^3.0.0" +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.npm.taobao.org/growly/download/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + hash-base@^3.0.0: - version "3.0.4" - resolved "https://registry.npm.taobao.org/hash-base/download/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg= + version "3.1.0" + resolved "https://registry.npm.taobao.org/hash-base/download/hash-base-3.1.0.tgz?cache=0&sync_timestamp=1588318012719&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhash-base%2Fdownload%2Fhash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha1-VcOB2eBuHSmXqIO0o/3f5/DTrzM= dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.7" @@ -317,28 +330,28 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -http-proxy@^1.17.0: - version "1.18.0" - resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" - integrity sha1-2+VfY+daNH2389mZdPJpKjFKajo= +http-proxy@^1.18.0: + version "1.18.1" + resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz?cache=0&sync_timestamp=1589753995263&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" follow-redirects "^1.0.0" requires-port "^1.0.0" -http-server@^0.12.1: - version "0.12.1" - resolved "https://registry.npm.taobao.org/http-server/download/http-server-0.12.1.tgz#629ae9a8c786587ee21b0ff087b670f69b809d8c" - integrity sha1-YprpqMeGWH7iGw/wh7Zw9puAnYw= +http-server@^0.12.3: + version "0.12.3" + resolved "https://registry.npm.taobao.org/http-server/download/http-server-0.12.3.tgz#ba0471d0ecc425886616cb35c4faf279140a0d37" + integrity sha1-ugRx0OzEJYhmFss1xPryeRQKDTc= dependencies: basic-auth "^1.0.3" - colors "^1.3.3" + colors "^1.4.0" corser "^2.0.1" ecstatic "^3.3.2" - http-proxy "^1.17.0" + http-proxy "^1.18.0" + minimist "^1.2.5" opener "^1.5.1" - optimist "~0.6.1" - portfinder "^1.0.20" + portfinder "^1.0.25" secure-compare "3.0.1" union "~0.5.0" @@ -362,11 +375,23 @@ inherits@2.0.3: resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: +inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w= +is-docker@^2.0.0: + version "2.0.0" + resolved "https://registry.npm.taobao.org/is-docker/download/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b" + integrity sha1-LLDfDnXi0GT+GGTDfN6st7Lc8ls= + +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1588494157943&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= + dependencies: + is-docker "^2.0.0" + isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -419,15 +444,10 @@ minimist@^1.1.0, minimist@^1.2.5: resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.npm.taobao.org/minimist/download/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= - mkdirp@^0.5.1: - version "0.5.3" - resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.3.tgz?cache=0&sync_timestamp=1584725920775&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmkdirp%2Fdownload%2Fmkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c" - integrity sha1-WlFLcXklkoeVKIHpRBDsVGVln4w= + version "0.5.5" + resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8= dependencies: minimist "^1.2.5" @@ -470,9 +490,21 @@ node-libs-browser@^2.0.0: util "^0.11.0" vm-browserify "^1.0.1" +node-notifier@7.0.1: + version "7.0.1" + resolved "https://registry.npm.taobao.org/node-notifier/download/node-notifier-7.0.1.tgz#a355e33e6bebacef9bf8562689aed0f4230ca6f9" + integrity sha1-o1XjPmvrrO+b+FYmia7Q9CMMpvk= + dependencies: + growly "^1.3.0" + is-wsl "^2.1.1" + semver "^7.2.1" + shellwords "^0.1.1" + uuid "^7.0.3" + which "^2.0.2" + object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-assign%2Fdownload%2Fobject-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= opener@^1.5.1: @@ -480,14 +512,6 @@ opener@^1.5.1: resolved "https://registry.npm.taobao.org/opener/download/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" integrity sha1-bS8Od/GgrwAyrKcWwsH7uOfoq+0= -optimist@~0.6.1: - version "0.6.1" - resolved "https://registry.npm.taobao.org/optimist/download/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" @@ -495,10 +519,10 @@ os-browserify@^0.3.0: pako@~1.0.5: version "1.0.11" - resolved "https://registry.npm.taobao.org/pako/download/pako-1.0.11.tgz?cache=0&sync_timestamp=1580284264887&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpako%2Fdownload%2Fpako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + resolved "https://registry.npm.taobao.org/pako/download/pako-1.0.11.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpako%2Fdownload%2Fpako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8= -parse-asn1@^5.0.0: +parse-asn1@^5.0.0, parse-asn1@^5.1.5: version "5.1.5" resolved "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" integrity sha1-ADJxND2ljclMrOSU+u89IUfs6g4= @@ -526,10 +550,10 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -portfinder@^1.0.20: - version "1.0.25" - resolved "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca" - integrity sha1-JU/TN/+6hp9LnTftwpgFnLTTXso= +portfinder@^1.0.25: + version "1.0.26" + resolved "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70" + integrity sha1-R1ZY1WyjC+1yrH8TeO01C9G2TnA= dependencies: async "^2.6.2" debug "^3.1.1" @@ -568,9 +592,9 @@ punycode@^1.2.4: integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= qs@^6.4.0: - version "6.9.1" - resolved "https://registry.npm.taobao.org/qs/download/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9" - integrity sha1-IAgsZct4IjY1qxqerKiHWim/jsk= + version "6.9.4" + resolved "https://registry.npm.taobao.org/qs/download/qs-6.9.4.tgz?cache=0&sync_timestamp=1588543068614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" + integrity sha1-kJCykNH5FyjTwi5UhDykSupatoc= querystring-es3@^0.2.0: version "0.2.1" @@ -610,6 +634,15 @@ readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg= + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readline-sync@^1.4.7: version "1.4.10" resolved "https://registry.npm.taobao.org/readline-sync/download/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" @@ -628,14 +661,14 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.0" - resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha1-t02uxJsRSPiMZLaNSbHoFcHy9Rk= +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz?cache=0&sync_timestamp=1589129611964&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1589129611964&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= secure-compare@3.0.1: @@ -643,6 +676,11 @@ secure-compare@3.0.1: resolved "https://registry.npm.taobao.org/secure-compare/download/secure-compare-3.0.1.tgz#f1a0329b308b221fae37b9974f3d578d0ca999e3" integrity sha1-8aAymzCLIh+uN7mXTz1XjQypmeM= +semver@^7.2.1: + version "7.3.2" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha1-YElisFK4HtB4aq6EOJ/7pw/9OTg= + setimmediate@^1.0.4: version "1.0.5" resolved "https://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -661,12 +699,11 @@ shadow-cljs-jar@1.3.2: resolved "https://registry.npm.taobao.org/shadow-cljs-jar/download/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b" integrity sha1-lyc6/hdHtqIxGRfByI2eJDyBlXs= -shadow-cljs@2.8.93: - version "2.8.93" - resolved "https://registry.npm.taobao.org/shadow-cljs/download/shadow-cljs-2.8.93.tgz#60d475658819246892f74159ce5a6026b275892e" - integrity sha1-YNR1ZYgZJGiS90FZzlpgJrJ1iS4= +shadow-cljs@2.9.8: + version "2.9.8" + resolved "https://registry.npm.taobao.org/shadow-cljs/download/shadow-cljs-2.9.8.tgz#df4eada8449c195deeef7e3d8f39de6fc084f5f0" + integrity sha1-306tqEScGV3u7349jzneb8CE9fA= dependencies: - mkdirp "^0.5.1" node-libs-browser "^2.0.0" readline-sync "^1.4.7" shadow-cljs-jar "1.3.2" @@ -674,6 +711,11 @@ shadow-cljs@2.8.93: which "^1.3.1" ws "^3.0.0" +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.npm.taobao.org/shellwords/download/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= + shortid@^2.2.15: version "2.2.15" resolved "https://registry.npm.taobao.org/shortid/download/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122" @@ -683,7 +725,7 @@ shortid@^2.2.15: source-map-support@^0.4.15: version "0.4.18" - resolved "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.4.18.tgz?cache=0&sync_timestamp=1572390065703&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + resolved "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" integrity sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8= dependencies: source-map "^0.5.6" @@ -703,7 +745,7 @@ stream-browserify@^2.0.1: stream-http@^2.7.2: version "2.8.3" - resolved "https://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" + resolved "https://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz?cache=0&sync_timestamp=1588701397289&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstream-http%2Fdownload%2Fstream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" integrity sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw= dependencies: builtin-status-codes "^3.0.0" @@ -712,7 +754,7 @@ stream-http@^2.7.2: to-arraybuffer "^1.0.0" xtend "^4.0.0" -string_decoder@^1.0.0: +string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha1-QvEUWUpGzxqOMLCoT1bHjD7awh4= @@ -768,45 +810,52 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" -util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= util@0.10.3: version "0.10.3" - resolved "https://registry.npm.taobao.org/util/download/util-0.10.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil%2Fdownload%2Futil-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + resolved "https://registry.npm.taobao.org/util/download/util-0.10.3.tgz?cache=0&sync_timestamp=1588238397004&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil%2Fdownload%2Futil-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= dependencies: inherits "2.0.1" util@^0.11.0: version "0.11.1" - resolved "https://registry.npm.taobao.org/util/download/util-0.11.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil%2Fdownload%2Futil-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" + resolved "https://registry.npm.taobao.org/util/download/util-0.11.1.tgz?cache=0&sync_timestamp=1588238397004&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil%2Fdownload%2Futil-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" integrity sha1-MjZzNyDsZLsn9uJvQhqqLhtYjWE= dependencies: inherits "2.0.3" +uuid@^7.0.3: + version "7.0.3" + resolved "https://registry.npm.taobao.org/uuid/download/uuid-7.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" + integrity sha1-xcnyyM8l3Ao3LE3xRBxB9b0MaAs= + vm-browserify@^1.0.1: version "1.1.2" - resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1572870772154&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" + resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA= which@^1.3.1: version "1.3.1" - resolved "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&sync_timestamp=1574116262707&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + resolved "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= dependencies: isexe "^2.0.0" -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= +which@^2.0.2: + version "2.0.2" + resolved "https://registry.npm.taobao.org/which/download/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= + dependencies: + isexe "^2.0.0" ws@^3.0.0: version "3.3.3" - resolved "https://registry.npm.taobao.org/ws/download/ws-3.3.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fws%2Fdownload%2Fws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" + resolved "https://registry.npm.taobao.org/ws/download/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" integrity sha1-8c+E/i1ekB686U767OeF8YeiKPI= dependencies: async-limiter "~1.0.0"