diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f24657c..cf55c53 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -19,15 +19,15 @@ jobs: - uses: supplypike/setup-bin@v3 with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a1/cr' + uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a3/cr' name: 'cr' - version: '0.8.0-a1' + version: '0.8.0-a3' - uses: supplypike/setup-bin@v3 with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a1/caps' + uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a3/caps' name: 'caps' - version: '0.8.0-a1' + version: '0.8.0-a3' - name: "load deps" run: caps --ci && yarn diff --git a/calcit.cirru b/calcit.cirru index 2a2626d..6b33609 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1,10 +1,10 @@ {} (:package |respo) - :configs $ {} (:init-fn |respo.main/main!) (:port 6001) (:reload-fn |respo.main/reload!) (:storage-key |calcit.cirru) (:version |0.16.0-a1) + :configs $ {} (:init-fn |respo.main/main!) (:port 6001) (:reload-fn |respo.main/reload!) (:storage-key |calcit.cirru) (:version |0.16.0-a3) :modules $ [] |memof/ |lilac/ |calcit-test/ :entries $ {} :files $ {} - |respo.app.comp.container $ {} + |respo.app.comp.container $ %{} :FileEntry :defs $ {} |comp-container $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -63,7 +63,7 @@ |L $ %{} :Leaf (:at 1623582927810) (:by |rJoDgvdeG) (:text "||states: ") |T $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |pr-str) + |T $ %{} :Leaf (:at 1693242544168) (:by |rJoDgvdeG) (:text |to-lispy-string) |j $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1505327099898) (:by |root) (:text |:states) @@ -159,7 +159,7 @@ |h $ %{} :Expr (:at 1656036572901) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1656036578628) (:by |rJoDgvdeG) (:text |comp-global-keydown) - |respo.app.comp.task $ {} + |respo.app.comp.task $ %{} :FileEntry :defs $ {} |comp-task $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -604,7 +604,7 @@ |h $ %{} :Expr (:at 1651180816793) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1651180818894) (:by |rJoDgvdeG) (:text |defstyle) - |respo.app.comp.todolist $ {} + |respo.app.comp.todolist $ %{} :FileEntry :defs $ {} |comp-todolist $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -1589,7 +1589,7 @@ |h $ %{} :Expr (:at 1651251932285) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1651251933338) (:by |rJoDgvdeG) (:text |defstyle) - |respo.app.comp.wrap $ {} + |respo.app.comp.wrap $ %{} :FileEntry :defs $ {} |comp-wrap $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -1622,7 +1622,7 @@ :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |defcomp) |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |div) - |respo.app.comp.zero $ {} + |respo.app.comp.zero $ %{} :FileEntry :defs $ {} |comp-zero $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -1657,7 +1657,7 @@ :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |defcomp) |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |div) - |respo.app.core $ {} + |respo.app.core $ %{} :FileEntry :defs $ {} |*store $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -1781,7 +1781,7 @@ |r $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |updater) - |respo.app.schema $ {} + |respo.app.schema $ %{} :FileEntry :defs $ {} |store $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -1834,7 +1834,7 @@ :data $ {} |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |ns) |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |respo.app.schema) - |respo.app.style.widget $ {} + |respo.app.style.widget $ %{} :FileEntry :defs $ {} |button $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -1981,7 +1981,7 @@ |h $ %{} :Expr (:at 1651176727189) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1651176727189) (:by |rJoDgvdeG) (:text |defstyle) - |respo.app.updater $ {} + |respo.app.updater $ %{} :FileEntry :defs $ {} |updater $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -2260,8 +2260,7 @@ |v $ %{} :Expr (:at 1584871894046) (:by |rJoDgvdeG) :data $ {} |j $ %{} :Leaf (:at 1584874768040) (:by |rJoDgvdeG) (:text |update-states) - |respo.comp.global-keydown $ {} - :configs $ {} + |respo.comp.global-keydown $ %{} :FileEntry :defs $ {} |comp-global-keydown $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1656036144286) (:by |rJoDgvdeG) @@ -2503,7 +2502,7 @@ |u $ %{} :Leaf (:at 1656036197488) (:by |rJoDgvdeG) (:text |input) |v $ %{} :Leaf (:at 1656036197488) (:by |rJoDgvdeG) (:text |a) |w $ %{} :Leaf (:at 1656036197488) (:by |rJoDgvdeG) (:text |list->) - |respo.comp.inspect $ {} + |respo.comp.inspect $ %{} :FileEntry :defs $ {} |comp-inspect $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -2702,7 +2701,7 @@ |T $ %{} :Leaf (:at 1610203140138) (:by |rJoDgvdeG) (:text |true) |j $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |pr-str) + |T $ %{} :Leaf (:at 1693242532389) (:by |rJoDgvdeG) (:text |to-lispy-string) |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |data) |style-data $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -2798,7 +2797,7 @@ |h $ %{} :Expr (:at 1651181155774) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1651181158090) (:by |rJoDgvdeG) (:text |defstyle) - |respo.comp.space $ {} + |respo.comp.space $ %{} :FileEntry :defs $ {} |=< $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -2887,7 +2886,7 @@ :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |div) |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |defcomp) - |respo.controller.client $ {} + |respo.controller.client $ %{} :FileEntry :defs $ {} |activate-instance! $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -3036,7 +3035,7 @@ |v $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |make-element) - |respo.controller.resolve $ {} + |respo.controller.resolve $ %{} :FileEntry :defs $ {} |build-deliver-event $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -3289,7 +3288,7 @@ |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text "||target element:") |v $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |pr-str) + |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |to-lispy-string) |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |event-name) |v $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} @@ -3357,7 +3356,7 @@ |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text ||markup:) |v $ %{} :Expr (:at 1504774121421) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |pr-str) + |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |to-lispy-string) |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |coord) |y $ %{} :Expr (:at 1691040045606) (:by |rJoDgvdeG) :data $ {} @@ -3467,7 +3466,7 @@ :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |component?) |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |element?) - |respo.core $ {} + |respo.core $ %{} :FileEntry :defs $ {} |*changes-logger $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -3792,7 +3791,7 @@ |j $ %{} :Leaf (:at 1611379933883) (:by |rJoDgvdeG) (:text "||For rendering lists, please use list-> , got: ") |r $ %{} :Expr (:at 1611379933883) (:by |rJoDgvdeG) :data $ {} - |T $ %{} :Leaf (:at 1611379933883) (:by |rJoDgvdeG) (:text |pr-str) + |T $ %{} :Leaf (:at 1611379933883) (:by |rJoDgvdeG) (:text |to-lispy-string) |j $ %{} :Leaf (:at 1611379933883) (:by |rJoDgvdeG) (:text |children) |T $ %{} :Expr (:at 1610187405339) (:by |rJoDgvdeG) :data $ {} @@ -5221,8 +5220,7 @@ |h $ %{} :Expr (:at 1650634108519) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1650634136585) (:by |rJoDgvdeG) (:text |reset-memof1-caches!) - |respo.css $ {} - :configs $ {} + |respo.css $ %{} :FileEntry :defs $ {} |*style-caches $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1651174578680) (:by |rJoDgvdeG) @@ -5627,7 +5625,7 @@ |h $ %{} :Expr (:at 1651175809751) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1651175809751) (:by |rJoDgvdeG) (:text |style->string) - |respo.cursor $ {} + |respo.cursor $ %{} :FileEntry :defs $ {} |update-states $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1584871832107) (:by |rJoDgvdeG) @@ -5661,7 +5659,7 @@ :data $ {} |T $ %{} :Leaf (:at 1584871828389) (:by |rJoDgvdeG) (:text |ns) |j $ %{} :Leaf (:at 1584871828389) (:by |rJoDgvdeG) (:text |respo.cursor) - |respo.main $ {} + |respo.main $ %{} :FileEntry :defs $ {} |main! $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1511714064801) (:by |rJoDgvdeG) @@ -5861,7 +5859,7 @@ |v $ %{} :Expr (:at 1612763217245) (:by |rJoDgvdeG) :data $ {} |j $ %{} :Leaf (:at 1612763217776) (:by |rJoDgvdeG) (:text |handle-ssr!) - |respo.render.diff $ {} + |respo.render.diff $ %{} :FileEntry :defs $ {} |detect-keys-dup $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1673971796926) (:by |rJoDgvdeG) @@ -7843,7 +7841,7 @@ |h $ %{} :Expr (:at 1673971813536) (:by |rJoDgvdeG) :data $ {} |T $ %{} :Leaf (:at 1673971815002) (:by |rJoDgvdeG) (:text |dev?) - |respo.render.dom $ {} + |respo.render.dom $ %{} :FileEntry :defs $ {} |make-element $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -8279,7 +8277,7 @@ |v $ %{} :Expr (:at 1612020927304) (:by |rJoDgvdeG) :data $ {} |j $ %{} :Leaf (:at 1612020929515) (:by |rJoDgvdeG) (:text |component?) - |respo.render.effect $ {} + |respo.render.effect $ %{} :FileEntry :defs $ {} |collect-mounting $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1571579646781) (:by |rJoDgvdeG) @@ -8881,7 +8879,7 @@ |v $ %{} :Expr (:at 1572885780888) (:by |rJoDgvdeG) :data $ {} |j $ %{} :Leaf (:at 1572885781518) (:by |rJoDgvdeG) (:text |val-of-first) - |respo.render.html $ {} + |respo.render.html $ %{} :FileEntry :defs $ {} |element->string $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -9444,7 +9442,7 @@ :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |component?) |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |element?) - |respo.render.patch $ {} + |respo.render.patch $ %{} :FileEntry :defs $ {} |add-element $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -10410,7 +10408,7 @@ |j $ %{} :Leaf (:at 1513921101977) (:by |root) (:text |respo.schema.op) |r $ %{} :Leaf (:at 1513921033014) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1513921103387) (:by |root) (:text |op) - |respo.schema $ {} + |respo.schema $ %{} :FileEntry :defs $ {} |Component $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1615278579000) (:by |rJoDgvdeG) @@ -10531,7 +10529,7 @@ :data $ {} |T $ %{} :Leaf (:at 1505328949889) (:by |root) (:text |ns) |j $ %{} :Leaf (:at 1505328949889) (:by |root) (:text |respo.schema) - |respo.test.comp.task $ {} + |respo.test.comp.task $ %{} :FileEntry :defs $ {} |comp-task $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -10584,7 +10582,7 @@ |D $ %{} :Leaf (:at 1505409019792) (:by |root) (:text |defcomp) |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |div) |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |span) - |respo.test.comp.todolist $ {} + |respo.test.comp.todolist $ %{} :FileEntry :defs $ {} |comp-todolist $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -10674,7 +10672,7 @@ |D $ %{} :Leaf (:at 1505409082913) (:by |root) (:text |defcomp) |T $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |div) |j $ %{} :Leaf (:at 1511711981544) (:by |rJoDgvdeG) (:text |list->) - |respo.test.html $ {} + |respo.test.html $ %{} :FileEntry :defs $ {} |html-quote-test $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1511711065520) (:by |rJoDgvdeG) @@ -11044,7 +11042,7 @@ |v $ %{} :Expr (:at 1511711143323) (:by |rJoDgvdeG) :data $ {} |j $ %{} :Leaf (:at 1511711145892) (:by |rJoDgvdeG) (:text |make-string) - |respo.test.main $ {} + |respo.test.main $ %{} :FileEntry :defs $ {} |main! $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1511710961298) (:by |rJoDgvdeG) @@ -11232,7 +11230,7 @@ :data $ {} |j $ %{} :Leaf (:at 1513784033999) (:by |root) (:text |pick-attrs) |r $ %{} :Leaf (:at 1513784040329) (:by |root) (:text |pick-event) - |respo.util.detect $ {} + |respo.util.detect $ %{} :FileEntry :defs $ {} |=seq $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -11384,7 +11382,7 @@ |j $ %{} :Leaf (:at 1615282269264) (:by |rJoDgvdeG) (:text |respo.schema) |r $ %{} :Leaf (:at 1615282269966) (:by |rJoDgvdeG) (:text |:as) |v $ %{} :Leaf (:at 1615282270722) (:by |rJoDgvdeG) (:text |schema) - |respo.util.dom $ {} + |respo.util.dom $ %{} :FileEntry :defs $ {} |compare-to-dom! $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1529815704509) (:by |root) @@ -11459,7 +11457,7 @@ |n $ %{} :Leaf (:at 1529832761307) (:by |root) (:text "|\"SSR checking: tag names do not match:") |t $ %{} :Expr (:at 1529832830626) (:by |root) :data $ {} - |D $ %{} :Leaf (:at 1529832832009) (:by |root) (:text |pr-str) + |D $ %{} :Leaf (:at 1529832832009) (:by |root) (:text |to-lispy-string) |T $ %{} :Expr (:at 1529831819690) (:by |root) :data $ {} |D $ %{} :Leaf (:at 1529831821094) (:by |root) (:text |dissoc) @@ -11551,7 +11549,7 @@ :data $ {} |T $ %{} :Leaf (:at 1529832871319) (:by |root) (:text |map) |j $ %{} :Leaf (:at 1529832873317) (:by |root) (:text |:name) - |q $ %{} :Leaf (:at 1529833137299) (:by |root) (:text |pr-str) + |q $ %{} :Leaf (:at 1529833137299) (:by |root) (:text |to-lispy-string) |r $ %{} :Expr (:at 1529831602840) (:by |root) :data $ {} |j $ %{} :Leaf (:at 1622299065086) (:by |rJoDgvdeG) (:text |js/console.log) @@ -11706,7 +11704,7 @@ |v $ %{} :Expr (:at 1572885817942) (:by |rJoDgvdeG) :data $ {} |j $ %{} :Leaf (:at 1572885819155) (:by |rJoDgvdeG) (:text |val-of-first) - |respo.util.format $ {} + |respo.util.format $ %{} :FileEntry :defs $ {} |dashed->camel $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504774121421) (:by nil) @@ -12454,7 +12452,7 @@ :data $ {} |j $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |component?) |r $ %{} :Leaf (:at 1504774121421) (:by |root) (:text |element?) - |respo.util.list $ {} + |respo.util.list $ %{} :FileEntry :defs $ {} |map-with-idx $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1517740647082) (:by |root) @@ -12777,7 +12775,7 @@ |L $ {} (:at 1623582927810) (:by |rJoDgvdeG) (:text "||states: ") (:type :leaf) |T $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} - |T $ {} (:at 1504774121421) (:by |root) (:text |pr-str) (:type :leaf) + |T $ {} (:at 1504774121421) (:by |root) (:text |to-lispy-string) (:type :leaf) |j $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} |T $ {} (:at 1505327099898) (:by |root) (:text |:states) (:type :leaf) @@ -15389,7 +15387,7 @@ |T $ {} (:at 1610203140138) (:by |rJoDgvdeG) (:text |true) (:type :leaf) |j $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} - |T $ {} (:at 1504774121421) (:by |root) (:text |pr-str) (:type :leaf) + |T $ {} (:at 1504774121421) (:by |root) (:text |to-lispy-string) (:type :leaf) |j $ {} (:at 1504774121421) (:by |root) (:text |data) (:type :leaf) |style-data $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} @@ -15970,7 +15968,7 @@ |r $ {} (:at 1504774121421) (:by |root) (:text "||target element:") (:type :leaf) |v $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} - |T $ {} (:at 1504774121421) (:by |root) (:text |pr-str) (:type :leaf) + |T $ {} (:at 1504774121421) (:by |root) (:text |to-lispy-string) (:type :leaf) |j $ {} (:at 1504774121421) (:by |root) (:text |event-name) (:type :leaf) |v $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} @@ -16037,7 +16035,7 @@ |r $ {} (:at 1504774121421) (:by |root) (:text ||markup:) (:type :leaf) |v $ {} (:at 1504774121421) (:by nil) (:type :expr) :data $ {} - |T $ {} (:at 1504774121421) (:by |root) (:text |pr-str) (:type :leaf) + |T $ {} (:at 1504774121421) (:by |root) (:text |to-lispy-string) (:type :leaf) |j $ {} (:at 1504774121421) (:by |root) (:text |coord) (:type :leaf) |y $ {} (:at 1691040045606) (:by |rJoDgvdeG) (:type :expr) :data $ {} @@ -16459,7 +16457,7 @@ |j $ {} (:at 1611379933883) (:by |rJoDgvdeG) (:text "||For rendering lists, please use list-> , got: ") (:type :leaf) |r $ {} (:at 1611379933883) (:by |rJoDgvdeG) (:type :expr) :data $ {} - |T $ {} (:at 1611379933883) (:by |rJoDgvdeG) (:text |pr-str) (:type :leaf) + |T $ {} (:at 1611379933883) (:by |rJoDgvdeG) (:text |to-lispy-string) (:type :leaf) |j $ {} (:at 1611379933883) (:by |rJoDgvdeG) (:text |children) (:type :leaf) |T $ {} (:at 1610187405339) (:by |rJoDgvdeG) (:type :expr) :data $ {} @@ -24049,7 +24047,7 @@ |n $ {} (:at 1529832761307) (:by |root) (:text "|\"SSR checking: tag names do not match:") (:type :leaf) |t $ {} (:at 1529832830626) (:by |root) (:type :expr) :data $ {} - |D $ {} (:at 1529832832009) (:by |root) (:text |pr-str) (:type :leaf) + |D $ {} (:at 1529832832009) (:by |root) (:text |to-lispy-string) (:type :leaf) |T $ {} (:at 1529831819690) (:by |root) (:type :expr) :data $ {} |D $ {} (:at 1529831821094) (:by |root) (:text |dissoc) (:type :leaf) @@ -24141,7 +24139,7 @@ :data $ {} |T $ {} (:at 1529832871319) (:by |root) (:text |map) (:type :leaf) |j $ {} (:at 1529832873317) (:by |root) (:text |:name) (:type :leaf) - |q $ {} (:at 1529833137299) (:by |root) (:text |pr-str) (:type :leaf) + |q $ {} (:at 1529833137299) (:by |root) (:text |to-lispy-string) (:type :leaf) |r $ {} (:at 1529831602840) (:by |root) (:type :expr) :data $ {} |j $ {} (:at 1622299065086) (:by |rJoDgvdeG) (:text |js/console.log) (:type :leaf) diff --git a/compact.cirru b/compact.cirru index 5a5c16c..d863f74 100644 --- a/compact.cirru +++ b/compact.cirru @@ -1,10 +1,10 @@ {} (:package |respo) - :configs $ {} (:init-fn |respo.main/main!) (:reload-fn |respo.main/reload!) (:version |0.16.0-a1) + :configs $ {} (:init-fn |respo.main/main!) (:reload-fn |respo.main/reload!) (:version |0.16.0-a3) :modules $ [] |memof/ |lilac/ |calcit-test/ :entries $ {} :files $ {} - |respo.app.comp.container $ {} + |respo.app.comp.container $ %{} :FileEntry :defs $ {} |comp-container $ %{} :CodeEntry (:doc |) :code $ quote @@ -17,7 +17,7 @@ div {} $ :style style-states <> $ str "|states: " - pr-str $ :states store + to-lispy-string $ :states store comp-global-keydown {} $ :disabled-commands (#{} "\"s" "\"p") fn (e d!) (js/console.log "\"keydown" e) @@ -34,7 +34,7 @@ respo.app.comp.todolist :refer $ comp-todolist respo.comp.space :refer $ =< respo.comp.global-keydown :refer $ comp-global-keydown - |respo.app.comp.task $ {} + |respo.app.comp.task $ %{} :FileEntry :defs $ {} |comp-task $ %{} :CodeEntry (:doc |) :code $ quote @@ -99,7 +99,7 @@ respo.comp.inspect :refer $ comp-inspect respo.app.style.widget :as widget respo.css :refer $ defstyle - |respo.app.comp.todolist $ {} + |respo.app.comp.todolist $ %{} :FileEntry :defs $ {} |comp-todolist $ %{} :CodeEntry (:doc |) :code $ quote @@ -250,7 +250,7 @@ respo.app.style.widget :as widget memof.once :refer $ memof1-call-by respo.css :refer $ defstyle - |respo.app.comp.wrap $ {} + |respo.app.comp.wrap $ %{} :FileEntry :defs $ {} |comp-wrap $ %{} :CodeEntry (:doc |) :code $ quote @@ -260,7 +260,7 @@ :code $ quote ns respo.app.comp.wrap $ :require respo.core :refer $ defcomp div - |respo.app.comp.zero $ {} + |respo.app.comp.zero $ %{} :FileEntry :defs $ {} |comp-zero $ %{} :CodeEntry (:doc |) :code $ quote @@ -270,7 +270,7 @@ :code $ quote ns respo.app.comp.zero $ :require respo.core :refer $ defcomp div - |respo.app.core $ {} + |respo.app.core $ %{} :FileEntry :defs $ {} |*store $ %{} :CodeEntry (:doc |) :code $ quote (defatom *store schema/store) @@ -297,7 +297,7 @@ respo.schema :refer $ dev? respo.app.schema :as schema respo.app.updater :refer $ updater - |respo.app.schema $ {} + |respo.app.schema $ %{} :FileEntry :defs $ {} |store $ %{} :CodeEntry (:doc |) :code $ quote @@ -310,7 +310,7 @@ def task $ {} (:id nil) (:text |) (:done? false) :ns $ %{} :CodeEntry (:doc |) :code $ quote (ns respo.app.schema) - |respo.app.style.widget $ {} + |respo.app.style.widget $ %{} :FileEntry :defs $ {} |button $ %{} :CodeEntry (:doc |) :code $ quote @@ -335,7 +335,7 @@ ns respo.app.style.widget $ :require respo.util.format :refer $ hsl respo.css :refer $ defstyle - |respo.app.updater $ {} + |respo.app.updater $ %{} :FileEntry :defs $ {} |updater $ %{} :CodeEntry (:doc |) :code $ quote @@ -377,7 +377,7 @@ :code $ quote ns respo.app.updater $ :require respo.cursor :refer $ update-states - |respo.comp.global-keydown $ {} + |respo.comp.global-keydown $ %{} :FileEntry :defs $ {} |comp-global-keydown $ %{} :CodeEntry (:doc |) :code $ quote @@ -417,7 +417,7 @@ :code $ quote ns respo.comp.global-keydown $ :require respo.core :refer $ defcomp defeffect <> >> div button textarea span input a list-> - |respo.comp.inspect $ {} + |respo.comp.inspect $ %{} :FileEntry :defs $ {} |comp-inspect $ %{} :CodeEntry (:doc |) :code $ quote @@ -447,7 +447,7 @@ (tag? data) (str data) (bool? data) (str data) (fn? data) |Fn - true $ pr-str data + true $ to-lispy-string data |style-data $ %{} :CodeEntry (:doc |) :code $ quote defstyle style-data $ {} @@ -457,7 +457,7 @@ ns respo.comp.inspect $ :require respo.core :refer $ defcomp pre <> respo.css :refer $ defstyle - |respo.comp.space $ {} + |respo.comp.space $ %{} :FileEntry :defs $ {} |=< $ %{} :CodeEntry (:doc |) :code $ quote @@ -474,7 +474,7 @@ :code $ quote ns respo.comp.space $ :require respo.core :refer $ div defcomp - |respo.controller.client $ {} + |respo.controller.client $ %{} :FileEntry :defs $ {} |activate-instance! $ %{} :CodeEntry (:doc |) :code $ quote @@ -502,7 +502,7 @@ respo.render.patch :refer $ apply-dom-changes respo.util.format :refer $ event->edn respo.render.dom :refer $ make-element - |respo.controller.resolve $ {} + |respo.controller.resolve $ %{} :FileEntry :defs $ {} |build-deliver-event $ %{} :CodeEntry (:doc |) :code $ quote @@ -539,7 +539,7 @@ recur $ :tree m , m element-exists? $ some? target-element - ; println "|target element:" $ pr-str event-name + ; println "|target element:" $ to-lispy-string event-name if and element-exists? $ some? get (:event target-element) event-name @@ -552,7 +552,7 @@ |get-markup-at $ %{} :CodeEntry (:doc |) :code $ quote defn get-markup-at (markup coord) - ; println |markup: $ pr-str coord + ; println |markup: $ to-lispy-string coord list-match coord () markup (coord-head cs) @@ -570,7 +570,7 @@ :code $ quote ns respo.controller.resolve $ :require respo.util.detect :refer $ component? element? - |respo.core $ {} + |respo.core $ %{} :FileEntry :defs $ {} |*changes-logger $ %{} :CodeEntry (:doc |) :code $ quote (defatom *changes-logger nil) @@ -628,7 +628,7 @@ :code $ quote defn create-element (tag-name props & children) ; assert - str "|For rendering lists, please use list-> , got: " $ pr-str children + str "|For rendering lists, please use list-> , got: " $ to-lispy-string children and > (count children) 0 not $ any? list? children @@ -836,7 +836,7 @@ respo.util.dom :refer $ compare-to-dom! memof.alias :refer $ tick-calling-loop! reset-calling-caches! memof.once :refer $ reset-memof1-caches! - |respo.css $ {} + |respo.css $ %{} :FileEntry :defs $ {} |*style-caches $ %{} :CodeEntry (:doc |) :code $ quote @@ -904,7 +904,7 @@ :code $ quote ns respo.css $ :require respo.render.html :refer $ style->string - |respo.cursor $ {} + |respo.cursor $ %{} :FileEntry :defs $ {} |update-states $ %{} :CodeEntry (:doc |) :code $ quote @@ -914,7 +914,7 @@ , new-state :ns $ %{} :CodeEntry (:doc |) :code $ quote (ns respo.cursor) - |respo.main $ {} + |respo.main $ %{} :FileEntry :defs $ {} |main! $ %{} :CodeEntry (:doc |) :code $ quote @@ -945,7 +945,7 @@ respo.core :refer $ *changes-logger clear-cache! respo.app.core :refer $ render-app! *store respo.app.core :refer $ handle-ssr! - |respo.render.diff $ {} + |respo.render.diff $ %{} :FileEntry :defs $ {} |detect-keys-dup $ %{} :CodeEntry (:doc |) :code $ quote @@ -1202,7 +1202,7 @@ respo.render.effect :refer $ collect-mounting collect-updating collect-unmounting respo.util.list :refer $ val-of-first respo.schema :refer $ dev? - |respo.render.dom $ {} + |respo.render.dom $ %{} :FileEntry :defs $ {} |make-element $ %{} :CodeEntry (:doc |) :code $ quote @@ -1264,7 +1264,7 @@ ns respo.render.dom $ :require respo.util.format :refer $ dashed->camel event->prop get-style-value respo.util.detect :refer $ component? - |respo.render.effect $ {} + |respo.render.effect $ %{} :FileEntry :defs $ {} |collect-mounting $ %{} :CodeEntry (:doc |) :code $ quote @@ -1354,7 +1354,7 @@ ns respo.render.effect $ :require (respo.schema.op :as op) respo.util.detect :refer $ component? element? =seq respo.util.list :refer $ val-of-first - |respo.render.html $ {} + |respo.render.html $ %{} :FileEntry :defs $ {} |element->string $ %{} :CodeEntry (:doc |) :code $ quote @@ -1443,7 +1443,7 @@ ns respo.render.html $ :require respo.util.format :refer $ prop->attr purify-element mute-element text->html get-style-value dashed->camel respo.util.detect :refer $ component? element? - |respo.render.patch $ {} + |respo.render.patch $ %{} :FileEntry :defs $ {} |add-element $ %{} :CodeEntry (:doc |) :code $ quote @@ -1588,7 +1588,7 @@ respo.util.format :refer $ dashed->camel event->prop get-style-value prop->attr respo.render.dom :refer $ make-element style->string respo.schema.op :as op - |respo.schema $ {} + |respo.schema $ %{} :FileEntry :defs $ {} |Component $ %{} :CodeEntry (:doc |) :code $ quote (defrecord Component :name :effects :tree) @@ -1611,7 +1611,7 @@ ; args $ [] action parent at-place? :ns $ %{} :CodeEntry (:doc |) :code $ quote (ns respo.schema) - |respo.test.comp.task $ {} + |respo.test.comp.task $ %{} :FileEntry :defs $ {} |comp-task $ %{} :CodeEntry (:doc |) :code $ quote @@ -1624,7 +1624,7 @@ ns respo.test.comp.task $ :require respo.util.format :refer $ hsl respo.core :refer $ defcomp div span - |respo.test.comp.todolist $ {} + |respo.test.comp.todolist $ %{} :FileEntry :defs $ {} |comp-todolist $ %{} :CodeEntry (:doc |) :code $ quote @@ -1643,7 +1643,7 @@ ns respo.test.comp.todolist $ :require respo.test.comp.task :refer $ comp-task respo.core :refer $ defcomp div list-> - |respo.test.html $ {} + |respo.test.html $ %{} :FileEntry :defs $ {} |html-quote-test $ %{} :CodeEntry (:doc |) :code $ quote @@ -1704,7 +1704,7 @@ calcit-test.core :refer $ deftest is testing respo.core :refer $ html head title script div link textarea body respo.render.html :refer $ make-string - |respo.test.main $ {} + |respo.test.main $ %{} :FileEntry :defs $ {} |main! $ %{} :CodeEntry (:doc |) :code $ quote @@ -1736,7 +1736,7 @@ ns respo.test.main $ :require (respo.test.html :as html) calcit-test.core :refer $ deftest testing is respo.util.list :refer $ pick-attrs pick-event - |respo.util.detect $ {} + |respo.util.detect $ %{} :FileEntry :defs $ {} |=seq $ %{} :CodeEntry (:doc |) :code $ quote @@ -1766,7 +1766,7 @@ :ns $ %{} :CodeEntry (:doc |) :code $ quote ns respo.util.detect $ :require (respo.schema :as schema) - |respo.util.dom $ {} + |respo.util.dom $ %{} :FileEntry :defs $ {} |compare-to-dom! $ %{} :CodeEntry (:doc |) :code $ quote @@ -1779,7 +1779,7 @@ real-name $ .!toLowerCase (.-tagName element) when (not= virtual-name real-name) js/console.warn "\"SSR checking: tag names do not match:" - pr-str $ dissoc vdom :children + to-lispy-string $ dissoc vdom :children , element if not= @@ -1793,7 +1793,7 @@ = maybe-html $ .-innerHTML element js/console.warn "\"SSR checking: noticed dom containing innerHTML:" element do (js/console.error "\"SSR checking: children sizes do not match!") - js/console.log "\"virtual:" $ -> vdom :children (map last) (map :name) pr-str + js/console.log "\"virtual:" $ -> vdom :children (map last) (map :name) to-lispy-string js/console.log "\"real:" $ .-children element let real-children $ .-children element @@ -1822,7 +1822,7 @@ :code $ quote ns respo.util.dom $ :require respo.util.list :refer $ val-of-first - |respo.util.format $ {} + |respo.util.format $ %{} :FileEntry :defs $ {} |dashed->camel $ %{} :CodeEntry (:doc |) :code $ quote @@ -1950,7 +1950,7 @@ :code $ quote ns respo.util.format $ :require respo.util.detect :refer $ component? element? - |respo.util.list $ {} + |respo.util.list $ %{} :FileEntry :defs $ {} |map-with-idx $ %{} :CodeEntry (:doc |) :code $ quote diff --git a/package.cirru b/package.cirru index 4398ebb..d20977d 100644 --- a/package.cirru +++ b/package.cirru @@ -1,5 +1,5 @@ {} :dependencies $ {} - |calcit-lang/memof |main - |calcit-lang/lilac |main - |calcit-lang/calcit-test |main + |calcit-lang/memof |0.0.14 + |calcit-lang/lilac |0.4.0-a2 + |calcit-lang/calcit-test |0.0.5 diff --git a/package.json b/package.json index 2fcea2c..16dfac0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "version": "0.16.0-a1", + "version": "0.16.0-a3", "dependencies": { - "@calcit/procs": "^0.8.0-a1" + "@calcit/procs": "^0.8.0-a3" }, "scripts": { "test": "cr --once --emit-js --init-fn=respo.test.main/main! && node test.mjs" diff --git a/yarn.lock b/yarn.lock index b0e2a5a..067fe8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@calcit/procs@^0.8.0-a1": - version "0.8.0-a1" - resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.8.0-a1.tgz#a0bb739411611d9a8b9af30cd0f49a58b9877b68" - integrity sha512-rYGpvIV80FINvHLVjrdKURqebD58tip+ugf4HI0E2s2C5JTSHTuK40XDL5yEX9PvWlVaJ0Q5l+CPqcLSXnWwkg== +"@calcit/procs@^0.8.0-a3": + version "0.8.0-a3" + resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.8.0-a3.tgz#1a34506697bf7494f6c3f9b417795199652f08ee" + integrity sha512-Lei/bEcyxtenToL6Yp6Ur4/+45t5+QluI2yfF9kyNzYCDJQT5MSL2PrXkoiwolUJccKP/U9oSGx9v2lW6WeBoA== dependencies: "@calcit/ternary-tree" "0.0.23" "@cirru/parser.ts" "^0.0.6" @@ -165,9 +165,9 @@ esbuild@^0.18.10: "@esbuild/win32-x64" "0.18.20" fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== nanoid@^3.3.6: version "3.3.6" @@ -189,9 +189,9 @@ postcss@^8.4.27: source-map-js "^1.0.2" rollup@^3.27.1: - version "3.28.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.28.0.tgz#a3c70004b01934760c0cb8df717c7a1d932389a2" - integrity sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw== + version "3.28.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.28.1.tgz#fb44aa6d5e65c7e13fd5bcfff266d0c4ea9ba433" + integrity sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw== optionalDependencies: fsevents "~2.3.2"