From b3e82e1daee4cca04141b57e665e36050e7f81b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A2=98=E5=8F=B6?= Date: Wed, 2 Apr 2025 03:21:14 +0800 Subject: [PATCH 1/2] fix with abort button --- calcit.cirru | 266 +++++++++++++++-------- compact.cirru | 23 +- package.json | 2 +- yarn.lock | 568 +++++++++++++++++++++++++------------------------- 4 files changed, 474 insertions(+), 385 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index 45e0a0e..fb16dab 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1363,93 +1363,180 @@ :data $ {} |T $ %{} :Leaf (:at 1728103023953) (:by |rJG4IHzWf) (:text |atom) |b $ %{} :Leaf (:at 1728103023953) (:by |rJG4IHzWf) (:text "|\"") - |e $ %{} :Expr (:at 1739123450753) (:by |rJG4IHzWf) + |e $ %{} :Expr (:at 1743535189770) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1739123458708) (:by |rJG4IHzWf) (:text |for-await-stream) - |T $ %{} :Expr (:at 1739122644334) (:by |rJG4IHzWf) + |D $ %{} :Leaf (:at 1743535193104) (:by |rJG4IHzWf) (:text |js-await) + |T $ %{} :Expr (:at 1739123450753) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1739122645870) (:by |rJG4IHzWf) (:text |.-stream) - |T $ %{} :Leaf (:at 1739122643376) (:by |rJG4IHzWf) (:text |sdk-result) - |b $ %{} :Expr (:at 1739123463729) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123463981) (:by |rJG4IHzWf) (:text |fn) - |b $ %{} :Expr (:at 1739123464282) (:by |rJG4IHzWf) + |D $ %{} :Leaf (:at 1739123458708) (:by |rJG4IHzWf) (:text |for-await-stream) + |T $ %{} :Expr (:at 1739122644334) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1739123913291) (:by |rJG4IHzWf) (:text |?) - |T $ %{} :Leaf (:at 1739123465595) (:by |rJG4IHzWf) (:text |chunk) - |l $ %{} :Expr (:at 1739123925658) (:by |rJG4IHzWf) + |D $ %{} :Leaf (:at 1739122645870) (:by |rJG4IHzWf) (:text |.-stream) + |T $ %{} :Leaf (:at 1739122643376) (:by |rJG4IHzWf) (:text |sdk-result) + |b $ %{} :Expr (:at 1739123463729) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1739123926251) (:by |rJG4IHzWf) (:text |if) - |L $ %{} :Expr (:at 1739123927417) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1739123463981) (:by |rJG4IHzWf) (:text |fn) + |b $ %{} :Expr (:at 1739123464282) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123929094) (:by |rJG4IHzWf) (:text |some?) - |b $ %{} :Leaf (:at 1739123931239) (:by |rJG4IHzWf) (:text |chunk) - |T $ %{} :Expr (:at 1739123932215) (:by |rJG4IHzWf) + |D $ %{} :Leaf (:at 1739123913291) (:by |rJG4IHzWf) (:text |?) + |T $ %{} :Leaf (:at 1739123465595) (:by |rJG4IHzWf) (:text |chunk) + |l $ %{} :Expr (:at 1739123925658) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1739123932676) (:by |rJG4IHzWf) (:text |do) - |T $ %{} :Expr (:at 1739123745232) (:by |rJG4IHzWf) + |D $ %{} :Leaf (:at 1739123926251) (:by |rJG4IHzWf) (:text |if) + |L $ %{} :Expr (:at 1739123927417) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123745232) (:by |rJG4IHzWf) (:text |swap!) - |b $ %{} :Leaf (:at 1739123745232) (:by |rJG4IHzWf) (:text |*text) - |h $ %{} :Leaf (:at 1739123745232) (:by |rJG4IHzWf) (:text |str) - |l $ %{} :Expr (:at 1739123752902) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123752902) (:by |rJG4IHzWf) (:text |.!text) - |b $ %{} :Leaf (:at 1739123752902) (:by |rJG4IHzWf) (:text |chunk) - |b $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1739123929094) (:by |rJG4IHzWf) (:text |some?) + |b $ %{} :Leaf (:at 1739123931239) (:by |rJG4IHzWf) (:text |chunk) + |T $ %{} :Expr (:at 1739123932215) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |d!) + |D $ %{} :Leaf (:at 1739123932676) (:by |rJG4IHzWf) (:text |do) + |T $ %{} :Expr (:at 1739123745232) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123745232) (:by |rJG4IHzWf) (:text |swap!) + |b $ %{} :Leaf (:at 1739123745232) (:by |rJG4IHzWf) (:text |*text) + |h $ %{} :Leaf (:at 1739123745232) (:by |rJG4IHzWf) (:text |str) + |l $ %{} :Expr (:at 1739123752902) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123752902) (:by |rJG4IHzWf) (:text |.!text) + |b $ %{} :Leaf (:at 1739123752902) (:by |rJG4IHzWf) (:text |chunk) |b $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |::) - |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:states) - |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |cursor) - |l $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |d!) + |b $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |->) - |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |state) - |h $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |assoc) - |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:answer) - |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |@*text) + |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |::) + |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:states) + |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |cursor) |l $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |assoc) - |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:loading?) - |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |false) - |o $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |assoc) - |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:done?) - |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |false) - |o $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |d!) - |b $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |::) - |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:states) - |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |cursor) - |l $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |->) - |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |state) - |h $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |assoc) - |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:answer) - |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |@*text) + |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |->) + |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |state) + |h $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:answer) + |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |@*text) + |l $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:loading?) + |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |false) + |o $ %{} :Expr (:at 1739123935511) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |:done?) + |h $ %{} :Leaf (:at 1739123935511) (:by |rJG4IHzWf) (:text |false) + |o $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |d!) + |b $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |::) + |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:states) + |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |cursor) |l $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |assoc) - |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:loading?) - |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |false) - |o $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |->) + |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |state) + |h $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:answer) + |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |@*text) + |l $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:loading?) + |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |false) + |o $ %{} :Expr (:at 1739123944378) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:done?) + |h $ %{} :Leaf (:at 1743535021416) (:by |rJG4IHzWf) (:text |false) + |j $ %{} :Expr (:at 1743535221950) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |d!) + |b $ %{} :Expr (:at 1743535221950) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |::) + |b $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |:states) + |h $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |cursor) + |l $ %{} :Expr (:at 1743535221950) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |->) + |b $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |state) + |h $ %{} :Expr (:at 1743535221950) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |:answer) + |h $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |@*text) + |l $ %{} :Expr (:at 1743535221950) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |:loading?) + |h $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |false) + |o $ %{} :Expr (:at 1743535221950) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |assoc) + |b $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |:done?) + |h $ %{} :Leaf (:at 1743535221950) (:by |rJG4IHzWf) (:text |true) + |comp-abort $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534759425) (:by |rJG4IHzWf) (:text |defn) + |b $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |comp-abort) + |e $ %{} :Expr (:at 1743534761617) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534797551) (:by |rJG4IHzWf) (:text |t) + |h $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |span) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |{}) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |:class-name) + |b $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |css/font-fancy) + |h $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |:inner-text) + |b $ %{} :Expr (:at 1743534799531) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743534801171) (:by |rJG4IHzWf) (:text |or) + |L $ %{} :Leaf (:at 1743534802057) (:by |rJG4IHzWf) (:text |t) + |T $ %{} :Leaf (:at 1743534766739) (:by |rJG4IHzWf) (:text "|\"✕") + |l $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |:on-click) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |fn) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |e) + |b $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |d!) + |h $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |if-let) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |abort) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |deref) + |b $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |*abort-control) + |h $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |do) + |b $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |assoc) - |b $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |:done?) - |h $ %{} :Leaf (:at 1739123944378) (:by |rJG4IHzWf) (:text |true) + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |js/console.warn) + |b $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text "|\"Aborting prev") + |h $ %{} :Expr (:at 1743534755260) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |.!abort) + |b $ %{} :Leaf (:at 1743534755260) (:by |rJG4IHzWf) (:text |abort) |comp-container $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1499755354983) (:by nil) :data $ {} @@ -1724,18 +1811,17 @@ |b $ %{} :Expr (:at 1722445823902) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1722445823902) (:by |rJG4IHzWf) (:text |{}) - |h $ %{} :Expr (:at 1722445823902) (:by |rJG4IHzWf) + |h $ %{} :Expr (:at 1743534815013) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1722445823902) (:by |rJG4IHzWf) (:text |<>) - |b $ %{} :Expr (:at 1738811417781) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1743534817391) (:by |rJG4IHzWf) (:text |comp-abort) + |b $ %{} :Expr (:at 1743534818469) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1738811418549) (:by |rJG4IHzWf) (:text |str) - |L $ %{} :Expr (:at 1738811423911) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1743534818469) (:by |rJG4IHzWf) (:text |str) + |b $ %{} :Expr (:at 1743534818469) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1738811429307) (:by |rJG4IHzWf) (:text |turn-str) - |T $ %{} :Leaf (:at 1738811419675) (:by |rJG4IHzWf) (:text |model) - |T $ %{} :Leaf (:at 1738811437544) (:by |rJG4IHzWf) (:text "|\" loading...") - |h $ %{} :Leaf (:at 1722445823902) (:by |rJG4IHzWf) (:text |css/font-fancy) + |T $ %{} :Leaf (:at 1743534818469) (:by |rJG4IHzWf) (:text |turn-str) + |b $ %{} :Leaf (:at 1743534818469) (:by |rJG4IHzWf) (:text |model) + |h $ %{} :Leaf (:at 1743534818469) (:by |rJG4IHzWf) (:text "|\" loading... ✕") |l $ %{} :Expr (:at 1722445823902) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1722445823902) (:by |rJG4IHzWf) (:text |if) @@ -1889,21 +1975,17 @@ :data $ {} |T $ %{} :Leaf (:at 1734771434966) (:by |rJG4IHzWf) (:text |:class-name) |b $ %{} :Leaf (:at 1734771434966) (:by |rJG4IHzWf) (:text |style-more) - |h $ %{} :Expr (:at 1734771434966) (:by |rJG4IHzWf) + |l $ %{} :Expr (:at 1743534831936) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1734771434966) (:by |rJG4IHzWf) (:text |<>) - |b $ %{} :Expr (:at 1738811481140) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1743534838825) (:by |rJG4IHzWf) (:text |comp-abort) + |h $ %{} :Expr (:at 1743534846789) (:by |rJG4IHzWf) :data $ {} - |D $ %{} :Leaf (:at 1738811481919) (:by |rJG4IHzWf) (:text |str) - |L $ %{} :Expr (:at 1738811482777) (:by |rJG4IHzWf) + |T $ %{} :Leaf (:at 1743534846789) (:by |rJG4IHzWf) (:text |str) + |b $ %{} :Expr (:at 1743534846789) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1738811482777) (:by |rJG4IHzWf) (:text |turn-str) - |b $ %{} :Leaf (:at 1738811482777) (:by |rJG4IHzWf) (:text |model) - |T $ %{} :Leaf (:at 1738811486711) (:by |rJG4IHzWf) (:text "|\" streaming...") - |h $ %{} :Expr (:at 1734771434966) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1734771434966) (:by |rJG4IHzWf) (:text |str-spaced) - |b $ %{} :Leaf (:at 1734771434966) (:by |rJG4IHzWf) (:text |css/font-fancy) + |T $ %{} :Leaf (:at 1743534846789) (:by |rJG4IHzWf) (:text |turn-str) + |b $ %{} :Leaf (:at 1743534846789) (:by |rJG4IHzWf) (:text |model) + |h $ %{} :Leaf (:at 1743534850226) (:by |rJG4IHzWf) (:text "|\" streaming... ✕") |h $ %{} :Expr (:at 1735371460982) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1735371460982) (:by |rJG4IHzWf) (:text |if) diff --git a/compact.cirru b/compact.cirru index 9e3606e..5e93192 100644 --- a/compact.cirru +++ b/compact.cirru @@ -186,7 +186,7 @@ content $ .replace prompt-text "\"{{selected}}" (or selected "\"<未找到内容>") sdk-result $ js-await (.!generateContentStream model-instance content) *text $ atom "\"" - for-await-stream (.-stream sdk-result) + js-await $ for-await-stream (.-stream sdk-result) fn (? chunk) if (some? chunk) do @@ -194,7 +194,18 @@ d! $ :: :states cursor -> state (assoc :answer @*text) (assoc :loading? false) (assoc :done? false) d! $ :: :states cursor - -> state (assoc :answer @*text) (assoc :loading? false) (assoc :done? true) + -> state (assoc :answer @*text) (assoc :loading? false) (assoc :done? false) + d! $ :: :states cursor + -> state (assoc :answer @*text) (assoc :loading? false) (assoc :done? true) + |comp-abort $ %{} :CodeEntry (:doc |) + :code $ quote + defn comp-abort (t) + span $ {} (:class-name css/font-fancy) + :inner-text $ or t "\"✕" + :on-click $ fn (e d!) + if-let + abort $ deref *abort-control + do (js/console.warn "\"Aborting prev") (.!abort abort) |comp-container $ %{} :CodeEntry (:doc |) :code $ quote defcomp comp-container (reel) @@ -223,9 +234,7 @@ {} $ :class-name (str-spaced style-message-list) if (:loading? state) div ({}) - <> - str (turn-str model) "\" loading..." - , css/font-fancy + comp-abort $ str (turn-str model) "\" loading... ✕" if not $ blank? (:answer state) div ({}) @@ -248,9 +257,7 @@ .show model-plugin d! div {} $ :class-name style-more - <> - str (turn-str model) "\" streaming..." - str-spaced css/font-fancy + comp-abort $ str (turn-str model) "\" streaming... ✕" if (:done? state) div {} $ :class-name (str-spaced css/row-middle) diff --git a/package.json b/package.json index 659207d..c516ea6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "bottom-tip": "^0.1.5", - "vite": "^6.2.3" + "vite": "^6.2.4" }, "scripts": { "build": "yarn vite build --base ./ && rm -rfv extension/dist && cp -vr dist extension/" diff --git a/yarn.lock b/yarn.lock index 2bac5b5..f75d948 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,240 +26,240 @@ resolved "https://registry.yarnpkg.com/@cirru/writer.ts/-/writer.ts-0.1.5.tgz#890d96cd4a69609f1682932dad5d2d467abb327e" integrity sha512-QQVFJAOIdUtVJZwT23THZOzumSDXCLMQ0yFz5DzIGlWGXPNBuB7BwUvGtRuiQrzM2XV7ALOWmNsVC7vEOjObQQ== -"@esbuild/aix-ppc64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz#c33cf6bbee34975626b01b80451cbb72b4c6c91d" - integrity sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ== - -"@esbuild/android-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz#ea766015c7d2655164f22100d33d7f0308a28d6d" - integrity sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA== - -"@esbuild/android-arm@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.1.tgz#e84d2bf2fe2e6177a0facda3a575b2139fd3cb9c" - integrity sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q== - -"@esbuild/android-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.1.tgz#58337bee3bc6d78d10425e5500bd11370cfdfbed" - integrity sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw== - -"@esbuild/darwin-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz#a46805c1c585d451aa83be72500bd6e8495dd591" - integrity sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ== - -"@esbuild/darwin-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz#0643e003bb238c63fc93ddbee7d26a003be3cd98" - integrity sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA== - -"@esbuild/freebsd-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz#cff18da5469c09986b93e87979de5d6872fe8f8e" - integrity sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A== - -"@esbuild/freebsd-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz#362fc09c2de14987621c1878af19203c46365dde" - integrity sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww== - -"@esbuild/linux-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz#aa90d5b02efc97a271e124e6d1cea490634f7498" - integrity sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ== - -"@esbuild/linux-arm@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz#dfcefcbac60a20918b19569b4b657844d39db35a" - integrity sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ== - -"@esbuild/linux-ia32@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz#6f9527077ccb7953ed2af02e013d4bac69f13754" - integrity sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ== - -"@esbuild/linux-loong64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz#287d2412a5456e5860c2839d42a4b51284d1697c" - integrity sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg== - -"@esbuild/linux-mips64el@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz#530574b9e1bc5d20f7a4f44c5f045e26f3783d57" - integrity sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg== - -"@esbuild/linux-ppc64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz#5d7e6b283a0b321ea42c6bc0abeb9eb99c1f5589" - integrity sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg== - -"@esbuild/linux-riscv64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz#14fa0cd073c26b4ee2465d18cd1e18eea7859fa8" - integrity sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ== - -"@esbuild/linux-s390x@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz#e677b4b9d1b384098752266ccaa0d52a420dc1aa" - integrity sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ== - -"@esbuild/linux-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz#f1c796b78fff5ce393658313e8c58613198d9954" - integrity sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA== - -"@esbuild/netbsd-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz#0d280b7dfe3973f111b02d5fe9f3063b92796d29" - integrity sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g== - -"@esbuild/netbsd-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz#be663893931a4bb3f3a009c5cc24fa9681cc71c0" - integrity sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA== - -"@esbuild/openbsd-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz#d9021b884233673a05dc1cc26de0bf325d824217" - integrity sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg== - -"@esbuild/openbsd-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz#9f1dc1786ed2e2938c404b06bcc48be9a13250de" - integrity sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw== - -"@esbuild/sunos-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz#89aac24a4b4115959b3f790192cf130396696c27" - integrity sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg== - -"@esbuild/win32-arm64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz#354358647a6ea98ea6d243bf48bdd7a434999582" - integrity sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ== - -"@esbuild/win32-ia32@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz#8cea7340f2647eba951a041dc95651e3908cd4cb" - integrity sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A== - -"@esbuild/win32-x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz#7d79922cb2d88f9048f06393dbf62d2e4accb584" - integrity sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg== +"@esbuild/aix-ppc64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz#b87036f644f572efb2b3c75746c97d1d2d87ace8" + integrity sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag== + +"@esbuild/android-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz#5ca7dc20a18f18960ad8d5e6ef5cf7b0a256e196" + integrity sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w== + +"@esbuild/android-arm@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.2.tgz#3c49f607b7082cde70c6ce0c011c362c57a194ee" + integrity sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA== + +"@esbuild/android-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.2.tgz#8a00147780016aff59e04f1036e7cb1b683859e2" + integrity sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg== + +"@esbuild/darwin-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz#486efe7599a8d90a27780f2bb0318d9a85c6c423" + integrity sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA== + +"@esbuild/darwin-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz#95ee222aacf668c7a4f3d7ee87b3240a51baf374" + integrity sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA== + +"@esbuild/freebsd-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz#67efceda8554b6fc6a43476feba068fb37fa2ef6" + integrity sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w== + +"@esbuild/freebsd-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz#88a9d7ecdd3adadbfe5227c2122d24816959b809" + integrity sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ== + +"@esbuild/linux-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz#87be1099b2bbe61282333b084737d46bc8308058" + integrity sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g== + +"@esbuild/linux-arm@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz#72a285b0fe64496e191fcad222185d7bf9f816f6" + integrity sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g== + +"@esbuild/linux-ia32@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz#337a87a4c4dd48a832baed5cbb022be20809d737" + integrity sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ== + +"@esbuild/linux-loong64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz#1b81aa77103d6b8a8cfa7c094ed3d25c7579ba2a" + integrity sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w== + +"@esbuild/linux-mips64el@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz#afbe380b6992e7459bf7c2c3b9556633b2e47f30" + integrity sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q== + +"@esbuild/linux-ppc64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz#6bf8695cab8a2b135cca1aa555226dc932d52067" + integrity sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g== + +"@esbuild/linux-riscv64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz#43c2d67a1a39199fb06ba978aebb44992d7becc3" + integrity sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw== + +"@esbuild/linux-s390x@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz#419e25737ec815c6dce2cd20d026e347cbb7a602" + integrity sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q== + +"@esbuild/linux-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz#22451f6edbba84abe754a8cbd8528ff6e28d9bcb" + integrity sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg== + +"@esbuild/netbsd-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz#744affd3b8d8236b08c5210d828b0698a62c58ac" + integrity sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw== + +"@esbuild/netbsd-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz#dbbe7521fd6d7352f34328d676af923fc0f8a78f" + integrity sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg== + +"@esbuild/openbsd-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz#f9caf987e3e0570500832b487ce3039ca648ce9f" + integrity sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg== + +"@esbuild/openbsd-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz#d2bb6a0f8ffea7b394bb43dfccbb07cabd89f768" + integrity sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw== + +"@esbuild/sunos-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz#49b437ed63fe333b92137b7a0c65a65852031afb" + integrity sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA== + +"@esbuild/win32-arm64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz#081424168463c7d6c7fb78f631aede0c104373cf" + integrity sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q== + +"@esbuild/win32-ia32@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz#3f9e87143ddd003133d21384944a6c6cadf9693f" + integrity sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg== + +"@esbuild/win32-x64@0.25.2": + version "0.25.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz#839f72c2decd378f86b8f525e1979a97b920c67d" + integrity sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA== "@google/generative-ai@^0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@google/generative-ai/-/generative-ai-0.24.0.tgz#4d27af7d944c924a27a593c17ad1336535d53846" integrity sha512-fnEITCGEB7NdX0BhoYZ/cq/7WPZ1QS5IzJJfC3Tg/OwkvBetMiVJciyaan297OvE4B9Jg1xvo0zIazX/9sGu1Q== -"@rollup/rollup-android-arm-eabi@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.37.0.tgz#9bedc746a97fe707154086365f269ced92ff4aa9" - integrity sha512-l7StVw6WAa8l3vA1ov80jyetOAEo1FtHvZDbzXDO/02Sq/QVvqlHkYoFwDJPIMj0GKiistsBudfx5tGFnwYWDQ== - -"@rollup/rollup-android-arm64@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.37.0.tgz#6edc6ffc8af8773e4bc28c72894dd5e846b8ee6c" - integrity sha512-6U3SlVyMxezt8Y+/iEBcbp945uZjJwjZimu76xoG7tO1av9VO691z8PkhzQ85ith2I8R2RddEPeSfcbyPfD4hA== - -"@rollup/rollup-darwin-arm64@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.37.0.tgz#737a7b8be9ff79bd24a7efaae0903e8c66ac0676" - integrity sha512-+iTQ5YHuGmPt10NTzEyMPbayiNTcOZDWsbxZYR1ZnmLnZxG17ivrPSWFO9j6GalY0+gV3Jtwrrs12DBscxnlYA== - -"@rollup/rollup-darwin-x64@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.37.0.tgz#a6a697bb685ca9462a7caeea5f22f6a686acff1f" - integrity sha512-m8W2UbxLDcmRKVjgl5J/k4B8d7qX2EcJve3Sut7YGrQoPtCIQGPH5AMzuFvYRWZi0FVS0zEY4c8uttPfX6bwYQ== - -"@rollup/rollup-freebsd-arm64@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.37.0.tgz#18113e8e133ccb6de4b9dc9d3e09f7acff344cb7" - integrity sha512-FOMXGmH15OmtQWEt174v9P1JqqhlgYge/bUjIbiVD1nI1NeJ30HYT9SJlZMqdo1uQFyt9cz748F1BHghWaDnVA== - -"@rollup/rollup-freebsd-x64@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.37.0.tgz#5e56ffd4a0d7ccfcbc86867c40b8f0e6a2c0c81e" - integrity sha512-SZMxNttjPKvV14Hjck5t70xS3l63sbVwl98g3FlVVx2YIDmfUIy29jQrsw06ewEYQ8lQSuY9mpAPlmgRD2iSsA== - -"@rollup/rollup-linux-arm-gnueabihf@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.37.0.tgz#5addf1a51e1495ae7ff28d26442a88adf629c980" - integrity sha512-hhAALKJPidCwZcj+g+iN+38SIOkhK2a9bqtJR+EtyxrKKSt1ynCBeqrQy31z0oWU6thRZzdx53hVgEbRkuI19w== - -"@rollup/rollup-linux-arm-musleabihf@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.37.0.tgz#00cddb9ab51086c5f2cd33cd4738259e24be4e73" - integrity sha512-jUb/kmn/Gd8epbHKEqkRAxq5c2EwRt0DqhSGWjPFxLeFvldFdHQs/n8lQ9x85oAeVb6bHcS8irhTJX2FCOd8Ag== - -"@rollup/rollup-linux-arm64-gnu@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.37.0.tgz#c3b4324496236b6fd9f31fda5701c6d6060b1512" - integrity sha512-oNrJxcQT9IcbcmKlkF+Yz2tmOxZgG9D9GRq+1OE6XCQwCVwxixYAa38Z8qqPzQvzt1FCfmrHX03E0pWoXm1DqA== - -"@rollup/rollup-linux-arm64-musl@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.37.0.tgz#b5222180bb1a50e6e9bc8263efd771c1ce770b6f" - integrity sha512-pfxLBMls+28Ey2enpX3JvjEjaJMBX5XlPCZNGxj4kdJyHduPBXtxYeb8alo0a7bqOoWZW2uKynhHxF/MWoHaGQ== - -"@rollup/rollup-linux-loongarch64-gnu@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.37.0.tgz#5660181c1c1efb7b19c7a531d496e685236c5ce7" - integrity sha512-yCE0NnutTC/7IGUq/PUHmoeZbIwq3KRh02e9SfFh7Vmc1Z7atuJRYWhRME5fKgT8aS20mwi1RyChA23qSyRGpA== - -"@rollup/rollup-linux-powerpc64le-gnu@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.37.0.tgz#8273166495d2f5d3fbc556cf42a5a6e24b78bdab" - integrity sha512-NxcICptHk06E2Lh3a4Pu+2PEdZ6ahNHuK7o6Np9zcWkrBMuv21j10SQDJW3C9Yf/A/P7cutWoC/DptNLVsZ0VQ== - -"@rollup/rollup-linux-riscv64-gnu@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.37.0.tgz#9677e39288ccc91ebcd707cdd794732d701cd174" - integrity sha512-PpWwHMPCVpFZLTfLq7EWJWvrmEuLdGn1GMYcm5MV7PaRgwCEYJAwiN94uBuZev0/J/hFIIJCsYw4nLmXA9J7Pw== - -"@rollup/rollup-linux-riscv64-musl@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.37.0.tgz#71cc5ca7be1ed263357618bfe4f8f50c09725a7e" - integrity sha512-DTNwl6a3CfhGTAOYZ4KtYbdS8b+275LSLqJVJIrPa5/JuIufWWZ/QFvkxp52gpmguN95eujrM68ZG+zVxa8zHA== - -"@rollup/rollup-linux-s390x-gnu@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.37.0.tgz#6b0b7df33eb32b0ee7423898b183acc1b5fee33e" - integrity sha512-hZDDU5fgWvDdHFuExN1gBOhCuzo/8TMpidfOR+1cPZJflcEzXdCy1LjnklQdW8/Et9sryOPJAKAQRw8Jq7Tg+A== - -"@rollup/rollup-linux-x64-gnu@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.37.0.tgz#52c27717d3c4819d13b5ebc2373ddea099d2e71b" - integrity sha512-pKivGpgJM5g8dwj0ywBwe/HeVAUSuVVJhUTa/URXjxvoyTT/AxsLTAbkHkDHG7qQxLoW2s3apEIl26uUe08LVQ== - -"@rollup/rollup-linux-x64-musl@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.37.0.tgz#c134a22d30642345de8b799c816345674bf68019" - integrity sha512-E2lPrLKE8sQbY/2bEkVTGDEk4/49UYRVWgj90MY8yPjpnGBQ+Xi1Qnr7b7UIWw1NOggdFQFOLZ8+5CzCiz143w== - -"@rollup/rollup-win32-arm64-msvc@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.37.0.tgz#8063d5f8195dd1845e056d069366fbe06a424d09" - integrity sha512-Jm7biMazjNzTU4PrQtr7VS8ibeys9Pn29/1bm4ph7CP2kf21950LgN+BaE2mJ1QujnvOc6p54eWWiVvn05SOBg== - -"@rollup/rollup-win32-ia32-msvc@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.37.0.tgz#891d90e3b5517f9d290bb416afdfe2ebfb12139e" - integrity sha512-e3/1SFm1OjefWICB2Ucstg2dxYDkDTZGDYgwufcbsxTHyqQps1UQf33dFEChBNmeSsTOyrjw2JJq0zbG5GF6RA== - -"@rollup/rollup-win32-x64-msvc@4.37.0": - version "4.37.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.37.0.tgz#a54d7304c3bd45573d8bcd1270de89771f8195fe" - integrity sha512-LWbXUBwn/bcLx2sSsqy7pK5o+Nr+VCoRoAohfJ5C/aBio9nfJmGQqHAhU6pwxV/RmyTk5AqdySma7uwWGlmeuA== - -"@types/estree@1.0.6": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" - integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== +"@rollup/rollup-android-arm-eabi@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.38.0.tgz#6ba67cc0f3a2d7e3a208256a349c2cb2798f57be" + integrity sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg== + +"@rollup/rollup-android-arm64@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.38.0.tgz#c8806f88fd6727d3cf144c4ffb00f40d451b6618" + integrity sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ== + +"@rollup/rollup-darwin-arm64@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.38.0.tgz#c4654989b97bba0de7205cf5b3342984d4451d5a" + integrity sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg== + +"@rollup/rollup-darwin-x64@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.38.0.tgz#77ee357aeeefe3fe8bee33df18c240e391450476" + integrity sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg== + +"@rollup/rollup-freebsd-arm64@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.38.0.tgz#ac8028c99221d1cef22788adda465077d5926911" + integrity sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA== + +"@rollup/rollup-freebsd-x64@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.38.0.tgz#64376ff0e1541cd8677e74898782ec4935277e02" + integrity sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg== + +"@rollup/rollup-linux-arm-gnueabihf@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.38.0.tgz#7de1584c09adcac08f90d1e500c679c428b6eb36" + integrity sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg== + +"@rollup/rollup-linux-arm-musleabihf@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.38.0.tgz#1d5d0f28d93cdc37d60c381c6bbe649bed4960d5" + integrity sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg== + +"@rollup/rollup-linux-arm64-gnu@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.38.0.tgz#a97f73a43a374e44bef4a9ed84899c26454831ea" + integrity sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA== + +"@rollup/rollup-linux-arm64-musl@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.38.0.tgz#00e3b646a7976752052ebc72d005808b9e7f2801" + integrity sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ== + +"@rollup/rollup-linux-loongarch64-gnu@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.38.0.tgz#0d6dcaa3671cf987faace4b34ab7320ee3c18b65" + integrity sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg== + +"@rollup/rollup-linux-powerpc64le-gnu@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.38.0.tgz#54c2d7a4d86767001475f0157c408fd042f7fd8f" + integrity sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw== + +"@rollup/rollup-linux-riscv64-gnu@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.38.0.tgz#8cb565417b29851a0c549614898bdab689f23187" + integrity sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg== + +"@rollup/rollup-linux-riscv64-musl@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz#8bc00b75fd07b15c35a54b41a5f052c01dbf925b" + integrity sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA== + +"@rollup/rollup-linux-s390x-gnu@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.38.0.tgz#1fe4a88b97e36d64dbf1f01cfa7842d269a094cf" + integrity sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q== + +"@rollup/rollup-linux-x64-gnu@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.38.0.tgz#11c32c463e68a86e279cda090a9405a7558f9406" + integrity sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w== + +"@rollup/rollup-linux-x64-musl@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.38.0.tgz#520c2a8547672ec6c56a6833f6d38e9380d63dc7" + integrity sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g== + +"@rollup/rollup-win32-arm64-msvc@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.38.0.tgz#d27ab565009357014c9f2d6393ee58bd63a63cb8" + integrity sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg== + +"@rollup/rollup-win32-ia32-msvc@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.38.0.tgz#6c02847c60fcc7a6d74e00a60f350d079558d84d" + integrity sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA== + +"@rollup/rollup-win32-x64-msvc@4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.38.0.tgz#38197da22c1af7b6b5d1cc7541757379193b8e83" + integrity sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw== + +"@types/estree@1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8" + integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ== asynckit@^0.4.0: version "0.4.0" @@ -374,35 +374,35 @@ es-set-tostringtag@^2.1.0: hasown "^2.0.2" esbuild@^0.25.0: - version "0.25.1" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.1.tgz#a16b8d070b6ad4871935277bda6ccfe852e3fa2f" - integrity sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ== + version "0.25.2" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.2.tgz#55a1d9ebcb3aa2f95e8bba9e900c1a5061bc168b" + integrity sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ== optionalDependencies: - "@esbuild/aix-ppc64" "0.25.1" - "@esbuild/android-arm" "0.25.1" - "@esbuild/android-arm64" "0.25.1" - "@esbuild/android-x64" "0.25.1" - "@esbuild/darwin-arm64" "0.25.1" - "@esbuild/darwin-x64" "0.25.1" - "@esbuild/freebsd-arm64" "0.25.1" - "@esbuild/freebsd-x64" "0.25.1" - "@esbuild/linux-arm" "0.25.1" - "@esbuild/linux-arm64" "0.25.1" - "@esbuild/linux-ia32" "0.25.1" - "@esbuild/linux-loong64" "0.25.1" - "@esbuild/linux-mips64el" "0.25.1" - "@esbuild/linux-ppc64" "0.25.1" - "@esbuild/linux-riscv64" "0.25.1" - "@esbuild/linux-s390x" "0.25.1" - "@esbuild/linux-x64" "0.25.1" - "@esbuild/netbsd-arm64" "0.25.1" - "@esbuild/netbsd-x64" "0.25.1" - "@esbuild/openbsd-arm64" "0.25.1" - "@esbuild/openbsd-x64" "0.25.1" - "@esbuild/sunos-x64" "0.25.1" - "@esbuild/win32-arm64" "0.25.1" - "@esbuild/win32-ia32" "0.25.1" - "@esbuild/win32-x64" "0.25.1" + "@esbuild/aix-ppc64" "0.25.2" + "@esbuild/android-arm" "0.25.2" + "@esbuild/android-arm64" "0.25.2" + "@esbuild/android-x64" "0.25.2" + "@esbuild/darwin-arm64" "0.25.2" + "@esbuild/darwin-x64" "0.25.2" + "@esbuild/freebsd-arm64" "0.25.2" + "@esbuild/freebsd-x64" "0.25.2" + "@esbuild/linux-arm" "0.25.2" + "@esbuild/linux-arm64" "0.25.2" + "@esbuild/linux-ia32" "0.25.2" + "@esbuild/linux-loong64" "0.25.2" + "@esbuild/linux-mips64el" "0.25.2" + "@esbuild/linux-ppc64" "0.25.2" + "@esbuild/linux-riscv64" "0.25.2" + "@esbuild/linux-s390x" "0.25.2" + "@esbuild/linux-x64" "0.25.2" + "@esbuild/netbsd-arm64" "0.25.2" + "@esbuild/netbsd-x64" "0.25.2" + "@esbuild/openbsd-arm64" "0.25.2" + "@esbuild/openbsd-x64" "0.25.2" + "@esbuild/sunos-x64" "0.25.2" + "@esbuild/win32-arm64" "0.25.2" + "@esbuild/win32-ia32" "0.25.2" + "@esbuild/win32-x64" "0.25.2" ev-store@^7.0.0: version "7.0.0" @@ -566,32 +566,32 @@ proxy-from-env@^1.1.0: integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== rollup@^4.30.1: - version "4.37.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.37.0.tgz#e4172f8bdb6ea7df08a1b0acf99abeccb2250378" - integrity sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg== + version "4.38.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.38.0.tgz#e1ef4939aef0e1295f750ae4f73d1c8b7fc3abb8" + integrity sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw== dependencies: - "@types/estree" "1.0.6" + "@types/estree" "1.0.7" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.37.0" - "@rollup/rollup-android-arm64" "4.37.0" - "@rollup/rollup-darwin-arm64" "4.37.0" - "@rollup/rollup-darwin-x64" "4.37.0" - "@rollup/rollup-freebsd-arm64" "4.37.0" - "@rollup/rollup-freebsd-x64" "4.37.0" - "@rollup/rollup-linux-arm-gnueabihf" "4.37.0" - "@rollup/rollup-linux-arm-musleabihf" "4.37.0" - "@rollup/rollup-linux-arm64-gnu" "4.37.0" - "@rollup/rollup-linux-arm64-musl" "4.37.0" - "@rollup/rollup-linux-loongarch64-gnu" "4.37.0" - "@rollup/rollup-linux-powerpc64le-gnu" "4.37.0" - "@rollup/rollup-linux-riscv64-gnu" "4.37.0" - "@rollup/rollup-linux-riscv64-musl" "4.37.0" - "@rollup/rollup-linux-s390x-gnu" "4.37.0" - "@rollup/rollup-linux-x64-gnu" "4.37.0" - "@rollup/rollup-linux-x64-musl" "4.37.0" - "@rollup/rollup-win32-arm64-msvc" "4.37.0" - "@rollup/rollup-win32-ia32-msvc" "4.37.0" - "@rollup/rollup-win32-x64-msvc" "4.37.0" + "@rollup/rollup-android-arm-eabi" "4.38.0" + "@rollup/rollup-android-arm64" "4.38.0" + "@rollup/rollup-darwin-arm64" "4.38.0" + "@rollup/rollup-darwin-x64" "4.38.0" + "@rollup/rollup-freebsd-arm64" "4.38.0" + "@rollup/rollup-freebsd-x64" "4.38.0" + "@rollup/rollup-linux-arm-gnueabihf" "4.38.0" + "@rollup/rollup-linux-arm-musleabihf" "4.38.0" + "@rollup/rollup-linux-arm64-gnu" "4.38.0" + "@rollup/rollup-linux-arm64-musl" "4.38.0" + "@rollup/rollup-linux-loongarch64-gnu" "4.38.0" + "@rollup/rollup-linux-powerpc64le-gnu" "4.38.0" + "@rollup/rollup-linux-riscv64-gnu" "4.38.0" + "@rollup/rollup-linux-riscv64-musl" "4.38.0" + "@rollup/rollup-linux-s390x-gnu" "4.38.0" + "@rollup/rollup-linux-x64-gnu" "4.38.0" + "@rollup/rollup-linux-x64-musl" "4.38.0" + "@rollup/rollup-win32-arm64-msvc" "4.38.0" + "@rollup/rollup-win32-ia32-msvc" "4.38.0" + "@rollup/rollup-win32-x64-msvc" "4.38.0" fsevents "~2.3.2" source-map-js@^1.2.1: @@ -618,10 +618,10 @@ virtual-dom@^2.1.1: x-is-array "0.1.0" x-is-string "0.1.0" -vite@^6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.3.tgz#249e92d32886981ab46bc1f049ac72abc6fa81e2" - integrity sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg== +vite@^6.2.4: + version "6.2.4" + resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.4.tgz#05809de3f918fded87f73a838761995a4d66a680" + integrity sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw== dependencies: esbuild "^0.25.0" postcss "^8.5.3" From cb8a5c5aa2670a936ad7ff508031c5d57f73d38c Mon Sep 17 00:00:00 2001 From: tiye Date: Wed, 2 Apr 2025 13:18:42 +0800 Subject: [PATCH 2/2] experiment on json mode --- calcit.cirru | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- compact.cirru | 11 ++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index fb16dab..e100009 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1345,6 +1345,14 @@ |T $ %{} :Leaf (:at 1728103023953) (:by |rJG4IHzWf) (:text |or) |b $ %{} :Leaf (:at 1728103023953) (:by |rJG4IHzWf) (:text |selected) |h $ %{} :Leaf (:at 1728103023953) (:by |rJG4IHzWf) (:text "|\"<未找到内容>") + |c $ %{} :Expr (:at 1743570124154) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743570127202) (:by |rJG4IHzWf) (:text |json?) + |b $ %{} :Expr (:at 1743570128869) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743570131020) (:by |rJG4IHzWf) (:text |.!includes) + |b $ %{} :Leaf (:at 1743570133360) (:by |rJG4IHzWf) (:text |prompt-text) + |h $ %{} :Leaf (:at 1743570137302) (:by |rJG4IHzWf) (:text "|\"{{json}}") |e $ %{} :Expr (:at 1739122590087) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1739122598560) (:by |rJG4IHzWf) (:text |sdk-result) @@ -1355,7 +1363,50 @@ :data $ {} |T $ %{} :Leaf (:at 1739122624236) (:by |rJG4IHzWf) (:text |.!generateContentStream) |X $ %{} :Leaf (:at 1739122622305) (:by |rJG4IHzWf) (:text |model-instance) - |b $ %{} :Leaf (:at 1739122615629) (:by |rJG4IHzWf) (:text |content) + |h $ %{} :Expr (:at 1743570569761) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570571293) (:by |rJG4IHzWf) (:text |js-object) + |L $ %{} :Expr (:at 1743570716113) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743570960395) (:by |rJG4IHzWf) (:text |:contents) + |b $ %{} :Expr (:at 1743570720305) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743570724052) (:by |rJG4IHzWf) (:text |js-array) + |b $ %{} :Expr (:at 1743570911519) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570919060) (:by |rJG4IHzWf) (:text |js-object) + |L $ %{} :Expr (:at 1743570950546) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743570954455) (:by |rJG4IHzWf) (:text |:role) + |b $ %{} :Leaf (:at 1743570956631) (:by |rJG4IHzWf) (:text "|\"user") + |T $ %{} :Expr (:at 1743570921655) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570926621) (:by |rJG4IHzWf) (:text |:parts) + |T $ %{} :Expr (:at 1743570929250) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570930891) (:by |rJG4IHzWf) (:text |js-array) + |T $ %{} :Expr (:at 1743570931689) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570939010) (:by |rJG4IHzWf) (:text |js-object) + |T $ %{} :Expr (:at 1743570932972) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570936790) (:by |rJG4IHzWf) (:text |:text) + |T $ %{} :Leaf (:at 1743570725620) (:by |rJG4IHzWf) (:text |content) + |T $ %{} :Expr (:at 1743570572549) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570961799) (:by |rJG4IHzWf) (:text |:generationConfig) + |T $ %{} :Expr (:at 1743570795283) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570796715) (:by |rJG4IHzWf) (:text |if) + |L $ %{} :Leaf (:at 1743570797891) (:by |rJG4IHzWf) (:text |json?) + |T $ %{} :Expr (:at 1743570590476) (:by |rJG4IHzWf) + :data $ {} + |D $ %{} :Leaf (:at 1743570592225) (:by |rJG4IHzWf) (:text |js-object) + |T $ %{} :Expr (:at 1743570589704) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1743570589704) (:by |rJG4IHzWf) (:text "|\"responseMimeType") + |b $ %{} :Leaf (:at 1743570589704) (:by |rJG4IHzWf) (:text "|\"application/json") + |b $ %{} :Leaf (:at 1743570801709) (:by |rJG4IHzWf) (:text |js/undefined) |q $ %{} :Expr (:at 1728103023953) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1728103023953) (:by |rJG4IHzWf) (:text |*text) diff --git a/compact.cirru b/compact.cirru index 5e93192..1be11fb 100644 --- a/compact.cirru +++ b/compact.cirru @@ -184,7 +184,16 @@ reset! *abort-control abort .-signal abort content $ .replace prompt-text "\"{{selected}}" (or selected "\"<未找到内容>") - sdk-result $ js-await (.!generateContentStream model-instance content) + json? $ .!includes prompt-text "\"{{json}}" + sdk-result $ js-await + .!generateContentStream model-instance $ js-object + :contents $ js-array + js-object (:role "\"user") + :parts $ js-array + js-object $ :text content + :generationConfig $ if json? + js-object $ "\"responseMimeType" "\"application/json" + , js/undefined *text $ atom "\"" js-await $ for-await-stream (.-stream sdk-result) fn (? chunk)