From 93090152097b85b073d687ccd37f6fbe90baee9d Mon Sep 17 00:00:00 2001 From: tiye Date: Sun, 17 Sep 2023 15:43:33 +0800 Subject: [PATCH 1/6] support editing doc field --- .github/workflows/npm-publish.yaml | 12 +- calcit.cirru | 624 +++++++++++++++++++++++++---- compact.cirru | 109 ++++- package.json | 6 +- yarn.lock | 41 +- 5 files changed, 663 insertions(+), 129 deletions(-) diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index 1a8f23c..3205e18 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -12,25 +12,25 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 registry-url: https://registry.npmjs.org/ cache: yarn - uses: supplypike/setup-bin@v3 with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0/cr' + uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.1/cr' name: 'cr' - version: '0.8.0' + version: '0.8.1' - uses: supplypike/setup-bin@v3 with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0/caps' + uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.1/caps' name: 'caps' - version: '0.8.0' + version: '0.8.1' - run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page diff --git a/calcit.cirru b/calcit.cirru index c63d47a..c06ae48 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -9113,6 +9113,184 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |=<) |app.comp.page-editor $ %{} :FileEntry :defs $ {} + |comp-doc $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |defcomp) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |comp-doc) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |states) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |expr-entry) + |h $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |bookmark) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |let) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |ns?) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |=) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:ns) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:kind) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |bookmark) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |doc-plugin) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |use-prompt) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |>>) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |states) + |h $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:doc) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:text) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |if) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |ns?) + |h $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text "|\"Namespace doc:") + |l $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text "|\"Function doc:") + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:initial) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:doc) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |expr-entry) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:placeholder) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text "|\"...some docs...") + |o $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:input-style) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |{}) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |doc) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:doc) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |expr-entry) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |no-doc?) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |blank?) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |doc) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |div) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |{}) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |span) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:inner-text) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |if) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |no-doc?) + |h $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text "|\"no doc") + |l $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |doc) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:class-name) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |str-spaced) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |style-doc) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |if) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |no-doc?) + |h $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |style-doc-empty) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:on-click) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |e) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |d!) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |.show) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |doc-plugin) + |h $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |d!) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |text) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |if) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |ns?) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |d!) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |::) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:writer/doc-set) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |::) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:ns) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:ns) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |bookmark) + |l $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |text) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |d!) + |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |::) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:writer/doc-set) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |::) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:def) + |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:ns) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |bookmark) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |:extra) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |bookmark) + |l $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |text) + |l $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |.render) + |b $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |doc-plugin) |comp-page-editor $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -9336,37 +9514,52 @@ :data $ {} |T $ %{} :Leaf (:at 1656317531567) (:by |S1lNv50FW) (:text |:class-name) |j $ %{} :Leaf (:at 1656317537521) (:by |S1lNv50FW) (:text |css-area) - |x $ %{} :Expr (:at 1504777353661) (:by nil) + |x $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |if) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |if) + |b $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |some?) - |j $ %{} :Leaf (:at 1590232321550) (:by |S1lNv50FW) (:text |expr) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |some?) + |b $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |expr-entry) + |h $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) :data $ {} - |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |comp-expr) - |v $ %{} :Expr (:at 1584896843864) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |div) + |b $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1584896844874) (:by |S1lNv50FW) (:text |>>) - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |states) - |r $ %{} :Expr (:at 1602472209180) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |{}) + |h $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |comp-doc) + |b $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1602472133089) (:by |S1lNv50FW) (:text |bookmark-full-str) - |j $ %{} :Leaf (:at 1602472210860) (:by |S1lNv50FW) (:text |bookmark) - |x $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |expr) - |y $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |focus) - |yT $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |>>) + |b $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |states) + |h $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |:doc) + |h $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |expr-entry) + |l $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |bookmark) + |l $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |[]) - |yj $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |others) - |yr $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |false) - |yv $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |false) - |yy $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |readonly?) - |yyD $ %{} :Leaf (:at 1590232524042) (:by |S1lNv50FW) (:text |picker-mode?) - |yyT $ %{} :Leaf (:at 1511455407084) (:by |S1lNv50FW) (:text |theme) - |yyj $ %{} :Leaf (:at 1511456031067) (:by |S1lNv50FW) (:text |0) - |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui-missing) + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |comp-expr) + |b $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |>>) + |b $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |states) + |h $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |bookmark-full-str) + |b $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |bookmark) + |h $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |expr) + |l $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |focus) + |o $ %{} :Expr (:at 1694936306344) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |[]) + |q $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |others) + |s $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |false) + |t $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |false) + |u $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |readonly?) + |v $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |picker-mode?) + |w $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |theme) + |x $ %{} :Leaf (:at 1694936306344) (:by |S1lNv50FW) (:text |0) |t $ %{} :Expr (:at 1511549500635) (:by |S1lNv50FW) :data $ {} |D $ %{} :Leaf (:at 1511549502781) (:by |S1lNv50FW) (:text |let) @@ -10949,6 +11142,72 @@ |T $ %{} :Leaf (:at 1580560018897) (:by |S1lNv50FW) (:text |d!) |j $ %{} :Leaf (:at 1580560018897) (:by |S1lNv50FW) (:text |:states/clear) |r $ %{} :Leaf (:at 1580560018897) (:by |S1lNv50FW) (:text |nil) + |style-doc $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |defstyle) + |b $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |style-doc) + |h $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text "|\"&") + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |:color) + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |hsl) + |b $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |0) + |h $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |0) + |l $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |100) + |o $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |0.6) + |h $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |:transition-duration) + |b $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text "|\"200ms") + |h $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text "|\"&:hover") + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |:color) + |b $ %{} :Expr (:at 1694936352818) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |hsl) + |b $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |0) + |h $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |0) + |l $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |100) + |o $ %{} :Leaf (:at 1694936352818) (:by |S1lNv50FW) (:text |1) + |style-doc-empty $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1694936341039) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |defstyle) + |b $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |style-doc-empty) + |h $ %{} :Expr (:at 1694936341039) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936341039) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text "|\"&") + |b $ %{} :Expr (:at 1694936341039) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936341039) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |:font-style) + |b $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |:italic) + |h $ %{} :Expr (:at 1694936341039) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |:opacity) + |b $ %{} :Leaf (:at 1694936341039) (:by |S1lNv50FW) (:text |0.5) |style-hint $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -11872,7 +12131,7 @@ |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |D $ %{} :Leaf (:at 1580393015056) (:by |S1lNv50FW) (:text |states) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ns-set) + |j $ %{} :Leaf (:at 1694936271854) (:by |S1lNv50FW) (:text |ns-dict) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |selected-ns) |v $ %{} :Leaf (:at 1516291486991) (:by |S1lNv50FW) (:text |ns-highlights) |v $ %{} :Expr (:at 1580484440020) (:by |S1lNv50FW) @@ -12083,73 +12342,121 @@ |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625769271634) (:by |S1lNv50FW) (:text |->) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ns-set) - |n $ %{} :Expr (:at 1625772182530) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |->) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-dict) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625772183955) (:by |S1lNv50FW) (:text |.to-list) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |.to-list) + |l $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |filter) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |filter) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |fn) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ns-text) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |pair) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625681754140) (:by |S1lNv50FW) (:text |includes?) - |j $ %{} :Expr (:at 1580560443736) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |let) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1625681757568) (:by |S1lNv50FW) (:text |join-str) - |H $ %{} :Expr (:at 1625681759806) (:by |S1lNv50FW) + |T $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625681759806) (:by |S1lNv50FW) (:text |rest) - |j $ %{} :Expr (:at 1625681759806) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625681763241) (:by |S1lNv50FW) (:text |split) - |j $ %{} :Leaf (:at 1625681759806) (:by |S1lNv50FW) (:text |ns-text) - |r $ %{} :Leaf (:at 1625681759806) (:by |S1lNv50FW) (:text "|\".") - |L $ %{} :Leaf (:at 1580560447381) (:by |S1lNv50FW) (:text "|\".") - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |nth) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |pair) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |0) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:ns-text) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |state) - |v $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |includes?) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |join-str) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |rest) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |split) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text "|\".") + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text "|\".") + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |:ns-text) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |state) + |o $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |sort) - |j $ %{} :Leaf (:at 1625769274224) (:by |S1lNv50FW) (:text |&compare) - |x $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |sort) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |a) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |b) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |&compare) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |first) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |a) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |first) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |b) + |q $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |map) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |map) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |fn) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ns-text) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |pair) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |[]) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ns-text) - |r $ %{} :Expr (:at 1580484541813) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |let) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |comp-ns-entry) - |b $ %{} :Expr (:at 1584895872701) (:by |S1lNv50FW) + |T $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1584895875955) (:by |S1lNv50FW) (:text |>>) - |T $ %{} :Leaf (:at 1580484581184) (:by |S1lNv50FW) (:text |states) - |j $ %{} :Leaf (:at 1584895876860) (:by |S1lNv50FW) (:text |ns-text) - |j $ %{} :Leaf (:at 1580484544475) (:by |S1lNv50FW) (:text |ns-text) - |r $ %{} :Expr (:at 1580484545560) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |nth) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |pair) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |0) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |[]) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |h $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1580484545560) (:by |S1lNv50FW) (:text |=) - |j $ %{} :Leaf (:at 1580484545560) (:by |S1lNv50FW) (:text |selected-ns) - |r $ %{} :Leaf (:at 1580484545560) (:by |S1lNv50FW) (:text |ns-text) - |v $ %{} :Leaf (:at 1580484594427) (:by |S1lNv50FW) (:text |ns-highlights) + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |comp-ns-entry) + |b $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |>>) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |states) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |l $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |nth) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |pair) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |1) + |o $ %{} :Expr (:at 1694936285011) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |=) + |b $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |selected-ns) + |h $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-text) + |q $ %{} :Leaf (:at 1694936285011) (:by |S1lNv50FW) (:text |ns-highlights) |yT $ %{} :Expr (:at 1585071392391) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1625772254788) (:by |S1lNv50FW) (:text |.render) @@ -12163,6 +12470,7 @@ :data $ {} |D $ %{} :Leaf (:at 1580484573305) (:by |S1lNv50FW) (:text |states) |T $ %{} :Leaf (:at 1580484530023) (:by |S1lNv50FW) (:text |ns-text) + |b $ %{} :Leaf (:at 1694936241323) (:by |S1lNv50FW) (:text |ns-doc) |j $ %{} :Leaf (:at 1580484535321) (:by |S1lNv50FW) (:text |selected?) |r $ %{} :Leaf (:at 1580484598731) (:by |S1lNv50FW) (:text |ns-highlights) |r $ %{} :Expr (:at 1585071554870) (:by |S1lNv50FW) @@ -12313,6 +12621,16 @@ :data $ {} |T $ %{} :Leaf (:at 1580528348449) (:by |S1lNv50FW) (:text |last) |j $ %{} :Leaf (:at 1580528348449) (:by |S1lNv50FW) (:text |pieces) + |vT $ %{} :Expr (:at 1694936247690) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936249205) (:by |S1lNv50FW) (:text |=<) + |b $ %{} :Leaf (:at 1694936249568) (:by |S1lNv50FW) (:text |8) + |h $ %{} :Leaf (:at 1694936250178) (:by |S1lNv50FW) (:text |nil) + |w $ %{} :Expr (:at 1694936247139) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936247139) (:by |S1lNv50FW) (:text |<>) + |b $ %{} :Leaf (:at 1694936247139) (:by |S1lNv50FW) (:text |ns-doc) + |h $ %{} :Leaf (:at 1694936247139) (:by |S1lNv50FW) (:text |style-ns-doc) |t $ %{} :Expr (:at 1585071630680) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1585071630680) (:by |S1lNv50FW) (:text |span) @@ -12686,7 +13004,7 @@ |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:width) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |280) + |j $ %{} :Leaf (:at 1694936445147) (:by |S1lNv50FW) (:text |360) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:overflow) @@ -12732,6 +13050,54 @@ |j $ %{} :Leaf (:at 1516291606630) (:by |S1lNv50FW) (:text |0) |r $ %{} :Leaf (:at 1516291606842) (:by |S1lNv50FW) (:text |0) |v $ %{} :Leaf (:at 1590769736318) (:by |S1lNv50FW) (:text |74) + |style-ns-doc $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |defstyle) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |style-ns-doc) + |h $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text "|\"&") + |b $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:color) + |b $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |hsl) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |0) + |h $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |0) + |l $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |100) + |o $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |0.5) + |h $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:white-space) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:nowrap) + |l $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:max-width) + |b $ %{} :Leaf (:at 1694936402856) (:by |S1lNv50FW) (:text "|\"120px") + |o $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:display) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:inline-block) + |q $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:overflow) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:hidden) + |s $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:text-overflow) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:ellipsis) + |t $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:vertical-align) + |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:middle) |style-remove $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -17838,7 +18204,7 @@ |L $ %{} :Leaf (:at 1546171273140) (:by |root) (:text |config/dev?) |T $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |r $ %{} :Leaf (:at 1564893314518) (:by |S1lNv50FW) (:text |js/console.log) + |r $ %{} :Leaf (:at 1694936229793) (:by |S1lNv50FW) (:text |println) |v $ %{} :Leaf (:at 1546170898597) (:by |root) (:text "|\"Action") |x $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} @@ -21916,13 +22282,36 @@ |v $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777570689) (:by nil) + |j $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:ns-set) - |j $ %{} :Expr (:at 1504777570689) (:by nil) + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |:ns-set) + |b $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |keys) - |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |files) + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |->) + |b $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |files) + |h $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |map-kv) + |b $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |k) + |b $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |v) + |h $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |[]) + |b $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |k) + |h $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |get-in) + |b $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |v) + |h $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |[]) + |b $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |:ns) + |h $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |:doc) |r $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:defs-set) @@ -22909,6 +23298,22 @@ |l $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |sid) |o $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |op-id) |q $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |op-time) + |zzb $ %{} :Expr (:at 1694936194585) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Expr (:at 1694936194585) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |:writer/doc-set) + |b $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |path) + |h $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |docstring) + |b $ %{} :Expr (:at 1694936194585) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |writer/doc-set) + |b $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |db) + |h $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |path) + |l $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |docstring) + |o $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |sid) + |q $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |op-id) + |s $ %{} :Leaf (:at 1694936194585) (:by |S1lNv50FW) (:text |op-time) |zze $ %{} :Expr (:at 1689420389280) (:by |S1lNv50FW) :data $ {} |T $ %{} :Expr (:at 1689420389280) (:by |S1lNv50FW) @@ -30257,6 +30662,61 @@ |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |assoc) |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:pointer) |r $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |0) + |doc-set $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |defn) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |doc-set) + |h $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |db) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |path) + |h $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |docstring) + |l $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |sid) + |o $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |op-id) + |q $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |op-time) + |l $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |tag-match) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |path) + |h $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:ns) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |ns-text) + |b $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |assoc-in) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |db) + |h $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |[]) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:files) + |h $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |ns-text) + |l $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:ns) + |o $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:doc) + |l $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |docstring) + |l $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:def) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |ns-text) + |h $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |def-text) + |b $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |assoc-in) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |db) + |h $ %{} :Expr (:at 1694936204311) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |[]) + |b $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:files) + |h $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |ns-text) + |l $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:defs) + |o $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |def-text) + |q $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |:doc) + |l $ %{} :Leaf (:at 1694936204311) (:by |S1lNv50FW) (:text |docstring) |draft-ns $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1511261683075) (:by |root) :data $ {} diff --git a/compact.cirru b/compact.cirru index dad8026..7f04b99 100644 --- a/compact.cirru +++ b/compact.cirru @@ -1362,6 +1362,33 @@ respo.comp.space :refer $ =< |app.comp.page-editor $ %{} :FileEntry :defs $ {} + |comp-doc $ %{} :CodeEntry (:doc |) + :code $ quote + defcomp comp-doc (states expr-entry bookmark) + let + ns? $ = :ns (:kind bookmark) + doc-plugin $ use-prompt (>> states :doc) + {} + :text $ if ns? "\"Namespace doc:" "\"Function doc:" + :initial $ :doc expr-entry + :placeholder "\"...some docs..." + :input-style $ {} + doc $ :doc expr-entry + no-doc? $ blank? doc + div ({}) + span $ {} + :inner-text $ if no-doc? "\"no doc" doc + :class-name $ str-spaced style-doc (if no-doc? style-doc-empty) + :on-click $ fn (e d!) + .show doc-plugin d! $ fn (text) + if ns? + d! $ :: :writer/doc-set + :: :ns $ :ns bookmark + , text + d! $ :: :writer/doc-set + :: :def (:ns bookmark) (:extra bookmark) + , text + .render doc-plugin |comp-page-editor $ %{} :CodeEntry (:doc |) :code $ quote defcomp comp-page-editor (states stack router-data pointer picker-mode? theme) @@ -1396,11 +1423,12 @@ map $ fn (x) (:focus x) div {} $ :class-name css-area - if (some? expr) - comp-expr - >> states $ bookmark-full-str bookmark - , expr focus ([]) others false false readonly? picker-mode? theme 0 - , ui-missing + if (some? expr-entry) + div ({}) + comp-doc (>> states :doc) expr-entry bookmark + comp-expr + >> states $ bookmark-full-str bookmark + , expr focus ([]) others false false readonly? picker-mode? theme 0 let peek-def $ :peek-def router-data if (some? peek-def) (comp-peek-def peek-def) @@ -1617,6 +1645,18 @@ :def $ {} (:ns ns-text) (:kind :def) :extra $ :extra bookmark d! :states/clear nil + |style-doc $ %{} :CodeEntry (:doc |) + :code $ quote + defstyle style-doc $ {} + "\"&" $ {} + :color $ hsl 0 0 100 0.6 + :transition-duration "\"200ms" + "\"&:hover" $ {} + :color $ hsl 0 0 100 1 + |style-doc-empty $ %{} :CodeEntry (:doc |) + :code $ quote + defstyle style-doc-empty $ {} + "\"&" $ {} (:font-style :italic) (:opacity 0.5) |style-hint $ %{} :CodeEntry (:doc |) :code $ quote def style-hint $ {} @@ -1751,7 +1791,7 @@ .render add-plugin |comp-namespace-list $ %{} :CodeEntry (:doc |) :code $ quote - defcomp comp-namespace-list (states ns-set selected-ns ns-highlights) + defcomp comp-namespace-list (states ns-dict selected-ns ns-highlights) let cursor $ :cursor states state $ or (:data states) @@ -1783,20 +1823,25 @@ d! cursor $ assoc state :ns-text (:value e) =< nil 8 list-> ({}) - -> ns-set (.to-list) - filter $ fn (ns-text) - includes? - join-str - rest $ split ns-text "\"." - , "\"." - :ns-text state - sort &compare - map $ fn (ns-text) - [] ns-text $ comp-ns-entry (>> states ns-text) ns-text (= selected-ns ns-text) ns-highlights + -> ns-dict (.to-list) + filter $ fn (pair) + let + ns-text $ nth pair 0 + includes? + join-str + rest $ split ns-text "\"." + , "\"." + :ns-text state + sort $ fn (a b) + &compare (first a) (first b) + map $ fn (pair) + let + ns-text $ nth pair 0 + [] ns-text $ comp-ns-entry (>> states ns-text) ns-text (nth pair 1) (= selected-ns ns-text) ns-highlights .render plugin-add-ns |comp-ns-entry $ %{} :CodeEntry (:doc |) :code $ quote - defcomp comp-ns-entry (states ns-text selected? ns-highlights) + defcomp comp-ns-entry (states ns-text ns-doc selected? ns-highlights) let plugin-rm-ns $ use-confirm (>> states :rm-ns) {} $ :text (str "\"Sure to remove namespace: " ns-text "\" ?") @@ -1817,6 +1862,8 @@ {} $ :color if has-highlight? (hsl 0 0 76) (hsl 0 0 50) <> $ last pieces + =< 8 nil + <> ns-doc style-ns-doc span {} (:class-name "\"is-minor") (:style style-remove) :on-click $ fn (e d!) @@ -1873,11 +1920,22 @@ def style-link $ {} (:cursor :pointer) |style-list $ %{} :CodeEntry (:doc |) :code $ quote - def style-list $ {} (:width 280) (:overflow :auto) (:padding-top 24) (:padding-bottom 120) + def style-list $ {} (:width 360) (:overflow :auto) (:padding-top 24) (:padding-bottom 120) |style-ns $ %{} :CodeEntry (:doc |) :code $ quote def style-ns $ {} (:cursor :pointer) (:vertical-align :middle) (:position :relative) (:padding "|0 8px") :color $ hsl 0 0 74 + |style-ns-doc $ %{} :CodeEntry (:doc |) + :code $ quote + defstyle style-ns-doc $ {} + "\"&" $ {} + :color $ hsl 0 0 100 0.5 + :white-space :nowrap + :max-width "\"120px" + :display :inline-block + :overflow :hidden + :text-overflow :ellipsis + :vertical-align :middle |style-remove $ %{} :CodeEntry (:doc |) :code $ quote def style-remove $ {} @@ -2723,7 +2781,7 @@ |dispatch! $ %{} :CodeEntry (:doc |) :code $ quote defn dispatch! (op sid) - when config/dev? $ js/console.log "\"Action" (str op) sid + when config/dev? $ println "\"Action" (str op) sid ; js/console.log "\"Database:" $ to-js-data @*writer-db let d2! $ fn (op2) (dispatch! op2 sid) @@ -3340,7 +3398,9 @@ :code $ quote defn twig-page-files (files selected-ns saved-files draft-ns sessions sid) {} - :ns-set $ keys files + :ns-set $ -> files + map-kv $ fn (k v) + [] k $ get-in v ([] :ns :doc) :defs-set $ if (some? selected-ns) do $ -> get-in files $ [] selected-ns :defs @@ -3477,6 +3537,7 @@ (:writer/hide-peek op-data) (writer/hide-peek db op-data sid op-id op-time) (:writer/picker-mode) (writer/picker-mode db sid op-id op-time) (:writer/pick-node op-data) (writer/pick-node db op-data sid op-id op-time) + (:writer/doc-set path docstring) (writer/doc-set db path docstring sid op-id op-time) (:ir/add-ns op-data) (ir/add-ns db op-data sid op-id op-time) (:ir/add-def op-data) (ir/add-def db op-data sid op-id op-time) (:ir/remove-def op-data) (ir/remove-def db op-data sid op-id op-time) @@ -4430,6 +4491,14 @@ -> writer update :stack $ fn (stack) (.slice stack op-data) assoc :pointer 0 + |doc-set $ %{} :CodeEntry (:doc |) + :code $ quote + defn doc-set (db path docstring sid op-id op-time) + tag-match path + :ns ns-text + assoc-in db ([] :files ns-text :ns :doc) docstring + (:def ns-text def-text) + assoc-in db ([] :files ns-text :defs def-text :doc) docstring |draft-ns $ %{} :CodeEntry (:doc |) :code $ quote defn draft-ns (db op-data sid op-id op-time) diff --git a/package.json b/package.json index 8ee3715..46165e8 100644 --- a/package.json +++ b/package.json @@ -25,13 +25,13 @@ "vite": "^4.4.9" }, "dependencies": { - "@calcit/procs": "^0.8.0", + "@calcit/procs": "^0.8.1", "chalk": "^5.3.0", "dayjs": "^1.11.9", "gaze": "^1.1.3", "latest-version": "^7.0.0", "md5": "^2.3.0", - "nanoid": "^4.0.2", - "ws": "^8.13.0" + "nanoid": "^5.0.1", + "ws": "^8.14.1" } } diff --git a/yarn.lock b/yarn.lock index 54e9f5a..934bf1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@calcit/procs@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.8.0.tgz#ce682f5d016e2ebfa25cf2dd1852bfcccb64bb86" - integrity sha512-fLnsR0MAP4W2TsJ3ftVsO51RyudZoMCVEfsxjoaw5FAg6m09YgDDfkWKElNDQwljsHcV8ZmiyCdZpJLCEmdEkw== +"@calcit/procs@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.8.1.tgz#139a6ddf74859abb015264216690ae0eddb5b6f4" + integrity sha512-DsV8nCQaxv9/h14X2juA/cxNSCwrl10IhP9+rR/1NRFGIT87QQcEBfOWziiGCT0Aay4q3XB6iXC1ETg4UNfcfg== dependencies: "@calcit/ternary-tree" "0.0.23" "@cirru/parser.ts" "^0.0.6" @@ -170,9 +170,9 @@ defer-to-connect "^2.0.1" "@types/http-cache-semantics@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz#abe102d06ccda1efdf0ed98c10ccf7f36a785a41" + integrity sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw== balanced-match@^1.0.0: version "1.0.2" @@ -252,9 +252,9 @@ config-chain@^1.1.11: proto-list "~1.2.1" core-js@^3.1.3: - version "3.32.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.1.tgz#a7d8736a3ed9dd05940c3c4ff32c591bb735be77" - integrity sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ== + version "3.32.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7" + integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ== crypt@0.0.2: version "0.0.2" @@ -550,11 +550,16 @@ nanoid@^3.3.6: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== -nanoid@^4.0.1, nanoid@^4.0.2: +nanoid@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-4.0.2.tgz#140b3c5003959adbebf521c170f282c5e7f9fb9e" integrity sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw== +nanoid@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.0.1.tgz#3e95d775a8bc8a98afbf0a237e2bbc6a71b0662e" + integrity sha512-vWeVtV5Cw68aML/QaZvqN/3QQXc6fBfIieAlu05m7FZW2Dgb+3f0xc0TTxuJW+7u30t7iSDTV/j3kVI0oJqIfQ== + next-tick@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz#75da4a927ee5887e39065880065b7336413b310d" @@ -668,9 +673,9 @@ responselike@^3.0.0: lowercase-keys "^3.0.0" rollup@^3.27.1: - version "3.28.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.28.1.tgz#fb44aa6d5e65c7e13fd5bcfff266d0c4ea9ba433" - integrity sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw== + version "3.29.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.2.tgz#cbc76cd5b03b9f9e93be991d23a1dff9c6d5b740" + integrity sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A== optionalDependencies: fsevents "~2.3.2" @@ -734,10 +739,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.13.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== +ws@^8.14.1: + version "8.14.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.1.tgz#4b9586b4f70f9e6534c7bb1d3dc0baa8b8cf01e0" + integrity sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A== x-is-array@0.1.0: version "0.1.0" From 791eb3565897a96d2c7dc800516a0cea423c76b6 Mon Sep 17 00:00:00 2001 From: tiye Date: Sun, 17 Sep 2023 15:59:08 +0800 Subject: [PATCH 2/6] display docs in ns/files list --- calcit.cirru | 490 +++++++++++++++++++++++++++++++------------------- compact.cirru | 95 ++++++---- 2 files changed, 361 insertions(+), 224 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index c06ae48..9dbbf8f 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -11539,7 +11539,7 @@ :data $ {} |D $ %{} :Leaf (:at 1535991936583) (:by |S1lNv50FW) (:text |states) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |selected-ns) - |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |defs-set) + |r $ %{} :Leaf (:at 1694936834426) (:by |S1lNv50FW) (:text |defs-dict) |v $ %{} :Leaf (:at 1516291741687) (:by |S1lNv50FW) (:text |highlights) |x $ %{} :Leaf (:at 1588007228468) (:by |S1lNv50FW) (:text |configs) |v $ %{} :Expr (:at 1536080612090) (:by |S1lNv50FW) @@ -11908,7 +11908,8 @@ |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1625769255491) (:by |S1lNv50FW) (:text |->) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |defs-set) + |j $ %{} :Leaf (:at 1694936848031) (:by |S1lNv50FW) (:text |defs-dict) + |l $ %{} :Leaf (:at 1694936844548) (:by |S1lNv50FW) (:text |keys) |n $ %{} :Expr (:at 1625811036708) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1625811038403) (:by |S1lNv50FW) (:text |.to-list) @@ -11987,44 +11988,44 @@ |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:class-name) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text ||hoverable) + |j $ %{} :Expr (:at 1694937245995) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1694937248587) (:by |S1lNv50FW) (:text |str-spaced) + |L $ %{} :Leaf (:at 1694937251089) (:by |S1lNv50FW) (:text |css/row-parted) + |P $ %{} :Leaf (:at 1694937252962) (:by |S1lNv50FW) (:text |style-def) + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text ||hoverable) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) - |j $ %{} :Expr (:at 1516291760398) (:by |S1lNv50FW) + |j $ %{} :Expr (:at 1516291761901) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1516291761326) (:by |S1lNv50FW) (:text |merge) - |L $ %{} :Leaf (:at 1649146531194) (:by |S1lNv50FW) (:text |ui/row-parted) - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-def) - |j $ %{} :Expr (:at 1516291761901) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1516291762306) (:by |S1lNv50FW) (:text |if) + |j $ %{} :Expr (:at 1516291762549) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1516291762306) (:by |S1lNv50FW) (:text |if) - |j $ %{} :Expr (:at 1516291762549) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1625811346242) (:by |S1lNv50FW) (:text |includes?) + |j $ %{} :Leaf (:at 1516291766712) (:by |S1lNv50FW) (:text |highlights) + |r $ %{} :Expr (:at 1516291793399) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625811346242) (:by |S1lNv50FW) (:text |includes?) - |j $ %{} :Leaf (:at 1516291766712) (:by |S1lNv50FW) (:text |highlights) - |r $ %{} :Expr (:at 1516291793399) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1516291794152) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1516291795241) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1516291794152) (:by |S1lNv50FW) (:text |{}) - |T $ %{} :Expr (:at 1516291795241) (:by |S1lNv50FW) - :data $ {} - |D $ %{} :Leaf (:at 1516291796358) (:by |S1lNv50FW) (:text |:ns) - |T $ %{} :Leaf (:at 1516291803329) (:by |S1lNv50FW) (:text |selected-ns) - |j $ %{} :Expr (:at 1516291796904) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1516291799842) (:by |S1lNv50FW) (:text |:extra) - |j $ %{} :Leaf (:at 1516291806259) (:by |S1lNv50FW) (:text |def-text) - |r $ %{} :Expr (:at 1516291807141) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1516291808409) (:by |S1lNv50FW) (:text |:kind) - |j $ %{} :Leaf (:at 1516291808976) (:by |S1lNv50FW) (:text |:def) - |r $ %{} :Expr (:at 1516291810647) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1516291811856) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1516291812159) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1516291796358) (:by |S1lNv50FW) (:text |:ns) + |T $ %{} :Leaf (:at 1516291803329) (:by |S1lNv50FW) (:text |selected-ns) + |j $ %{} :Expr (:at 1516291796904) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291799842) (:by |S1lNv50FW) (:text |:extra) + |j $ %{} :Leaf (:at 1516291806259) (:by |S1lNv50FW) (:text |def-text) + |r $ %{} :Expr (:at 1516291807141) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1516291812955) (:by |S1lNv50FW) (:text |:color) - |j $ %{} :Leaf (:at 1516291813934) (:by |S1lNv50FW) (:text |:white) + |T $ %{} :Leaf (:at 1516291808409) (:by |S1lNv50FW) (:text |:kind) + |j $ %{} :Leaf (:at 1516291808976) (:by |S1lNv50FW) (:text |:def) + |r $ %{} :Expr (:at 1516291810647) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291811856) (:by |S1lNv50FW) (:text |{}) + |j $ %{} :Expr (:at 1516291812159) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291812955) (:by |S1lNv50FW) (:text |:color) + |j $ %{} :Leaf (:at 1516291813934) (:by |S1lNv50FW) (:text |:white) |v $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1584895979446) (:by |S1lNv50FW) (:text |:on-click) @@ -12050,11 +12051,31 @@ :data $ {} |T $ %{} :Leaf (:at 1585846791347) (:by |S1lNv50FW) (:text |:extra) |j $ %{} :Leaf (:at 1585846862356) (:by |S1lNv50FW) (:text |def-text) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694936977369) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |<>) - |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def-text) - |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |nil) + |D $ %{} :Leaf (:at 1694936978556) (:by |S1lNv50FW) (:text |div) + |L $ %{} :Expr (:at 1694936979235) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936979556) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |<>) + |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def-text) + |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |nil) + |X $ %{} :Expr (:at 1694936981961) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936983010) (:by |S1lNv50FW) (:text |=<) + |b $ %{} :Leaf (:at 1694936983650) (:by |S1lNv50FW) (:text |8) + |h $ %{} :Leaf (:at 1694936984166) (:by |S1lNv50FW) (:text |nil) + |b $ %{} :Expr (:at 1694936980787) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936980787) (:by |S1lNv50FW) (:text |<>) + |b $ %{} :Expr (:at 1694936980787) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936980787) (:by |S1lNv50FW) (:text |get) + |b $ %{} :Leaf (:at 1694936980787) (:by |S1lNv50FW) (:text |defs-dict) + |h $ %{} :Leaf (:at 1694936980787) (:by |S1lNv50FW) (:text |def-text) + |h $ %{} :Leaf (:at 1694936980787) (:by |S1lNv50FW) (:text |style-def-doc) |v $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |=<) @@ -12069,11 +12090,11 @@ |j $ %{} :Expr (:at 1585847063338) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1585847063338) (:by |S1lNv50FW) (:text |:class-name) - |j $ %{} :Leaf (:at 1585847063338) (:by |S1lNv50FW) (:text "|\"is-minor") - |r $ %{} :Expr (:at 1585847063338) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1585847063338) (:by |S1lNv50FW) (:text |:style) - |j $ %{} :Leaf (:at 1585847063338) (:by |S1lNv50FW) (:text |style-remove) + |j $ %{} :Expr (:at 1694937285930) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1694937288837) (:by |S1lNv50FW) (:text |str-spaced) + |T $ %{} :Leaf (:at 1585847063338) (:by |S1lNv50FW) (:text "|\"is-minor") + |b $ %{} :Leaf (:at 1694937289944) (:by |S1lNv50FW) (:text |style-remove) |v $ %{} :Expr (:at 1585847071921) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1585847073256) (:by |S1lNv50FW) (:text |:on-click) @@ -12189,11 +12210,11 @@ |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) + |T $ %{} :Leaf (:at 1694937094594) (:by |S1lNv50FW) (:text |:class-name) |j $ %{} :Expr (:at 1625851355300) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1625851357407) (:by |S1lNv50FW) (:text |merge) - |L $ %{} :Leaf (:at 1625851360929) (:by |S1lNv50FW) (:text |ui/column) + |D $ %{} :Leaf (:at 1694937097698) (:by |S1lNv50FW) (:text |str-spaced) + |L $ %{} :Leaf (:at 1694937099407) (:by |S1lNv50FW) (:text |css/column) |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-list) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -12518,31 +12539,31 @@ |j $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |:class-name) - |j $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) + |j $ %{} :Expr (:at 1694937124113) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |if) - |f $ %{} :Leaf (:at 1580484551927) (:by |S1lNv50FW) (:text |selected?) - |r $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text "||hoverable is-selected") - |v $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text ||hoverable) + |D $ %{} :Leaf (:at 1694937126825) (:by |S1lNv50FW) (:text |str-spaced) + |L $ %{} :Leaf (:at 1694937129300) (:by |S1lNv50FW) (:text |css/row-parted) + |P $ %{} :Leaf (:at 1694937136209) (:by |S1lNv50FW) (:text |style-ns) + |T $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |if) + |f $ %{} :Leaf (:at 1580484551927) (:by |S1lNv50FW) (:text |selected?) + |r $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text "||hoverable is-selected") + |v $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text ||hoverable) |r $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |:style) |j $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |merge) - |b $ %{} :Leaf (:at 1649213389415) (:by |S1lNv50FW) (:text |ui/row-parted) - |j $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |style-ns) + |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |if) + |f $ %{} :Leaf (:at 1590769762741) (:by |S1lNv50FW) (:text |has-highlight?) |r $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |if) - |f $ %{} :Leaf (:at 1590769762741) (:by |S1lNv50FW) (:text |has-highlight?) - |r $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |{}) + |j $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1580484511761) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |:color) - |j $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |:white) + |T $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |:color) + |j $ %{} :Leaf (:at 1580484511761) (:by |S1lNv50FW) (:text |:white) |v $ %{} :Expr (:at 1580484651876) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1580484651876) (:by |S1lNv50FW) (:text |:on-click) @@ -12640,11 +12661,11 @@ |j $ %{} :Expr (:at 1585071630680) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1585071630680) (:by |S1lNv50FW) (:text |:class-name) - |j $ %{} :Leaf (:at 1585071630680) (:by |S1lNv50FW) (:text "|\"is-minor") - |r $ %{} :Expr (:at 1585071630680) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1585071630680) (:by |S1lNv50FW) (:text |:style) - |j $ %{} :Leaf (:at 1585071630680) (:by |S1lNv50FW) (:text |style-remove) + |j $ %{} :Expr (:at 1694937495215) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1694937497411) (:by |S1lNv50FW) (:text |str-spaced) + |T $ %{} :Leaf (:at 1585071630680) (:by |S1lNv50FW) (:text "|\"is-minor") + |b $ %{} :Leaf (:at 1694937499454) (:by |S1lNv50FW) (:text |style-remove) |v $ %{} :Expr (:at 1585071634989) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1585071636732) (:by |S1lNv50FW) (:text |:on-click) @@ -12739,12 +12760,12 @@ |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) + |T $ %{} :Leaf (:at 1694937043020) (:by |S1lNv50FW) (:text |:class-name) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |merge) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui/flex) - |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui/row) + |T $ %{} :Leaf (:at 1694937066077) (:by |S1lNv50FW) (:text |str-spaced) + |j $ %{} :Leaf (:at 1694937061562) (:by |S1lNv50FW) (:text |css/flex) + |r $ %{} :Leaf (:at 1694937060053) (:by |S1lNv50FW) (:text |css/row) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |sytle-container) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -12756,7 +12777,7 @@ |j $ %{} :Leaf (:at 1584895831374) (:by |S1lNv50FW) (:text |:ns) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:ns-set) + |T $ %{} :Leaf (:at 1694936705203) (:by |S1lNv50FW) (:text |:ns-dict) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |router-data) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |selected-ns) |x $ %{} :Leaf (:at 1516291483027) (:by |S1lNv50FW) (:text |ns-highlights) @@ -12783,7 +12804,7 @@ |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |selected-ns) |v $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:defs-set) + |T $ %{} :Leaf (:at 1694936825509) (:by |S1lNv50FW) (:text |:defs-dict) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |router-data) |x $ %{} :Leaf (:at 1516291738140) (:by |S1lNv50FW) (:text |highlights) |y $ %{} :Expr (:at 1588007217223) (:by |S1lNv50FW) @@ -12860,7 +12881,7 @@ |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:width) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |280) + |j $ %{} :Leaf (:at 1694936862411) (:by |S1lNv50FW) (:text |360) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:overflow) @@ -12918,28 +12939,78 @@ |style-def $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def) + |T $ %{} :Leaf (:at 1694937259315) (:by |S1lNv50FW) (:text |defstyle) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-def) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694937260074) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text "||0 8px") - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |D $ %{} :Leaf (:at 1694937260558) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1694937260963) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:position) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:relative) - |v $ %{} :Expr (:at 1516291751842) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1694937262174) (:by |S1lNv50FW) (:text "|\"&") + |T $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text "||0 8px") + |r $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:position) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:relative) + |v $ %{} :Expr (:at 1516291751842) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291753826) (:by |S1lNv50FW) (:text |:color) + |j $ %{} :Expr (:at 1516291755108) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291755816) (:by |S1lNv50FW) (:text |hsl) + |j $ %{} :Leaf (:at 1516291756052) (:by |S1lNv50FW) (:text |0) + |r $ %{} :Leaf (:at 1516291756272) (:by |S1lNv50FW) (:text |0) + |v $ %{} :Leaf (:at 1590769872208) (:by |S1lNv50FW) (:text |74) + |style-def-doc $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1694936919179) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936921091) (:by |S1lNv50FW) (:text |defstyle) + |b $ %{} :Leaf (:at 1694936919179) (:by |S1lNv50FW) (:text |style-def-doc) + |h $ %{} :Expr (:at 1694936919179) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936922318) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936922655) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1516291753826) (:by |S1lNv50FW) (:text |:color) - |j $ %{} :Expr (:at 1516291755108) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694936923899) (:by |S1lNv50FW) (:text "|\"&") + |b $ %{} :Expr (:at 1694936924487) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1516291755816) (:by |S1lNv50FW) (:text |hsl) - |j $ %{} :Leaf (:at 1516291756052) (:by |S1lNv50FW) (:text |0) - |r $ %{} :Leaf (:at 1516291756272) (:by |S1lNv50FW) (:text |0) - |v $ %{} :Leaf (:at 1590769872208) (:by |S1lNv50FW) (:text |74) + |T $ %{} :Leaf (:at 1694936924796) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1694936925086) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936927573) (:by |S1lNv50FW) (:text |:color) + |b $ %{} :Expr (:at 1694936927787) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936928112) (:by |S1lNv50FW) (:text |hsl) + |b $ %{} :Leaf (:at 1694936928432) (:by |S1lNv50FW) (:text |0) + |h $ %{} :Leaf (:at 1694936928686) (:by |S1lNv50FW) (:text |0) + |l $ %{} :Leaf (:at 1694936932085) (:by |S1lNv50FW) (:text |100) + |o $ %{} :Leaf (:at 1694936933541) (:by |S1lNv50FW) (:text |0.5) + |h $ %{} :Expr (:at 1694936936937) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936938517) (:by |S1lNv50FW) (:text |:max-width) + |b $ %{} :Leaf (:at 1694936943557) (:by |S1lNv50FW) (:text "|\"120px") + |l $ %{} :Expr (:at 1694936944038) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936946035) (:by |S1lNv50FW) (:text |:overflow) + |b $ %{} :Leaf (:at 1694936947090) (:by |S1lNv50FW) (:text |:hidden) + |o $ %{} :Expr (:at 1694936949318) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936952374) (:by |S1lNv50FW) (:text |:white-space) + |b $ %{} :Leaf (:at 1694936954917) (:by |S1lNv50FW) (:text |:nowrap) + |q $ %{} :Expr (:at 1694936957115) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936959995) (:by |S1lNv50FW) (:text |:text-overflow) + |b $ %{} :Leaf (:at 1694936963445) (:by |S1lNv50FW) (:text |:ellipsis) + |t $ %{} :Expr (:at 1694936998489) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694937002819) (:by |S1lNv50FW) (:text |:font-family) + |b $ %{} :Leaf (:at 1694937006994) (:by |S1lNv50FW) (:text |ui/font-fancy) |style-input $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -12996,60 +13067,72 @@ |style-list $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def) + |T $ %{} :Leaf (:at 1694937103058) (:by |S1lNv50FW) (:text |defstyle) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-list) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694937103868) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:width) - |j $ %{} :Leaf (:at 1694936445147) (:by |S1lNv50FW) (:text |360) - |r $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:overflow) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:auto) - |t $ %{} :Expr (:at 1656239256858) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1694937104459) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1694937104936) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1656239259799) (:by |S1lNv50FW) (:text |:padding-top) - |b $ %{} :Leaf (:at 1656239260873) (:by |S1lNv50FW) (:text |24) - |v $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding-bottom) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |120) + |D $ %{} :Leaf (:at 1694937106024) (:by |S1lNv50FW) (:text "|\"&") + |T $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:width) + |j $ %{} :Leaf (:at 1694936445147) (:by |S1lNv50FW) (:text |360) + |r $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:overflow) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:auto) + |t $ %{} :Expr (:at 1656239256858) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1656239259799) (:by |S1lNv50FW) (:text |:padding-top) + |b $ %{} :Leaf (:at 1656239260873) (:by |S1lNv50FW) (:text |24) + |v $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding-bottom) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |120) |style-ns $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def) + |T $ %{} :Leaf (:at 1694937141185) (:by |S1lNv50FW) (:text |defstyle) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-ns) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694937141964) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:cursor) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:pointer) - |r $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:vertical-align) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:middle) - |v $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:position) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:relative) - |x $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text "||0 8px") - |y $ %{} :Expr (:at 1516291603616) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1694937142462) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1694937142891) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1516291605119) (:by |S1lNv50FW) (:text |:color) - |j $ %{} :Expr (:at 1516291605422) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1694937143837) (:by |S1lNv50FW) (:text "|\"&") + |T $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1516291606295) (:by |S1lNv50FW) (:text |hsl) - |j $ %{} :Leaf (:at 1516291606630) (:by |S1lNv50FW) (:text |0) - |r $ %{} :Leaf (:at 1516291606842) (:by |S1lNv50FW) (:text |0) - |v $ %{} :Leaf (:at 1590769736318) (:by |S1lNv50FW) (:text |74) + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:cursor) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:pointer) + |r $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:vertical-align) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:middle) + |v $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:position) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:relative) + |x $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text "||0 8px") + |y $ %{} :Expr (:at 1516291603616) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291605119) (:by |S1lNv50FW) (:text |:color) + |j $ %{} :Expr (:at 1516291605422) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516291606295) (:by |S1lNv50FW) (:text |hsl) + |j $ %{} :Leaf (:at 1516291606630) (:by |S1lNv50FW) (:text |0) + |r $ %{} :Leaf (:at 1516291606842) (:by |S1lNv50FW) (:text |0) + |v $ %{} :Leaf (:at 1590769736318) (:by |S1lNv50FW) (:text |74) |style-ns-doc $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1694936256493) (:by |S1lNv50FW) :data $ {} @@ -13098,51 +13181,67 @@ :data $ {} |T $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:vertical-align) |b $ %{} :Leaf (:at 1694936256493) (:by |S1lNv50FW) (:text |:middle) + |u $ %{} :Expr (:at 1694937017369) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694937017369) (:by |S1lNv50FW) (:text |:font-family) + |b $ %{} :Leaf (:at 1694937017369) (:by |S1lNv50FW) (:text |ui/font-fancy) |style-remove $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def) + |T $ %{} :Leaf (:at 1694937278485) (:by |S1lNv50FW) (:text |defstyle) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-remove) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694937279484) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |D $ %{} :Leaf (:at 1694937279929) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1694937280383) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:color) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |D $ %{} :Leaf (:at 1694937281425) (:by |S1lNv50FW) (:text "|\"&") + |T $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |hsl) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |0) - |r $ %{} :Leaf (:at 1649146749138) (:by |S1lNv50FW) (:text |50) - |v $ %{} :Leaf (:at 1649146750508) (:by |S1lNv50FW) (:text |90) - |n $ %{} :Expr (:at 1556699144639) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1556699145949) (:by |S1lNv50FW) (:text |:font-size) - |j $ %{} :Leaf (:at 1556699153764) (:by |S1lNv50FW) (:text |12) - |r $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:cursor) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:pointer) - |v $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:vertical-align) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:middle) - |w $ %{} :Expr (:at 1649146633518) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1649146636915) (:by |S1lNv50FW) (:text |:line-height) - |b $ %{} :Leaf (:at 1649146654455) (:by |S1lNv50FW) (:text "|\"12px") + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:color) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |hsl) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |0) + |r $ %{} :Leaf (:at 1649146749138) (:by |S1lNv50FW) (:text |50) + |v $ %{} :Leaf (:at 1649146750508) (:by |S1lNv50FW) (:text |90) + |n $ %{} :Expr (:at 1556699144639) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1556699145949) (:by |S1lNv50FW) (:text |:font-size) + |j $ %{} :Leaf (:at 1556699153764) (:by |S1lNv50FW) (:text |12) + |r $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:cursor) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:pointer) + |v $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:vertical-align) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:middle) + |w $ %{} :Expr (:at 1649146633518) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1649146636915) (:by |S1lNv50FW) (:text |:line-height) + |b $ %{} :Leaf (:at 1649146654455) (:by |S1lNv50FW) (:text "|\"12px") |sytle-container $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |def) + |T $ %{} :Leaf (:at 1694937049639) (:by |S1lNv50FW) (:text |defstyle) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |sytle-container) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1694937051038) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |D $ %{} :Leaf (:at 1694937052603) (:by |S1lNv50FW) (:text |{}) + |T $ %{} :Expr (:at 1694937055075) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding) - |j $ %{} :Leaf (:at 1656239242580) (:by |S1lNv50FW) (:text "||0px 16px") + |D $ %{} :Leaf (:at 1694937056206) (:by |S1lNv50FW) (:text "|\"&") + |T $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:padding) + |j $ %{} :Leaf (:at 1656239242580) (:by |S1lNv50FW) (:text "||0px 16px") :ns $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -13163,6 +13262,11 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui) + |w $ %{} :Expr (:at 1694937075313) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694937078060) (:by |S1lNv50FW) (:text |respo-ui.css) + |b $ %{} :Leaf (:at 1694937085494) (:by |S1lNv50FW) (:text |:as) + |h $ %{} :Leaf (:at 1694937081061) (:by |S1lNv50FW) (:text |css) |y $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo.core) @@ -17931,13 +18035,13 @@ |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:ns-set) + |T $ %{} :Leaf (:at 1694936697362) (:by |S1lNv50FW) (:text |:ns-dict) |j $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |#{}) |r $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:defs-set) + |T $ %{} :Leaf (:at 1694936722813) (:by |S1lNv50FW) (:text |:defs-dict) |j $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |#{}) @@ -22284,7 +22388,7 @@ |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |:ns-set) + |T $ %{} :Leaf (:at 1694936681270) (:by |S1lNv50FW) (:text |:ns-dict) |b $ %{} :Expr (:at 1694936220135) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |->) @@ -22314,7 +22418,7 @@ |h $ %{} :Leaf (:at 1694936220135) (:by |S1lNv50FW) (:text |:doc) |r $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:defs-set) + |T $ %{} :Leaf (:at 1694936808079) (:by |S1lNv50FW) (:text |:defs-dict) |j $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |if) @@ -22324,31 +22428,43 @@ |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |selected-ns) |r $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |do) + |T $ %{} :Leaf (:at 1625725092196) (:by |S1lNv50FW) (:text |->) |j $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1625725092196) (:by |S1lNv50FW) (:text |->) - |j $ %{} :Expr (:at 1504777570689) (:by nil) + |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |get-in) + |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |files) + |r $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |get-in) - |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |files) - |r $ %{} :Expr (:at 1504777570689) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |[]) - |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |selected-ns) - |r $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:defs) - |n $ %{} :Expr (:at 1627217679423) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |[]) + |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |selected-ns) + |r $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:defs) + |n $ %{} :Expr (:at 1627217679423) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1627217680827) (:by |S1lNv50FW) (:text |or) + |j $ %{} :Expr (:at 1627217681642) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1627217680827) (:by |S1lNv50FW) (:text |or) - |j $ %{} :Expr (:at 1627217681642) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1627217681946) (:by |S1lNv50FW) (:text |{}) - |r $ %{} :Expr (:at 1504777570689) (:by nil) + |T $ %{} :Leaf (:at 1627217681946) (:by |S1lNv50FW) (:text |{}) + |r $ %{} :Expr (:at 1504777570689) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1694936751703) (:by |S1lNv50FW) (:text |map-kv) + |b $ %{} :Expr (:at 1694936752274) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |keys) + |T $ %{} :Leaf (:at 1694936753114) (:by |S1lNv50FW) (:text |fn) + |b $ %{} :Expr (:at 1694936753342) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936754315) (:by |S1lNv50FW) (:text |k) + |b $ %{} :Leaf (:at 1694936754718) (:by |S1lNv50FW) (:text |v) + |h $ %{} :Expr (:at 1694936755402) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1694936755696) (:by |S1lNv50FW) (:text |[]) + |b $ %{} :Leaf (:at 1694936756247) (:by |S1lNv50FW) (:text |k) + |h $ %{} :Expr (:at 1694936757358) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1694936766423) (:by |S1lNv50FW) (:text |:doc) + |T $ %{} :Leaf (:at 1694936756588) (:by |S1lNv50FW) (:text |v) |v $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |#{}) + |T $ %{} :Leaf (:at 1694936730842) (:by |S1lNv50FW) (:text |{}) |v $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:changed-files) diff --git a/compact.cirru b/compact.cirru index 7f04b99..128a0cc 100644 --- a/compact.cirru +++ b/compact.cirru @@ -1719,7 +1719,7 @@ :defs $ {} |comp-file $ %{} :CodeEntry (:doc |) :code $ quote - defcomp comp-file (states selected-ns defs-set highlights configs) + defcomp comp-file (states selected-ns defs-dict highlights configs) let cursor $ :cursor states state $ or (:data states) @@ -1762,7 +1762,7 @@ d! cursor $ assoc state :def-text (:value e) =< nil 8 list-> ({}) - -> defs-set (.to-list) + -> defs-dict keys (.to-list) filter $ fn (def-text) .includes? def-text $ :def-text state sort &compare @@ -1772,17 +1772,19 @@ >> states $ str :rm def-text {} $ :text (str "\"Sure to remove def: " def-text "\" ?") div - {} (:class-name |hoverable) - :style $ merge ui/row-parted style-def - if - includes? highlights $ {} (:ns selected-ns) (:extra def-text) (:kind :def) - {} $ :color :white + {} + :class-name $ str-spaced css/row-parted style-def |hoverable + :style $ if + includes? highlights $ {} (:ns selected-ns) (:extra def-text) (:kind :def) + {} $ :color :white :on-click $ fn (e d!) d! :writer/edit $ {} (:kind :def) (:extra def-text) - <> def-text nil + div ({}) (<> def-text nil) (=< 8 nil) + <> (get defs-dict def-text) style-def-doc =< 16 nil span - {} (:class-name "\"is-minor") (:style style-remove) + {} + :class-name $ str-spaced "\"is-minor" style-remove :on-click $ fn (e d!) .show confirm-remove-plugin d! $ fn () (d! :ir/remove-def def-text) comp-i :x 12 $ hsl 0 0 80 0.5 @@ -1799,7 +1801,7 @@ plugin-add-ns $ use-prompt (>> states :add-ns) {} $ :title "\"New namespace:" div - {} $ :style (merge ui/column style-list) + {} $ :class-name (str-spaced css/column style-list) div {} $ :style style/title <> |Namespaces @@ -1848,9 +1850,9 @@ has-highlight? $ includes? ns-highlights ns-text div {} - :class-name $ if selected? "|hoverable is-selected" |hoverable - :style $ merge ui/row-parted style-ns - if has-highlight? $ {} (:color :white) + :class-name $ str-spaced css/row-parted style-ns (if selected? "|hoverable is-selected" |hoverable) + :style $ if has-highlight? + {} $ :color :white :on-click $ fn (e d!) (d! :session/select-ns ns-text) let pieces $ split ns-text "\"." @@ -1865,7 +1867,8 @@ =< 8 nil <> ns-doc style-ns-doc span - {} (:class-name "\"is-minor") (:style style-remove) + {} + :class-name $ str-spaced "\"is-minor" style-remove :on-click $ fn (e d!) .show plugin-rm-ns d! $ fn () (d! :ir/remove-ns ns-text) comp-i :x 12 $ hsl 0 0 80 0.6 @@ -1878,11 +1881,11 @@ ns-highlights $ map highlights fn (x) (:ns x) div - {} $ :style (merge ui/flex ui/row sytle-container) - comp-namespace-list (>> states :ns) (:ns-set router-data) selected-ns ns-highlights + {} $ :class-name (str-spaced css/flex css/row sytle-container) + comp-namespace-list (>> states :ns) (:ns-dict router-data) selected-ns ns-highlights =< 32 nil if (some? selected-ns) - comp-file (>> states selected-ns) selected-ns (:defs-set router-data) highlights $ :file-configs router-data + comp-file (>> states selected-ns) selected-ns (:defs-dict router-data) highlights $ :file-configs router-data render-empty =< 32 nil comp-changed-files (>> states :files) (:changed-files router-data) @@ -1894,7 +1897,7 @@ :code $ quote defstyle css-file $ {} "\"$0" $ merge ui/column - {} (:width 280) (:overflow :auto) (:padding-top 24) (:padding-bottom 120) + {} (:width 360) (:overflow :auto) (:padding-top 24) (:padding-bottom 120) |render-empty $ %{} :CodeEntry (:doc |) :code $ quote defn render-empty () $ div @@ -1904,8 +1907,19 @@ <> |Empty nil |style-def $ %{} :CodeEntry (:doc |) :code $ quote - def style-def $ {} (:padding "|0 8px") (:position :relative) - :color $ hsl 0 0 74 + defstyle style-def $ {} + "\"&" $ {} (:padding "|0 8px") (:position :relative) + :color $ hsl 0 0 74 + |style-def-doc $ %{} :CodeEntry (:doc |) + :code $ quote + defstyle style-def-doc $ {} + "\"&" $ {} + :color $ hsl 0 0 100 0.5 + :max-width "\"120px" + :overflow :hidden + :white-space :nowrap + :text-overflow :ellipsis + :font-family ui/font-fancy |style-input $ %{} :CodeEntry (:doc |) :code $ quote def style-input $ merge style/input @@ -1920,11 +1934,13 @@ def style-link $ {} (:cursor :pointer) |style-list $ %{} :CodeEntry (:doc |) :code $ quote - def style-list $ {} (:width 360) (:overflow :auto) (:padding-top 24) (:padding-bottom 120) + defstyle style-list $ {} + "\"&" $ {} (:width 360) (:overflow :auto) (:padding-top 24) (:padding-bottom 120) |style-ns $ %{} :CodeEntry (:doc |) :code $ quote - def style-ns $ {} (:cursor :pointer) (:vertical-align :middle) (:position :relative) (:padding "|0 8px") - :color $ hsl 0 0 74 + defstyle style-ns $ {} + "\"&" $ {} (:cursor :pointer) (:vertical-align :middle) (:position :relative) (:padding "|0 8px") + :color $ hsl 0 0 74 |style-ns-doc $ %{} :CodeEntry (:doc |) :code $ quote defstyle style-ns-doc $ {} @@ -1936,22 +1952,26 @@ :overflow :hidden :text-overflow :ellipsis :vertical-align :middle + :font-family ui/font-fancy |style-remove $ %{} :CodeEntry (:doc |) :code $ quote - def style-remove $ {} - :color $ hsl 0 50 90 - :font-size 12 - :cursor :pointer - :vertical-align :middle - :line-height "\"12px" + defstyle style-remove $ {} + "\"&" $ {} + :color $ hsl 0 50 90 + :font-size 12 + :cursor :pointer + :vertical-align :middle + :line-height "\"12px" |sytle-container $ %{} :CodeEntry (:doc |) :code $ quote - def sytle-container $ {} (:padding "|0px 16px") + defstyle sytle-container $ {} + "\"&" $ {} (:padding "|0px 16px") :ns $ %{} :CodeEntry (:doc |) :code $ quote ns app.comp.page-files $ :require respo.util.format :refer $ hsl respo-ui.core :as ui + respo-ui.css :as css respo.core :refer $ defcomp list-> >> <> span div pre input button a respo.css :refer $ defstyle respo.comp.inspect :refer $ comp-inspect @@ -2730,8 +2750,8 @@ :code $ quote def page-data $ {} :files $ {} - :ns-set $ #{} - :defs-set $ #{} + :ns-dict $ #{} + :defs-dict $ #{} :changed-files $ {} :editor $ {} :focus $ [] @@ -3398,15 +3418,16 @@ :code $ quote defn twig-page-files (files selected-ns saved-files draft-ns sessions sid) {} - :ns-set $ -> files + :ns-dict $ -> files map-kv $ fn (k v) [] k $ get-in v ([] :ns :doc) - :defs-set $ if (some? selected-ns) - do $ -> + :defs-dict $ if (some? selected-ns) + -> get-in files $ [] selected-ns :defs or $ {} - keys - #{} + map-kv $ fn (k v) + [] k $ :doc v + {} :changed-files $ render-changed-files files saved-files :peeking-file $ if (some? draft-ns) (get files draft-ns) nil :highlights $ -> sessions (.to-list) From e4934c6b5a862c0139b86518285d24c4feb70e64 Mon Sep 17 00:00:00 2001 From: tiye Date: Sun, 17 Sep 2023 16:10:06 +0800 Subject: [PATCH 3/6] fix unindent; tag 0.8.7 --- calcit.cirru | 30 ++++++++++++++++-------------- compact.cirru | 14 +++++++++----- package.cirru | 24 ++++++++++++------------ package.json | 2 +- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index 9dbbf8f..f2b12e9 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1,6 +1,6 @@ {} (:package |app) - :configs $ {} (:init-fn |app.server/main!) (:port 6001) (:reload-fn |app.server/reload!) (:version |0.8.6) + :configs $ {} (:init-fn |app.server/main!) (:port 6001) (:reload-fn |app.server/reload!) (:version |0.8.7) :modules $ [] |lilac/ |memof/ |recollect/ |cumulo-util.calcit/ |ws-edn.calcit/ |bisection-key/ :entries $ {} :client $ {} (:init-fn |app.client/main!) (:reload-fn |app.client/reload!) @@ -15777,10 +15777,14 @@ |r $ %{} :Expr (:at 1625815134491) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1625815134491) (:by |S1lNv50FW) (:text |.includes?) - |j $ %{} :Expr (:at 1625815134491) (:by |S1lNv50FW) + |j $ %{} :Expr (:at 1694937632229) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1625815134491) (:by |S1lNv50FW) (:text |:extra) - |j $ %{} :Leaf (:at 1625815134491) (:by |S1lNv50FW) (:text |bookmark) + |D $ %{} :Leaf (:at 1694937632830) (:by |S1lNv50FW) (:text |or) + |T $ %{} :Expr (:at 1625815134491) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1625815134491) (:by |S1lNv50FW) (:text |:extra) + |j $ %{} :Leaf (:at 1625815134491) (:by |S1lNv50FW) (:text |bookmark) + |b $ %{} :Leaf (:at 1694937633651) (:by |S1lNv50FW) (:text "|\"") |r $ %{} :Leaf (:at 1625815134491) (:by |S1lNv50FW) (:text |y) |v $ %{} :Expr (:at 1600312970289) (:by |S1lNv50FW) :data $ {} @@ -23617,12 +23621,10 @@ |T $ %{} :Expr (:at 1689420389280) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |:ir/unindent) - |b $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |op-data) |b $ %{} :Expr (:at 1689420389280) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |ir/unindent) |b $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |db) - |h $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |op-data) |l $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |sid) |o $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |op-id) |q $ %{} :Leaf (:at 1689420389280) (:by |S1lNv50FW) (:text |op-time) @@ -29117,7 +29119,6 @@ |r $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |db) - |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |op-data) |r $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |session-id) |v $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |op-id) |x $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |op-time) @@ -29220,16 +29221,17 @@ :data $ {} |T $ %{} :Leaf (:at 1627803433556) (:by |S1lNv50FW) (:text |:data) |j $ %{} :Leaf (:at 1627803434649) (:by |S1lNv50FW) (:text |expr) - |p $ %{} :Expr (:at 1627803478347) (:by |S1lNv50FW) + |p $ %{} :Expr (:at 1694938117562) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1627803479496) (:by |S1lNv50FW) (:text |last) - |T $ %{} :Expr (:at 1627803476106) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694938117562) (:by |S1lNv50FW) (:text |nth) + |b $ %{} :Expr (:at 1694938117562) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1627803477068) (:by |S1lNv50FW) (:text |first) - |T $ %{} :Expr (:at 1627803468900) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1694938117562) (:by |S1lNv50FW) (:text |&map:destruct) + |b $ %{} :Expr (:at 1694938117562) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1627803471911) (:by |S1lNv50FW) (:text |:data) - |j $ %{} :Leaf (:at 1627803475235) (:by |S1lNv50FW) (:text |expr) + |T $ %{} :Leaf (:at 1694938117562) (:by |S1lNv50FW) (:text |:data) + |b $ %{} :Leaf (:at 1694938117562) (:by |S1lNv50FW) (:text |expr) + |h $ %{} :Leaf (:at 1694938117562) (:by |S1lNv50FW) (:text |1) |r $ %{} :Leaf (:at 1627803442141) (:by |S1lNv50FW) (:text |expr) |T $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} diff --git a/compact.cirru b/compact.cirru index 128a0cc..ee4658b 100644 --- a/compact.cirru +++ b/compact.cirru @@ -1,6 +1,6 @@ {} (:package |app) - :configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.8.6) + :configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.8.7) :modules $ [] |lilac/ |memof/ |recollect/ |cumulo-util.calcit/ |ws-edn.calcit/ |bisection-key/ :entries $ {} :client $ {} (:init-fn |app.client/main!) (:reload-fn |app.client/reload!) @@ -2350,7 +2350,9 @@ and = :def $ :kind bookmark every? queries $ fn (y) - .includes? (:extra bookmark) y + .includes? + or (:extra bookmark) "\"" + , y .sort-by $ if blank? $ :query state , bookmark->str query-length @@ -3572,7 +3574,7 @@ (:ir/expr-after op-data) (ir/expr-after db op-data sid op-id op-time) (:ir/expr-replace op-data) (ir/expr-replace db op-data sid op-id op-time) (:ir/indent op-data) (ir/indent db op-data sid op-id op-time) - (:ir/unindent op-data) (ir/unindent db op-data sid op-id op-time) + (:ir/unindent) (ir/unindent db sid op-id op-time) (:ir/unindent-leaf op-data) (ir/unindent-leaf db op-data sid op-id op-time) (:ir/update-leaf op-data) (ir/update-leaf db op-data sid op-id op-time) (:ir/duplicate op-data) (ir/duplicate db op-data sid op-id op-time) @@ -4264,7 +4266,7 @@ do (println "\"Toggle comment at wrong place," node) node |unindent $ %{} :CodeEntry (:doc |) :code $ quote - defn unindent (db op-data session-id op-id op-time) + defn unindent (db session-id op-id op-time) let writer $ get-in db ([] :sessions session-id :writer) bookmark $ get (:stack writer) (:pointer writer) @@ -4277,7 +4279,9 @@ fn (expr) if = 1 $ count (:data expr) - last $ first (:data expr) + nth + &map:destruct $ :data expr + , 1 , expr -> db update-in diff --git a/package.cirru b/package.cirru index 64dced0..c3e9477 100644 --- a/package.cirru +++ b/package.cirru @@ -1,15 +1,15 @@ {} :dependencies $ {} - |calcit-lang/lilac |0.4.0-a2 - |calcit-lang/memof |0.0.14 - |Respo/respo.calcit |0.16.0-a3 - |Respo/respo-ui.calcit |0.5.0-a3 - |Respo/respo-markdown.calcit |0.4.0-a3 - |calcit-lang/recollect |0.0.14 - |calcit-lang/bisection-key |0.0.15 - |Respo/respo-message.calcit |0.0.7 - |Respo/respo-feather.calcit |0.3.0-a3 - |Respo/alerts.calcit |0.9.0-a2 - |mvc-works/ws-edn.calcit |0.0.9 - |Cumulo/cumulo-util.calcit |0.0.6 + |calcit-lang/lilac |main + |calcit-lang/memof |main + |Respo/respo.calcit |main + |Respo/respo-ui.calcit |main + |Respo/respo-markdown.calcit |main + |calcit-lang/recollect |main + |calcit-lang/bisection-key |main + |Respo/respo-message.calcit |main + |Respo/respo-feather.calcit |main + |Respo/alerts.calcit |main + |mvc-works/ws-edn.calcit |main + |Cumulo/cumulo-util.calcit |main diff --git a/package.json b/package.json index 46165e8..12b944d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@calcit/editor", - "version": "0.8.6", + "version": "0.8.7", "description": "Tree Editor for Calcit Language", "bin": { "ct": "./server.mjs" From cbdb1de743b9d5eb860cf28fdbebbdddef0f5f34 Mon Sep 17 00:00:00 2001 From: tiye Date: Tue, 19 Sep 2023 00:17:22 +0800 Subject: [PATCH 4/6] hide header in picker mode --- calcit.cirru | 83 ++++++++++++++++++++++++++++++++------------------- compact.cirru | 16 +++++----- 2 files changed, 61 insertions(+), 38 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index f2b12e9..e7a0fbc 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -802,7 +802,7 @@ :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |println) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text "||Found no storage.") - :ns $ %{} :CodeEntry (:doc |) + :ns $ %{} :CodeEntry (:doc "|browser side main file") :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ns) @@ -2956,10 +2956,10 @@ |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |j $ %{} :Expr (:at 1695053502181) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504778186298) (:by |root) (:text |:padding-left) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |16) + |T $ %{} :Leaf (:at 1695053502181) (:by |S1lNv50FW) (:text |:padding-left) + |b $ %{} :Leaf (:at 1695053502181) (:by |S1lNv50FW) (:text |16) |style-info $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -3929,7 +3929,7 @@ |h $ %{} :Leaf (:at 1677095563642) (:by |S1lNv50FW) (:text |style) |app.comp.container $ %{} :FileEntry :defs $ {} - |comp-container $ %{} :CodeEntry (:doc |) + |comp-container $ %{} :CodeEntry (:doc "|respo UI main entry") :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |defcomp) @@ -3983,6 +3983,16 @@ |T $ %{} :Leaf (:at 1511454801137) (:by |S1lNv50FW) (:text |[]) |j $ %{} :Leaf (:at 1511454802651) (:by |S1lNv50FW) (:text |:user) |r $ %{} :Leaf (:at 1511454807279) (:by |S1lNv50FW) (:text |:theme) + |y $ %{} :Expr (:at 1695053527565) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695053530710) (:by |S1lNv50FW) (:text |picker-mode?) + |b $ %{} :Expr (:at 1695053532767) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695053532767) (:by |S1lNv50FW) (:text |some?) + |b $ %{} :Expr (:at 1695053532767) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695053532767) (:by |S1lNv50FW) (:text |:picker-mode) + |b $ %{} :Leaf (:at 1695053532767) (:by |S1lNv50FW) (:text |writer) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |if) @@ -4003,26 +4013,33 @@ :data $ {} |T $ %{} :Leaf (:at 1656239728864) (:by |S1lNv50FW) (:text |:class-name) |b $ %{} :Leaf (:at 1656239731348) (:by |S1lNv50FW) (:text |css-container) - |r $ %{} :Expr (:at 1504777353661) (:by nil) + |r $ %{} :Expr (:at 1695053537805) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |comp-header) - |b $ %{} :Expr (:at 1584895676444) (:by |S1lNv50FW) + |D $ %{} :Leaf (:at 1695053539525) (:by |S1lNv50FW) (:text |if) + |L $ %{} :Expr (:at 1695053539842) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1584895677086) (:by |S1lNv50FW) (:text |>>) - |T $ %{} :Leaf (:at 1550078415387) (:by |S1lNv50FW) (:text |states) - |j $ %{} :Leaf (:at 1584895677976) (:by |S1lNv50FW) (:text |:header) - |j $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:name) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |router) - |r $ %{} :Expr (:at 1504777353661) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:logged-in?) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |store) - |v $ %{} :Expr (:at 1516290372150) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695053711141) (:by |S1lNv50FW) (:text |not) + |b $ %{} :Leaf (:at 1695053541783) (:by |S1lNv50FW) (:text |picker-mode?) + |T $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1516290378240) (:by |S1lNv50FW) (:text |:stats) - |j $ %{} :Leaf (:at 1516290379900) (:by |S1lNv50FW) (:text |store) + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |comp-header) + |b $ %{} :Expr (:at 1584895676444) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1584895677086) (:by |S1lNv50FW) (:text |>>) + |T $ %{} :Leaf (:at 1550078415387) (:by |S1lNv50FW) (:text |states) + |j $ %{} :Leaf (:at 1584895677976) (:by |S1lNv50FW) (:text |:header) + |j $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:name) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |router) + |r $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:logged-in?) + |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |store) + |v $ %{} :Expr (:at 1516290372150) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1516290378240) (:by |S1lNv50FW) (:text |:stats) + |j $ %{} :Leaf (:at 1516290379900) (:by |S1lNv50FW) (:text |store) |v $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |div) @@ -4133,13 +4150,7 @@ :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:pointer) |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |writer) - |yb $ %{} :Expr (:at 1590234232779) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1590234234258) (:by |S1lNv50FW) (:text |some?) - |j $ %{} :Expr (:at 1590234236243) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1590234238170) (:by |S1lNv50FW) (:text |:picker-mode) - |j $ %{} :Leaf (:at 1590234240495) (:by |S1lNv50FW) (:text |writer) + |yb $ %{} :Leaf (:at 1695053535132) (:by |S1lNv50FW) (:text |picker-mode?) |yj $ %{} :Leaf (:at 1511455800946) (:by |S1lNv50FW) (:text |theme) |y $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -7095,7 +7106,7 @@ |yz5 $ %{} :Expr (:at 1656232137086) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1656232138972) (:by |S1lNv50FW) (:text |:z-index) - |b $ %{} :Leaf (:at 1656232142062) (:by |S1lNv50FW) (:text |100) + |b $ %{} :Leaf (:at 1695053728233) (:by |S1lNv50FW) (:text |100) |yz9 $ %{} :Expr (:at 1656234028353) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1656234032374) (:by |S1lNv50FW) (:text |:transition-duration) @@ -9199,6 +9210,16 @@ |b $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695053763179) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695053764000) (:by |S1lNv50FW) (:text |:style) + |b $ %{} :Expr (:at 1695053764242) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695053764635) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695053764914) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695053767355) (:by |S1lNv50FW) (:text |:margin-left) + |b $ %{} :Leaf (:at 1695053782860) (:by |S1lNv50FW) (:text |32) |h $ %{} :Expr (:at 1694935970387) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1694935970387) (:by |S1lNv50FW) (:text |span) @@ -14511,7 +14532,7 @@ |yj $ %{} :Expr (:at 1597334756873) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1597334756873) (:by |S1lNv50FW) (:text |:z-index) - |j $ %{} :Leaf (:at 1597334756873) (:by |S1lNv50FW) (:text |100) + |j $ %{} :Leaf (:at 1695053511789) (:by |S1lNv50FW) (:text |100) |yr $ %{} :Expr (:at 1597334756873) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1597334756873) (:by |S1lNv50FW) (:text |:border-radius) diff --git a/compact.cirru b/compact.cirru index ee4658b..ab3916a 100644 --- a/compact.cirru +++ b/compact.cirru @@ -135,7 +135,7 @@ do $ dispatch! :: :user/log-in $ parse-cirru-edn raw do $ println "|Found no storage." - :ns $ %{} :CodeEntry (:doc |) + :ns $ %{} :CodeEntry (:doc "|browser side main file") :code $ quote ns app.client $ :require respo.core :refer $ render! clear-cache! *changes-logger @@ -630,7 +630,7 @@ app.style :as style |app.comp.container $ %{} :FileEntry :defs $ {} - |comp-container $ %{} :CodeEntry (:doc |) + |comp-container $ %{} :CodeEntry (:doc "|respo UI main entry") :code $ quote defcomp comp-container (states store) let @@ -639,10 +639,12 @@ writer $ :writer session router $ :router store theme $ get-in store ([] :user :theme) + picker-mode? $ some? (:picker-mode writer) if (nil? store) (comp-about) div {} $ :class-name css-container - comp-header (>> states :header) (:name router) (:logged-in? store) (:stats store) + if (not picker-mode?) + comp-header (>> states :header) (:name router) (:logged-in? store) (:stats store) div {} $ :style merge ui/row ui/expand $ {} (; :padding-top 32) @@ -652,9 +654,7 @@ <> $ str "\"404 page: " (to-lispy-string router) :profile $ comp-profile (>> states :profile) (:user store) :files $ comp-page-files (>> states :files) (:selected-ns writer) (:data router) - :editor $ comp-page-editor (>> states :editor) (:stack writer) (:data router) (:pointer writer) - some? $ :picker-mode writer - , theme + :editor $ comp-page-editor (>> states :editor) (:stack writer) (:data router) (:pointer writer) picker-mode? theme :members $ comp-page-members (:data router) (:id session) :search $ comp-search (>> states :search) (:data router) :watching $ comp-watching (>> states :watching) (:data router) (:theme session) @@ -1375,7 +1375,9 @@ :input-style $ {} doc $ :doc expr-entry no-doc? $ blank? doc - div ({}) + div + {} $ :style + {} $ :margin-left 32 span $ {} :inner-text $ if no-doc? "\"no doc" doc :class-name $ str-spaced style-doc (if no-doc? style-doc-empty) From b2fbad955f520e456e687a00cc1c8483273a66fa Mon Sep 17 00:00:00 2001 From: tiye Date: Tue, 19 Sep 2023 00:27:10 +0800 Subject: [PATCH 5/6] random updates CSS in Calcit --- calcit.cirru | 255 +++++++++++++++++++++++++------------------------- compact.cirru | 50 +++++----- 2 files changed, 154 insertions(+), 151 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index e7a0fbc..307194e 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1249,7 +1249,12 @@ |j $ %{} :Expr (:at 1563385571943) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1656317086375) (:by |S1lNv50FW) (:text |:class-name) - |b $ %{} :Leaf (:at 1656317088896) (:by |S1lNv50FW) (:text |css-about) + |b $ %{} :Expr (:at 1695054016241) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695054018876) (:by |S1lNv50FW) (:text |str-spaced) + |b $ %{} :Leaf (:at 1695054023104) (:by |S1lNv50FW) (:text |css/global) + |h $ %{} :Leaf (:at 1695054024850) (:by |S1lNv50FW) (:text |css/fullscreen) + |l $ %{} :Leaf (:at 1695054026762) (:by |S1lNv50FW) (:text |css/column) |T $ %{} :Expr (:at 1506854823216) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1506854824053) (:by |root) (:text |div) @@ -1258,12 +1263,12 @@ |T $ %{} :Leaf (:at 1506854824692) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1535828656371) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1535828658119) (:by |S1lNv50FW) (:text |:style) + |T $ %{} :Leaf (:at 1695053896866) (:by |S1lNv50FW) (:text |:class-name) |j $ %{} :Expr (:at 1563385368424) (:by |root) :data $ {} - |D $ %{} :Leaf (:at 1563385370353) (:by |root) (:text |merge) - |L $ %{} :Leaf (:at 1563385372026) (:by |root) (:text |ui/flex) - |T $ %{} :Leaf (:at 1535828667424) (:by |S1lNv50FW) (:text |ui/center) + |D $ %{} :Leaf (:at 1695053901327) (:by |S1lNv50FW) (:text |str-spaced) + |L $ %{} :Leaf (:at 1695053903546) (:by |S1lNv50FW) (:text |css/flex) + |T $ %{} :Leaf (:at 1695053905155) (:by |S1lNv50FW) (:text |css/center) |n $ %{} :Expr (:at 1535828623757) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1535828624484) (:by |S1lNv50FW) (:text |img) @@ -1331,10 +1336,6 @@ |j $ %{} :Expr (:at 1563385603343) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1563385603343) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1563385603343) (:by |root) - :data $ {} - |T $ %{} :Leaf (:at 1563385603343) (:by |root) (:text |:class-name) - |j $ %{} :Leaf (:at 1563385603343) (:by |root) (:text ||comp-about) |p $ %{} :Expr (:at 1563385740605) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1563385740605) (:by |root) (:text |<>) @@ -1394,30 +1395,26 @@ |j $ %{} :Expr (:at 1563385609480) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1563385609480) (:by |root) (:text |:class-name) - |j $ %{} :Leaf (:at 1563386216491) (:by |root) (:text "|\"comp-about") + |j $ %{} :Leaf (:at 1695053924461) (:by |S1lNv50FW) (:text |css/center) |r $ %{} :Expr (:at 1563385628786) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1563385631327) (:by |root) (:text |:style) - |j $ %{} :Expr (:at 1563385647074) (:by |root) + |j $ %{} :Expr (:at 1563385649265) (:by |root) :data $ {} - |D $ %{} :Leaf (:at 1563385647947) (:by |root) (:text |merge) - |T $ %{} :Leaf (:at 1563386213680) (:by |root) (:text |ui/center) - |j $ %{} :Expr (:at 1563385649265) (:by |root) + |T $ %{} :Leaf (:at 1563385649684) (:by |root) (:text |{}) + |j $ %{} :Expr (:at 1563385649957) (:by |root) :data $ {} - |T $ %{} :Leaf (:at 1563385649684) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1563385649957) (:by |root) - :data $ {} - |T $ %{} :Leaf (:at 1563385651103) (:by |root) (:text |:padding) - |j $ %{} :Leaf (:at 1563386256667) (:by |root) (:text "|\"8px 8px") - |r $ %{} :Expr (:at 1563386224892) (:by |root) + |T $ %{} :Leaf (:at 1563385651103) (:by |root) (:text |:padding) + |j $ %{} :Leaf (:at 1563386256667) (:by |root) (:text "|\"8px 8px") + |r $ %{} :Expr (:at 1563386224892) (:by |root) + :data $ {} + |T $ %{} :Leaf (:at 1563386226500) (:by |root) (:text |:color) + |j $ %{} :Expr (:at 1563386226952) (:by |root) :data $ {} - |T $ %{} :Leaf (:at 1563386226500) (:by |root) (:text |:color) - |j $ %{} :Expr (:at 1563386226952) (:by |root) - :data $ {} - |T $ %{} :Leaf (:at 1563386227453) (:by |root) (:text |hsl) - |j $ %{} :Leaf (:at 1563386227808) (:by |root) (:text |0) - |r $ %{} :Leaf (:at 1563386228155) (:by |root) (:text |0) - |v $ %{} :Leaf (:at 1563386233969) (:by |root) (:text |50) + |T $ %{} :Leaf (:at 1563386227453) (:by |root) (:text |hsl) + |j $ %{} :Leaf (:at 1563386227808) (:by |root) (:text |0) + |r $ %{} :Leaf (:at 1563386228155) (:by |root) (:text |0) + |v $ %{} :Leaf (:at 1563386233969) (:by |root) (:text |50) |r $ %{} :Expr (:at 1563385609480) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1563385609480) (:by |root) (:text |comp-md-block) @@ -1425,23 +1422,6 @@ |r $ %{} :Expr (:at 1563385609480) (:by |root) :data $ {} |T $ %{} :Leaf (:at 1563385609480) (:by |root) (:text |{}) - |css-about $ %{} :CodeEntry (:doc |) - :code $ %{} :Expr (:at 1656317089177) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1656317092079) (:by |S1lNv50FW) (:text |defstyle) - |b $ %{} :Leaf (:at 1656317089177) (:by |S1lNv50FW) (:text |css-about) - |h $ %{} :Expr (:at 1656317093361) (:by |S1lNv50FW) - :data $ {} - |D $ %{} :Leaf (:at 1656317093883) (:by |S1lNv50FW) (:text |{}) - |T $ %{} :Expr (:at 1656317094333) (:by |S1lNv50FW) - :data $ {} - |D $ %{} :Leaf (:at 1656317106950) (:by |S1lNv50FW) (:text "|\"$0") - |T $ %{} :Expr (:at 1656317093026) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1656317093026) (:by |S1lNv50FW) (:text |merge) - |b $ %{} :Leaf (:at 1656317093026) (:by |S1lNv50FW) (:text |ui/global) - |h $ %{} :Leaf (:at 1656317093026) (:by |S1lNv50FW) (:text |ui/fullscreen) - |l $ %{} :Leaf (:at 1656317093026) (:by |S1lNv50FW) (:text |ui/column) |install-commands $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1563385889441) (:by |root) :data $ {} @@ -1468,6 +1448,11 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui) + |w $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |j $ %{} :Leaf (:at 1695053910612) (:by |S1lNv50FW) (:text |respo-ui.css) + |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) + |v $ %{} :Leaf (:at 1695053911694) (:by |S1lNv50FW) (:text |css) |y $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |j $ %{} :Leaf (:at 1541095477046) (:by |root) (:text |respo.core) @@ -2650,20 +2635,20 @@ |L $ %{} :Expr (:at 1584464799848) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1584464800212) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695054054924) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695054057667) (:by |S1lNv50FW) (:text |:class-name) + |b $ %{} :Leaf (:at 1695054064851) (:by |S1lNv50FW) (:text |css/row-parted) |j $ %{} :Expr (:at 1584464800742) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1584464801525) (:by |S1lNv50FW) (:text |:style) - |j $ %{} :Expr (:at 1584464877433) (:by |S1lNv50FW) + |j $ %{} :Expr (:at 1584464879326) (:by |S1lNv50FW) :data $ {} - |D $ %{} :Leaf (:at 1584464878525) (:by |S1lNv50FW) (:text |merge) - |T $ %{} :Leaf (:at 1584464876471) (:by |S1lNv50FW) (:text |ui/row-parted) - |j $ %{} :Expr (:at 1584464879326) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1584464879635) (:by |S1lNv50FW) (:text |{}) + |j $ %{} :Expr (:at 1584464879942) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1584464879635) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1584464879942) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1584464885124) (:by |S1lNv50FW) (:text |:align-items) - |j $ %{} :Leaf (:at 1584464887977) (:by |S1lNv50FW) (:text |:flex-end) + |T $ %{} :Leaf (:at 1584464885124) (:by |S1lNv50FW) (:text |:align-items) + |j $ %{} :Leaf (:at 1584464887977) (:by |S1lNv50FW) (:text |:flex-end) |T $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |D $ %{} :Leaf (:at 1510158992922) (:by |root) (:text |list->) @@ -3073,6 +3058,11 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui) + |w $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |j $ %{} :Leaf (:at 1695054072961) (:by |S1lNv50FW) (:text |respo-ui.css) + |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) + |v $ %{} :Leaf (:at 1695054073969) (:by |S1lNv50FW) (:text |css) |y $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo.core) @@ -3154,16 +3144,16 @@ :data $ {} |T $ %{} :Leaf (:at 1607788203468) (:by |S1lNv50FW) (:text |:placeholder) |j $ %{} :Leaf (:at 1607788207419) (:by |S1lNv50FW) (:text "|\"a version number...") - |x $ %{} :Expr (:at 1607789363510) (:by |S1lNv50FW) + |w $ %{} :Expr (:at 1695054201395) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789371664) (:by |S1lNv50FW) (:text |:input-style) - |j $ %{} :Expr (:at 1607789371883) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695054201395) (:by |S1lNv50FW) (:text |:input-style) + |b $ %{} :Expr (:at 1695054201395) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789372268) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1607789372512) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695054201395) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695054201395) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789375849) (:by |S1lNv50FW) (:text |:font-family) - |j $ %{} :Leaf (:at 1607789378103) (:by |S1lNv50FW) (:text |ui/font-code) + |T $ %{} :Leaf (:at 1695054201395) (:by |S1lNv50FW) (:text |:font-family) + |b $ %{} :Leaf (:at 1695054201395) (:by |S1lNv50FW) (:text |ui/font-code) |j $ %{} :Expr (:at 1607788140087) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1608102540492) (:by |S1lNv50FW) (:text |modules-plugin) @@ -3197,16 +3187,16 @@ :data $ {} |T $ %{} :Leaf (:at 1607788203468) (:by |S1lNv50FW) (:text |:placeholder) |j $ %{} :Leaf (:at 1608102590086) (:by |S1lNv50FW) (:text "|\"module/compact.cirru etc.") - |x $ %{} :Expr (:at 1607789363510) (:by |S1lNv50FW) + |x $ %{} :Expr (:at 1695054200136) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789371664) (:by |S1lNv50FW) (:text |:input-style) - |j $ %{} :Expr (:at 1607789371883) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695054200136) (:by |S1lNv50FW) (:text |:input-style) + |b $ %{} :Expr (:at 1695054200136) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789372268) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1607789372512) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695054200136) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695054200136) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789375849) (:by |S1lNv50FW) (:text |:font-family) - |j $ %{} :Leaf (:at 1607789378103) (:by |S1lNv50FW) (:text |ui/font-code) + |T $ %{} :Leaf (:at 1695054200136) (:by |S1lNv50FW) (:text |:font-family) + |b $ %{} :Leaf (:at 1695054200136) (:by |S1lNv50FW) (:text |ui/font-code) |y $ %{} :Expr (:at 1611926301537) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1611926340081) (:by |S1lNv50FW) (:text |:multiline?) @@ -3240,16 +3230,16 @@ :data $ {} |T $ %{} :Leaf (:at 1627302739680) (:by |S1lNv50FW) (:text |:placeholder) |j $ %{} :Leaf (:at 1627302766007) (:by |S1lNv50FW) (:text "|\"a path...") - |x $ %{} :Expr (:at 1627302739680) (:by |S1lNv50FW) + |y $ %{} :Expr (:at 1695054194931) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1627302739680) (:by |S1lNv50FW) (:text |:input-style) - |j $ %{} :Expr (:at 1627302739680) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695054194931) (:by |S1lNv50FW) (:text |:input-style) + |b $ %{} :Expr (:at 1695054194931) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1627302739680) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1627302739680) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1695054194931) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695054194931) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1627302739680) (:by |S1lNv50FW) (:text |:font-family) - |j $ %{} :Leaf (:at 1627302739680) (:by |S1lNv50FW) (:text |ui/font-code) + |T $ %{} :Leaf (:at 1695054194931) (:by |S1lNv50FW) (:text |:font-family) + |b $ %{} :Leaf (:at 1695054194931) (:by |S1lNv50FW) (:text |ui/font-code) |v $ %{} :Expr (:at 1627302739680) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1627302770781) (:by |S1lNv50FW) (:text |reload-fn-plugin) @@ -3295,21 +3285,24 @@ |j $ %{} :Expr (:at 1607787699653) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1607787699923) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1695054118237) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695054119978) (:by |S1lNv50FW) (:text |:class-name) + |b $ %{} :Expr (:at 1695054121399) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695054124155) (:by |S1lNv50FW) (:text |str-spaced) + |b $ %{} :Leaf (:at 1695054129426) (:by |S1lNv50FW) (:text |css/expand) + |h $ %{} :Leaf (:at 1695054130687) (:by |S1lNv50FW) (:text |css/column) |j $ %{} :Expr (:at 1607787974198) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1607787974198) (:by |S1lNv50FW) (:text |:style) - |j $ %{} :Expr (:at 1607788007291) (:by |S1lNv50FW) + |j $ %{} :Expr (:at 1607789287893) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607788009206) (:by |S1lNv50FW) (:text |merge) - |j $ %{} :Leaf (:at 1607788011338) (:by |S1lNv50FW) (:text |ui/expand) - |r $ %{} :Leaf (:at 1607788019451) (:by |S1lNv50FW) (:text |ui/column) - |v $ %{} :Expr (:at 1607789287893) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1607789287893) (:by |S1lNv50FW) (:text |{}) + |j $ %{} :Expr (:at 1607789287893) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1607789287893) (:by |S1lNv50FW) (:text |{}) - |j $ %{} :Expr (:at 1607789287893) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1607789287893) (:by |S1lNv50FW) (:text |:padding) - |j $ %{} :Leaf (:at 1656245752060) (:by |S1lNv50FW) (:text "|\"40px 16px 0 16px") + |T $ %{} :Leaf (:at 1607789287893) (:by |S1lNv50FW) (:text |:padding) + |j $ %{} :Leaf (:at 1656245752060) (:by |S1lNv50FW) (:text "|\"40px 16px 0 16px") |s $ %{} :Expr (:at 1607788070761) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1607788071494) (:by |S1lNv50FW) (:text |=<) @@ -3383,8 +3376,8 @@ |T $ %{} :Leaf (:at 1607788062242) (:by |S1lNv50FW) (:text |{}) |j $ %{} :Expr (:at 1627303244584) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1627303244584) (:by |S1lNv50FW) (:text |:style) - |j $ %{} :Leaf (:at 1627303244584) (:by |S1lNv50FW) (:text |ui/row) + |T $ %{} :Leaf (:at 1695054145432) (:by |S1lNv50FW) (:text |:class-name) + |j $ %{} :Leaf (:at 1695054146971) (:by |S1lNv50FW) (:text |css/row) |t $ %{} :Expr (:at 1627303136685) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1627303139999) (:by |S1lNv50FW) (:text |render-label) @@ -3888,6 +3881,11 @@ |j $ %{} :Leaf (:at 1607787687616) (:by |S1lNv50FW) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1607787687616) (:by |S1lNv50FW) (:text |:as) |v $ %{} :Leaf (:at 1607787687616) (:by |S1lNv50FW) (:text |ui) + |w $ %{} :Expr (:at 1607787687616) (:by |S1lNv50FW) + :data $ {} + |j $ %{} :Leaf (:at 1695054137370) (:by |S1lNv50FW) (:text |respo-ui.css) + |r $ %{} :Leaf (:at 1607787687616) (:by |S1lNv50FW) (:text |:as) + |v $ %{} :Leaf (:at 1695054138308) (:by |S1lNv50FW) (:text |css) |x $ %{} :Expr (:at 1607787687616) (:by |S1lNv50FW) :data $ {} |j $ %{} :Leaf (:at 1607787687616) (:by |S1lNv50FW) (:text |respo.core) @@ -4012,7 +4010,13 @@ |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1656239728864) (:by |S1lNv50FW) (:text |:class-name) - |b $ %{} :Leaf (:at 1656239731348) (:by |S1lNv50FW) (:text |css-container) + |b $ %{} :Expr (:at 1695054267194) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1695054268785) (:by |S1lNv50FW) (:text |str-spaced) + |P $ %{} :Leaf (:at 1695054275854) (:by |S1lNv50FW) (:text |css/global) + |R $ %{} :Leaf (:at 1695054277456) (:by |S1lNv50FW) (:text |css/fullscreen) + |S $ %{} :Leaf (:at 1695054279522) (:by |S1lNv50FW) (:text |css/column) + |T $ %{} :Leaf (:at 1656239731348) (:by |S1lNv50FW) (:text |css-container) |r $ %{} :Expr (:at 1695053537805) (:by |S1lNv50FW) :data $ {} |D $ %{} :Leaf (:at 1695053539525) (:by |S1lNv50FW) (:text |if) @@ -4048,20 +4052,12 @@ |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) + |T $ %{} :Leaf (:at 1695054225778) (:by |S1lNv50FW) (:text |:class-name) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |merge) - |j $ %{} :Leaf (:at 1656232245042) (:by |S1lNv50FW) (:text |ui/row) - |r $ %{} :Leaf (:at 1580536539617) (:by |S1lNv50FW) (:text |ui/expand) - |t $ %{} :Expr (:at 1656233667663) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1656233668032) (:by |S1lNv50FW) (:text |{}) - |b $ %{} :Expr (:at 1656233668383) (:by |S1lNv50FW) - :data $ {} - |D $ %{} :Leaf (:at 1656233759025) (:by |S1lNv50FW) (:text |;) - |T $ %{} :Leaf (:at 1656233669933) (:by |S1lNv50FW) (:text |:padding-top) - |b $ %{} :Leaf (:at 1656233679018) (:by |S1lNv50FW) (:text |32) + |T $ %{} :Leaf (:at 1695054228997) (:by |S1lNv50FW) (:text |str-spaced) + |j $ %{} :Leaf (:at 1695054230296) (:by |S1lNv50FW) (:text |css/row) + |r $ %{} :Leaf (:at 1695054232138) (:by |S1lNv50FW) (:text |css/expand) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |if) @@ -4321,23 +4317,17 @@ |T $ %{} :Expr (:at 1656239705027) (:by |S1lNv50FW) :data $ {} |D $ %{} :Leaf (:at 1656239706754) (:by |S1lNv50FW) (:text "|\"$0") - |L $ %{} :Expr (:at 1656239709110) (:by |S1lNv50FW) + |L $ %{} :Expr (:at 1656239713980) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1656239709110) (:by |S1lNv50FW) (:text |merge) - |b $ %{} :Leaf (:at 1656239709110) (:by |S1lNv50FW) (:text |ui/global) - |h $ %{} :Leaf (:at 1656239709110) (:by |S1lNv50FW) (:text |ui/fullscreen) - |l $ %{} :Leaf (:at 1656239709110) (:by |S1lNv50FW) (:text |ui/column) - |o $ %{} :Expr (:at 1656239713980) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |{}) + |b $ %{} :Expr (:at 1656239713980) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |{}) - |b $ %{} :Expr (:at 1656239713980) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:background-color) - |b $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:black) - |h $ %{} :Expr (:at 1656239713980) (:by |S1lNv50FW) - :data $ {} - |T $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:color) - |b $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:white) + |T $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:background-color) + |b $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:black) + |h $ %{} :Expr (:at 1656239713980) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:color) + |b $ %{} :Leaf (:at 1656239713980) (:by |S1lNv50FW) (:text |:white) |style-inspector $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} @@ -4395,6 +4385,11 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui) + |u $ %{} :Expr (:at 1695054237359) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695054240073) (:by |S1lNv50FW) (:text |respo-ui.css) + |b $ %{} :Leaf (:at 1695054240481) (:by |S1lNv50FW) (:text |:as) + |h $ %{} :Leaf (:at 1695054240925) (:by |S1lNv50FW) (:text |css) |x $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo.core) @@ -6724,8 +6719,8 @@ |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) - |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui/row-center) + |T $ %{} :Leaf (:at 1695053867053) (:by |S1lNv50FW) (:text |:class-name) + |j $ %{} :Leaf (:at 1695053868633) (:by |S1lNv50FW) (:text |css/row-center) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |render-entry) @@ -7269,6 +7264,11 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui) + |s $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |j $ %{} :Leaf (:at 1695053876583) (:by |S1lNv50FW) (:text |respo-ui.css) + |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) + |v $ %{} :Leaf (:at 1695053877604) (:by |S1lNv50FW) (:text |css) |u $ %{} :Expr (:at 1656231967443) (:by |S1lNv50FW) :data $ {} |T $ %{} :Leaf (:at 1656231969481) (:by |S1lNv50FW) (:text |respo.css) @@ -8319,22 +8319,22 @@ |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) - |j $ %{} :Expr (:at 1626800552778) (:by |S1lNv50FW) - :data $ {} - |D $ %{} :Leaf (:at 1626800555309) (:by |S1lNv50FW) (:text |merge) - |L $ %{} :Leaf (:at 1626800558266) (:by |S1lNv50FW) (:text |ui/column) - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |style-login) + |T $ %{} :Leaf (:at 1695054311279) (:by |S1lNv50FW) (:text |:class-name) + |j $ %{} :Leaf (:at 1695054315521) (:by |S1lNv50FW) (:text |css/column) + |n $ %{} :Expr (:at 1695054323452) (:by |S1lNv50FW) + :data $ {} + |T $ %{} :Leaf (:at 1695054324170) (:by |S1lNv50FW) (:text |:style) + |b $ %{} :Leaf (:at 1695054324715) (:by |S1lNv50FW) (:text |style-login) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |div) |j $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |{}) - |j $ %{} :Expr (:at 1504777353661) (:by nil) + |j $ %{} :Expr (:at 1695054330613) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:style) - |r $ %{} :Leaf (:at 1626796302387) (:by |S1lNv50FW) (:text |ui/column) + |D $ %{} :Leaf (:at 1695054332389) (:by |S1lNv50FW) (:text |:class-name) + |T $ %{} :Leaf (:at 1695054334280) (:by |S1lNv50FW) (:text |css/column) |r $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |T $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |div) @@ -8650,6 +8650,11 @@ |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |respo-ui.core) |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) |v $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |ui) + |y $ %{} :Expr (:at 1504777353661) (:by nil) + :data $ {} + |j $ %{} :Leaf (:at 1695054340358) (:by |S1lNv50FW) (:text |respo-ui.css) + |r $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |:as) + |v $ %{} :Leaf (:at 1695054342838) (:by |S1lNv50FW) (:text |css) |yT $ %{} :Expr (:at 1504777353661) (:by nil) :data $ {} |j $ %{} :Leaf (:at 1504777353661) (:by |root) (:text |app.style) diff --git a/compact.cirru b/compact.cirru index ab3916a..579b823 100644 --- a/compact.cirru +++ b/compact.cirru @@ -221,31 +221,24 @@ |comp-about $ %{} :CodeEntry (:doc |) :code $ quote defcomp comp-about () $ div - {} $ :class-name css-about + {} $ :class-name (str-spaced css/global css/fullscreen css/column) div - {} $ :style (merge ui/flex ui/center) + {} $ :class-name (str-spaced css/flex css/center) img $ {} (:src "\"//cdn.tiye.me/logo/cirru.png") :style $ {} (:width 64) (:height 64) (:border-radius "\"8px") =< nil 16 <> "\"No connection to server..." $ {} (:font-family "|Josefin Sans") (:font-weight 300) (:font-size 24) :color $ hsl 0 80 60 - div - {} $ :class-name |comp-about - <> "\"Get editor server running with:" + div ({}) (<> "\"Get editor server running with:") pre $ {} (:innerHTML install-commands) (:class-name "\"copy-commands") :style $ {} (:cursor :pointer) (:padding "\"0 8px") :title "\"Click to copy." :on-click $ fn (e d!) (copy-silently! install-commands) div - {} (:class-name "\"comp-about") - :style $ merge ui/center - {} (:padding "\"8px 8px") - :color $ hsl 0 0 50 + {} (:class-name css/center) + :style $ {} (:padding "\"8px 8px") + :color $ hsl 0 0 50 comp-md-block "\"Calcit Editor is a syntax tree editor of [Cirru Project](http://cirru.org). Read more at [Calcit Editor](https://github.com/calcit-lang/editor).\n" $ {} - |css-about $ %{} :CodeEntry (:doc |) - :code $ quote - defstyle css-about $ {} - "\"$0" $ merge ui/global ui/fullscreen ui/column |install-commands $ %{} :CodeEntry (:doc |) :code $ quote (def install-commands "\"npm install -g @calcit/editor\nct\n") :ns $ %{} :CodeEntry (:doc |) @@ -253,6 +246,7 @@ ns app.comp.about $ :require respo.util.format :refer $ hsl respo-ui.core :as ui + respo-ui.css :as css respo.core :refer $ defcomp <> span div pre input button img a br respo.css :refer $ defstyle respo.comp.inspect :refer $ comp-inspect @@ -436,8 +430,8 @@ not= :same $ :ns info render-status ns-text :ns $ :ns info div - {} $ :style - merge ui/row-parted $ {} (:align-items :flex-end) + {} (:class-name css/row-parted) + :style $ {} (:align-items :flex-end) list-> {} $ :style style-defs -> (:defs info) (.to-list) @@ -503,6 +497,7 @@ ns app.comp.changed-info $ :require respo.util.format :refer $ hsl respo-ui.core :as ui + respo-ui.css :as css respo.core :refer $ defcomp list-> >> <> span div pre input button a respo.comp.space :refer $ =< app.style :as style @@ -535,8 +530,9 @@ :placeholder "\"a path..." :input-style $ {} (:font-family ui/font-code) div - {} $ :style - merge ui/expand ui/column $ {} (:padding "\"40px 16px 0 16px") + {} + :class-name $ str-spaced css/expand css/column + :style $ {} (:padding "\"40px 16px 0 16px") =< nil 8 div ({}) (render-label "\"Version:") (=< 8 nil) span @@ -546,7 +542,7 @@ d! :configs/update $ {} (:version text) render-field $ :version configs div - {} $ :style ui/row + {} $ :class-name css/row render-label "\"Modules:" =< 8 nil span @@ -623,6 +619,7 @@ ns app.comp.configs $ :require respo.util.format :refer $ hsl respo-ui.core :as ui + respo-ui.css :as css respo.core :refer $ defcomp >> <> span div a pre code button respo.comp.space :refer $ =< cirru-edn.core :as cirru-edn @@ -642,12 +639,11 @@ picker-mode? $ some? (:picker-mode writer) if (nil? store) (comp-about) div - {} $ :class-name css-container + {} $ :class-name (str-spaced css/global css/fullscreen css/column css-container) if (not picker-mode?) comp-header (>> states :header) (:name router) (:logged-in? store) (:stats store) div - {} $ :style - merge ui/row ui/expand $ {} (; :padding-top 32) + {} $ :class-name (str-spaced css/row css/expand) if (:logged-in? store) case-default (:name router) div ({}) @@ -673,8 +669,7 @@ |css-container $ %{} :CodeEntry (:doc |) :code $ quote defstyle css-container $ {} - "\"$0" $ merge ui/global ui/fullscreen ui/column - {} (:background-color :black) (:color :white) + "\"$0" $ {} (:background-color :black) (:color :white) |style-inspector $ %{} :CodeEntry (:doc |) :code $ quote def style-inspector $ {} (:bottom 0) (:left 0) (:max-width |100%) @@ -686,6 +681,7 @@ ns app.comp.container $ :require respo.util.format :refer $ hsl respo-ui.core :as ui + respo-ui.css :as css respo.core :refer $ defcomp >> <> div span respo.css :refer $ defstyle respo.comp.inspect :refer $ comp-inspect @@ -1024,7 +1020,7 @@ div {} $ :class-name css-header div - {} $ :style ui/row-center + {} $ :class-name css/row-center render-entry |Files :files router-name $ fn (e d!) d! :router/change $ {} (:name :files) render-entry |Editor :editor router-name $ fn (e d!) @@ -1091,6 +1087,7 @@ ns app.comp.header $ :require respo.util.format :refer $ hsl respo-ui.core :as ui + respo-ui.css :as css respo.css :refer $ defstyle respo.core :refer $ defcomp >> <> span div a respo.comp.space :refer $ =< @@ -1240,9 +1237,9 @@ cursor $ :cursor states state $ or (:data states) initial-state div - {} $ :style (merge ui/column style-login) + {} (:class-name css/column) (:style style-login) div - {} $ :style ui/column + {} $ :class-name css/column div ({}) input $ {} (:placeholder |Username) :value $ :username state @@ -1291,6 +1288,7 @@ respo.comp.space :refer $ =< respo.comp.inspect :refer $ comp-inspect respo-ui.core :as ui + respo-ui.css :as css app.style :as style app.config :as config |app.comp.messages $ %{} :FileEntry From 57d1d2bf9302b1db6887c126973a8c33044c82d2 Mon Sep 17 00:00:00 2001 From: tiye Date: Tue, 19 Sep 2023 01:00:24 +0800 Subject: [PATCH 6/6] fix edge case saving large file cause empty content; tag 0.8.8 --- calcit.cirru | 91 +++++++++++++++++++++++++++++---------------------- compact.cirru | 20 ++++++----- package.json | 2 +- 3 files changed, 63 insertions(+), 50 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index 307194e..543ab78 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1,6 +1,6 @@ {} (:package |app) - :configs $ {} (:init-fn |app.server/main!) (:port 6001) (:reload-fn |app.server/reload!) (:version |0.8.7) + :configs $ {} (:init-fn |app.server/main!) (:port 6001) (:reload-fn |app.server/reload!) (:version |0.8.8) :modules $ [] |lilac/ |memof/ |recollect/ |cumulo-util.calcit/ |ws-edn.calcit/ |bisection-key/ :entries $ {} :client $ {} (:init-fn |app.client/main!) (:reload-fn |app.client/reload!) @@ -18916,48 +18916,63 @@ :data $ {} |T $ %{} :Leaf (:at 1512702419617) (:by nil) (:text |md5) |j $ %{} :Leaf (:at 1512705931557) (:by nil) (:text |file-content) - |r $ %{} :Expr (:at 1512702328818) (:by nil) + |r $ %{} :Expr (:at 1695056334719) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1512702329281) (:by nil) (:text |if) - |j $ %{} :Expr (:at 1512702329520) (:by nil) + |D $ %{} :Leaf (:at 1695056335200) (:by |S1lNv50FW) (:text |if) + |L $ %{} :Expr (:at 1695056335502) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1512702330929) (:by nil) (:text |not=) - |j $ %{} :Leaf (:at 1512702334483) (:by nil) (:text |new-md5) - |r $ %{} :Leaf (:at 1533921046212) (:by |root) (:text |@*calcit-md5) - |r $ %{} :Expr (:at 1512702349677) (:by nil) + |T $ %{} :Leaf (:at 1695056338366) (:by |S1lNv50FW) (:text |blank?) + |b $ %{} :Leaf (:at 1695056339956) (:by |S1lNv50FW) (:text |file-content) + |P $ %{} :Expr (:at 1695056346619) (:by |S1lNv50FW) :data $ {} - |T $ %{} :Leaf (:at 1512702431546) (:by nil) (:text |let) - |b $ %{} :Expr (:at 1512702431772) (:by nil) + |T $ %{} :Leaf (:at 1695056346619) (:by |S1lNv50FW) (:text |eprintln) + |b $ %{} :Expr (:at 1695056346619) (:by |S1lNv50FW) :data $ {} - |j $ %{} :Expr (:at 1512702439808) (:by nil) + |T $ %{} :Leaf (:at 1695056346619) (:by |S1lNv50FW) (:text |.!red) + |b $ %{} :Leaf (:at 1695056346619) (:by |S1lNv50FW) (:text |chalk) + |h $ %{} :Leaf (:at 1695056346619) (:by |S1lNv50FW) (:text "|\"got blank file on change, server might have staled") + |T $ %{} :Expr (:at 1512702328818) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1512702329281) (:by nil) (:text |if) + |j $ %{} :Expr (:at 1512702329520) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1512702330929) (:by nil) (:text |not=) + |j $ %{} :Leaf (:at 1512702334483) (:by nil) (:text |new-md5) + |r $ %{} :Leaf (:at 1533921046212) (:by |root) (:text |@*calcit-md5) + |r $ %{} :Expr (:at 1512702349677) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1512702431546) (:by nil) (:text |let) + |b $ %{} :Expr (:at 1512702431772) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1533921047350) (:by |root) (:text |calcit) - |j $ %{} :Expr (:at 1512702442509) (:by nil) + |j $ %{} :Expr (:at 1512702439808) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1625686125697) (:by |S1lNv50FW) (:text |parse-cirru-edn) - |j $ %{} :Leaf (:at 1512702446822) (:by nil) (:text |file-content) - |f $ %{} :Expr (:at 1512703947620) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1512703963190) (:by nil) (:text |println) - |j $ %{} :Expr (:at 1533921188733) (:by |root) + |T $ %{} :Leaf (:at 1533921047350) (:by |root) (:text |calcit) + |j $ %{} :Expr (:at 1512702442509) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1625686125697) (:by |S1lNv50FW) (:text |parse-cirru-edn) + |j $ %{} :Leaf (:at 1512702446822) (:by nil) (:text |file-content) + |f $ %{} :Expr (:at 1512703947620) (:by nil) :data $ {} - |9 $ %{} :Leaf (:at 1644942288597) (:by |S1lNv50FW) (:text |.!blue) - |L $ %{} :Leaf (:at 1644942286206) (:by |S1lNv50FW) (:text |chalk) - |T $ %{} :Leaf (:at 1533921501407) (:by |root) (:text "|\"calcit storage file changed!") - |h $ %{} :Expr (:at 1512704174152) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1512704175274) (:by nil) (:text |reset!) - |j $ %{} :Leaf (:at 1533921056913) (:by |root) (:text |*calcit-md5) - |r $ %{} :Leaf (:at 1512704184764) (:by nil) (:text |new-md5) - |j $ %{} :Expr (:at 1512702350929) (:by nil) - :data $ {} - |T $ %{} :Leaf (:at 1512702372483) (:by nil) (:text |dispatch!) - |j $ %{} :Expr (:at 1689419869799) (:by |S1lNv50FW) + |T $ %{} :Leaf (:at 1512703963190) (:by nil) (:text |println) + |j $ %{} :Expr (:at 1533921188733) (:by |root) + :data $ {} + |9 $ %{} :Leaf (:at 1644942288597) (:by |S1lNv50FW) (:text |.!blue) + |L $ %{} :Leaf (:at 1644942286206) (:by |S1lNv50FW) (:text |chalk) + |T $ %{} :Leaf (:at 1533921501407) (:by |root) (:text "|\"calcit storage file changed!") + |h $ %{} :Expr (:at 1512704174152) (:by nil) + :data $ {} + |T $ %{} :Leaf (:at 1512704175274) (:by nil) (:text |reset!) + |j $ %{} :Leaf (:at 1533921056913) (:by |root) (:text |*calcit-md5) + |r $ %{} :Leaf (:at 1512704184764) (:by nil) (:text |new-md5) + |j $ %{} :Expr (:at 1512702350929) (:by nil) :data $ {} - |D $ %{} :Leaf (:at 1689419870496) (:by |S1lNv50FW) (:text |::) - |T $ %{} :Leaf (:at 1512702388416) (:by nil) (:text |:watcher/file-change) - |b $ %{} :Leaf (:at 1689419875629) (:by |S1lNv50FW) (:text |calcit) - |n $ %{} :Leaf (:at 1689419906524) (:by |S1lNv50FW) (:text |nil) + |T $ %{} :Leaf (:at 1512702372483) (:by nil) (:text |dispatch!) + |j $ %{} :Expr (:at 1689419869799) (:by |S1lNv50FW) + :data $ {} + |D $ %{} :Leaf (:at 1689419870496) (:by |S1lNv50FW) (:text |::) + |T $ %{} :Leaf (:at 1512702388416) (:by nil) (:text |:watcher/file-change) + |b $ %{} :Leaf (:at 1689419875629) (:by |S1lNv50FW) (:text |calcit) + |n $ %{} :Leaf (:at 1689419906524) (:by |S1lNv50FW) (:text |nil) |reload! $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} @@ -33207,10 +33222,6 @@ :data $ {} |T $ %{} :Leaf (:at 1546180196666) (:by |root) (:text |dissoc) |j $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |:saved-files) - |x $ %{} :Expr (:at 1518362608175) (:by |root) - :data $ {} - |T $ %{} :Leaf (:at 1546180186800) (:by |root) (:text |dissoc) - |j $ %{} :Leaf (:at 1518362610826) (:by |root) (:text |:repl) |expr? $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} @@ -34910,7 +34921,7 @@ |T $ %{} :Leaf (:at 1504777570689) (:by |root) (:text |do) |j $ %{} :Expr (:at 1504777570689) (:by nil) :data $ {} - |T $ %{} :Leaf (:at 1520345593272) (:by |root) (:text |println) + |T $ %{} :Leaf (:at 1695056373487) (:by |S1lNv50FW) (:text |eprintln) |r $ %{} :Expr (:at 1505982482700) (:by |root) :data $ {} |9 $ %{} :Leaf (:at 1644942378938) (:by |S1lNv50FW) (:text |.!red) diff --git a/compact.cirru b/compact.cirru index 579b823..0566a52 100644 --- a/compact.cirru +++ b/compact.cirru @@ -1,6 +1,6 @@ {} (:package |app) - :configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.8.7) + :configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.8.8) :modules $ [] |lilac/ |memof/ |recollect/ |cumulo-util.calcit/ |ws-edn.calcit/ |bisection-key/ :entries $ {} :client $ {} (:init-fn |app.client/main!) (:reload-fn |app.client/reload!) @@ -2881,12 +2881,14 @@ defn on-file-change! () $ let file-content $ fs/readFileSync storage-file "\"utf8" new-md5 $ md5 file-content - if (not= new-md5 @*calcit-md5) - let - calcit $ parse-cirru-edn file-content - println $ .!blue chalk "\"calcit storage file changed!" - reset! *calcit-md5 new-md5 - dispatch! (:: :watcher/file-change calcit) nil + if (blank? file-content) + eprintln $ .!red chalk "\"got blank file on change, server might have staled" + if (not= new-md5 @*calcit-md5) + let + calcit $ parse-cirru-edn file-content + println $ .!blue chalk "\"calcit storage file changed!" + reset! *calcit-md5 new-md5 + dispatch! (:: :watcher/file-change calcit) nil |reload! $ %{} :CodeEntry (:doc |) :code $ quote defn reload! () @@ -4863,7 +4865,7 @@ |db->string $ %{} :CodeEntry (:doc |) :code $ quote defn db->string (db) - format-cirru-edn $ -> db (dissoc :sessions) (dissoc :saved-files) (dissoc :repl) + format-cirru-edn $ -> db (dissoc :sessions) (dissoc :saved-files) |expr? $ %{} :CodeEntry (:doc |) :code $ quote defn expr? (x) (&record:matches? schema/CirruExpr x) @@ -5118,7 +5120,7 @@ persist-async! (:storage-file config/site) db-content started-time fn (e) do - println $ .!red chalk e + eprintln $ .!red chalk e js/console.error e dispatch! $ :: :notify/push-message [] :error $ aget e "\"message" diff --git a/package.json b/package.json index 12b944d..71a8b62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@calcit/editor", - "version": "0.8.7", + "version": "0.8.8", "description": "Tree Editor for Calcit Language", "bin": { "ct": "./server.mjs"