From 277b4cd3c08670335e0dcb1714d85f254a0e7661 Mon Sep 17 00:00:00 2001 From: tiye Date: Sun, 8 Nov 2026 04:07:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=20Calcit=200.37?= =?UTF-8?q?.0=20=E5=B9=B6=E6=94=B6=E7=B4=A7=E7=BC=96=E8=BE=91=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calcit.cirru | 24 +++++++++++++----------- deps.cirru | 8 ++++---- package.json | 2 +- yarn.lock | 10 +++++----- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index fe3c0bb..d54634d 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -6,7 +6,7 @@ {} (:description |) (:init-fn 'app.main/main!) (:mode :js) (:reload-fn 'app.main/reload!) (:target :browser) :feature-policy $ {} :modules $ [] |respo.calcit/ |respo-ui.calcit/ |reel.calcit/ |js-ffi/ - :type-slots $ {} $ :dispatch-op |app.schema/DispatchOp + :type-slots $ {} $ :dispatch-op 'app.schema/DispatchOp :files $ {} 'app.comp.container $ %{} 'FileEntry :defs $ {} $ 'comp-container @@ -22,14 +22,16 @@ try-decode-map-as value $ List respo.schema/CoordKey (:ok checked) checked (:err _) (raise "|Expected List cursor") - state $ or - .unwrap-or (get states :data) nil - {} $ :content | - content $ .unwrap-or - get + state $ match (get states :data) + (:some value) + or value $ {} $ :content | + (:none) + {} $ :content | + content $ .unwrap $ get + &merge + {} $ :content nil if (struct? state) (&struct:to-map state) (decode-map-as state 'Map) - , :content - , nil + , :content div {} $ :class-name $ str-spaced css/global css/row textarea $ {} (:value content) (:placeholder |Content) @@ -37,7 +39,7 @@ :style $ {} $ :height |320px :on-input $ fn (e d!) hint-fn $ Fn respo.schema/RespoEvent - Fn AnyEnum $ -> Unit + Fn app.schema/Op $ -> Unit -> Unit d! $ schema/Op :states cursor $ assoc state :content (event-value e) space-x 8 @@ -48,7 +50,7 @@ button $ {} (:class-name css/button) (:inner-text |Run) :on-click $ fn (e d!) hint-fn $ Fn respo.schema/RespoEvent - Fn AnyEnum $ -> Unit + Fn app.schema/Op $ -> Unit -> Unit println content if dev? @@ -160,7 +162,7 @@ :code $ quote $ defn render-app! () with-memo-frame $ fn () $ render! mount-target (comp-container @*reel) fn (op) - hint-fn $ Fn Dynamic $ -> Unit + hint-fn $ Fn AnyEnum $ -> Unit if (enum? op) (dispatch! op) (raise "|Expected Markup operation Enum") :examples $ [] :schema $ quote $ Fn (-> Unit) (:features :js-ffi) diff --git a/deps.cirru b/deps.cirru index 6b7858d..bb608eb 100644 --- a/deps.cirru +++ b/deps.cirru @@ -1,7 +1,7 @@ -{} (:calcit-version |0.35.1) +{} (:calcit-version |0.37.0) :version |0.0.5 - :dependencies $ {} (|Respo/reel.calcit |0.9.2) - |Respo/respo-ui.calcit |0.15.1 - |Respo/respo.calcit |0.19.4 + :dependencies $ {} (|Respo/reel.calcit |0.10.0) + |Respo/respo-ui.calcit |0.15.2 + |Respo/respo.calcit |0.19.5 |calcit-lang/js-ffi |0.2.13 diff --git a/package.json b/package.json index 3213ae4..f97596f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "packageManager": "yarn@4.18.0", "dependencies": { - "@calcit/procs": "0.35.1" + "@calcit/procs": "0.37.0" }, "devDependencies": { "bottom-tip": "^0.1.5", diff --git a/yarn.lock b/yarn.lock index 6471e07..ba23b81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,15 +12,15 @@ __metadata: languageName: node linkType: hard -"@calcit/procs@npm:0.35.1": - version: 0.35.1 - resolution: "@calcit/procs@npm:0.35.1" +"@calcit/procs@npm:0.37.0": + version: 0.37.0 + resolution: "@calcit/procs@npm:0.37.0" dependencies: "@calcit/finger-vec": "npm:0.1.1" "@calcit/ternary-tree": "npm:0.0.26" "@cirru/parser.ts": "npm:0.0.10" "@cirru/writer.ts": "npm:^0.1.9" - checksum: 10c0/c39ab807cdda677cfd9fa9f6ae8adbb468347d5dd85ac38355a27a048cc9a1b7301d4f9c73f3bbf815269ecc7a59d824f61c8c46a9d56ae6a67f3b5cb21be3de + checksum: 10c0/38efd6a08b096419d41aa1d502a573ecbb415867caa18ee69142010e5d6c285f36f47d4e4334c33eff15617b1eff980f29662176422acb1bbf4fac5fdca83178 languageName: node linkType: hard @@ -637,7 +637,7 @@ __metadata: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@calcit/procs": "npm:0.35.1" + "@calcit/procs": "npm:0.37.0" bottom-tip: "npm:^0.1.5" vite: "npm:8.3.3" languageName: unknown From a533bed052a2f91fb7643667d2a123d11a874752 Mon Sep 17 00:00:00 2001 From: tiye Date: Sun, 8 Nov 2026 04:11:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BD=93=E5=89=8D=20Calc?= =?UTF-8?q?it=20=E5=92=8C=E6=AD=A3=E5=BC=8F=E4=BE=9D=E8=B5=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 30237f9..43d62bd 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Demo http://repo.respo-mvc.org/markup/ . ### Usages -本次候选 **0.0.5** 配对正式 Calcit / `@calcit/procs` **0.35.1**。 +本次候选 **0.0.5** 配对正式 Calcit / `@calcit/procs` **0.37.0**。 消费者需重新安装完整依赖图、生成 JS 并完整刷新页面。Content 输入、Run、Reel 调试工具、 存档 key 和格式保持；Demo 不新增 Markdown 解析功能。UI/Reel 跨 minor 升级可能有样式差异。 0.0.5 尚未发布，正式 tag 出现前不要将本分支当作已发布依赖。 -依赖使用已发布的 Respo **0.19.4**、UI **0.15.1**、Reel **0.9.2**、JS-FFI **0.2.13**， -传递 Router **0.12.1**；不再使用 Reel / Router 的旧 alpha 图。 +依赖使用已发布的 Respo **0.19.5**、UI **0.15.2**、Reel **0.10.0**、JS-FFI **0.2.13**， +传递 Router **0.12.2**；不再使用 Reel / Router 的旧 alpha 图。 两个 DOM 回调使用真实 RespoEvent 和单 Enum dispatch，输入值由公开 `event-value` 检查为 String。 原 Reel 的 `read-field` 已删除；此处直接读取数据，保留 Map/Struct 字段读取及缺失值语义。 两个间隔分别保持 8 / 8px，开发态子节点显式使用 Option。