Skip to content

保留样式 union 并迁移到 Calcit 0.34.2 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiye merged 1 commit into from
Nov 3, 2026
Merged

保留样式 union 并迁移到 Calcit 0.34.2 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,30 @@ _TODO_

### 使用者影响

CLI / `@calcit/procs` 配对正式 **0.32.1**，升级后重新安装完整依赖图、生成JS并
完整刷新。使用已发布UI **0.9.0**、Respo **0.17.1**、JS-FFI **0.2.9** 和Reel
**0.7.0-alpha.5**；传递Router仍有alpha，不宣称整图全部稳定，不使用本地候选或hash。
CLI / `@calcit/procs` 配对正式 **0.34.2**；升级后重新安装完整依赖图、生成 JS 并刷新页面。
使用已发布 UI **0.12.1**、Respo **0.18.1**、JS-FFI **0.2.9**、Reel **0.8.1**，
传递 Router **0.10.1**，整图使用正式 tag。

官方工具转换五处旧类型标注，19个定义schema保持。Run转换、两处文本输入、400ms
按钮反馈、旧存档恢复和HUD不变。Store.data仍接受原任意数据，嵌套UI状态允许异构key；
恢复时检查字段并重建本地Store，成功后才注册自动保存，坏存档中止启动且不覆盖原文。
Copy仍只接受ToString标量，不把集合改为调试文本后复制。
按钮样式现在直接保留 UI 的 `StyleValue` union（String / Number / Tag），删除一处
`Map Tag Dynamic` 强转。编译器确认合并后的样式为 `Map Tag StyleValue`，不再抹掉值类型。
开发环境 Reel 面板的可选子节点改为显式 Option，页面显示条件保持原样。

保留原完整strict、全定义/公开合同、原质量基线、两项附带测试和六项JS回归，不新增
脚本、预算或强转。真实Caps strict/toolchain、上述门禁、构建和immutable安装通过。
整合已有Dependabot兼容补丁：Vite **8.3.3**、undici **8.12.3**、source-map-js **1.2.2**；
一小时npm发布等待保持，无单包例外。忽略本机.calcit缓存，不提交生成JS或模块链接。
Run 转换、两处文本输入、400ms 按钮反馈、旧存档恢复和 HUD 保持。Store.data 仍接受
原任意数据，嵌套 UI 状态允许异构 key；恢复成功后才启用自动保存，坏存档保护保持。
Copy 仍只接受 ToString 标量。本次没有缩窄这些真实数据入口，也没有修改质量基线。

此前0.32.0候选已验收Run将 `[] 1 2` 转为 `(1 2)` 及刷新恢复，本次未重跑浏览器，
未点Copy或操作真实存档。本PR不合并、部署或发版；现有Dependabot PR暂保留。
本地全部 **199** 个定义、完整 strict、原质量门禁、原 **2** 项附带测试、原 **6** 项
JS 回归及构建通过，Caps strict/toolchain 和 immutable 安装通过。与规范化后的原源码
逐定义对照，仅按钮样式和可选开发面板两处代码变化，其他 schema 和附带测试保持。
整合 Dependabot #22 的 undici **8.12.3** 锁文件补丁；原 Vite **8.3.3** 和 npm 发布
等待策略保持。不增加检查脚本，不提交生成 JS 或模块缓存。

此前 0.32.0 候选已验收 Run 将 `[] 1 2` 转为 `(1 2)` 及刷新恢复；本次尚未重跑浏览器，
未点击 Copy 或操作真实存档。本 PR 不合并、部署生产或发版；#22 暂保留以协调合并。

### 开发

使用Node24、Yarn4.18.0、Caps0.1.1和配对Calcit0.32.1：
使用Node24、Yarn4.18.0、Caps0.1.1和配对 Calcit 0.34.2：

```sh
caps --strict --ci
Expand Down
35 changes: 18 additions & 17 deletions calcit.cirru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@
cursor $ decode-map-as
get states :cursor
, .unwrap-or $ []
:: 'List 'Dynamic
quote $ List Dynamic
state $
get states :data
, .unwrap-or $ {} (:darken? false)
button $ {}
:style $ merge ui/button $ assert-type
if
get state :darken?
, .unwrap-or false
{} $ :background-color $ hsl 0 0 94
{}
quote $ Map Tag Dynamic
:style $ merge ui/button $ if
get state :darken?
, .unwrap-or false
{} $ :background-color $ hsl 0 0 94
{}
:inner-text text
:on-click $ fn (e d!)
hint-fn $ Fn (Map Tag Dynamic)
Expand Down Expand Up @@ -92,7 +90,9 @@
d! $ Op :data $
get e :value
, .unwrap-or |
when dev? $ comp-reel (>> states :reel) reel $ {}
if dev?
Option :some $ comp-reel (>> states :reel) reel $ {}
Option :none
:examples $ []
:schema $ quote $ Fn (Map Tag Dynamic) (-> respo.schema/Component)
'scalar-copy-text $ %{} 'CodeEntry (:doc |)
Expand Down Expand Up @@ -216,7 +216,8 @@
if (nil? build-errors)
do (remove-watch! *reel :changes) (clear-cache!)
add-watch! *reel :changes $ fn (reel prev) (render-app!)
reset! *reel $ decode-map-as (refresh-reel @*reel schema/store updater) (:: 'Map 'Tag 'Dynamic)
reset! *reel $ decode-map-as (refresh-reel @*reel schema/store updater)
quote $ Map Tag Dynamic
hud! |ok~ |Ok
hud! |error build-errors
, &unit
Expand Down Expand Up @@ -249,17 +250,17 @@
:code $ quote $ defenum Op
:states
quote $ List Dynamic
, 'Dynamic
:content 'String
:data 'Dynamic
:hydrate-storage 'app.schema/Store
, Dynamic
:content String
:data Dynamic
:hydrate-storage app.schema/Store
:examples $ []
:schema $ quote EnumDef
'Store $ %{} 'CodeEntry (:doc |)
:code $ quote $ defstruct Store
:states $ quote $ Map Dynamic Dynamic
:content 'String
:data 'Dynamic
:content String
:data Dynamic
:examples $ []
:schema $ quote StructDef
'restore-store $ %{} 'CodeEntry (:doc |)
Expand Down Expand Up @@ -316,7 +317,7 @@
(:states cursor s)
assoc store :states $ decode-map-as
respo.cursor/update-state-tree (:states store) cursor s
:: 'Map 'Dynamic 'Dynamic
quote $ Map Dynamic Dynamic
(:content data) (assoc store :content data)
(:data data) (assoc store :data data)
(:hydrate-storage data) data
Expand Down
8 changes: 4 additions & 4 deletions deps.cirru
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{} (:calcit-version |0.32.1)
{} (:calcit-version |0.34.2)
:version |0.1.0
:dependencies $ {} (|Respo/reel.calcit |0.7.0-alpha.5)
|Respo/respo-ui.calcit |0.9.0
|Respo/respo.calcit |0.17.1
:dependencies $ {} (|Respo/reel.calcit |0.8.1)
|Respo/respo-ui.calcit |0.12.1
|Respo/respo.calcit |0.18.1
|calcit-lang/js-ffi |0.2.9
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"vite": "8.3.3"
},
"dependencies": {
"@calcit/procs": "0.32.1",
"@calcit/procs": "0.34.2",
"copy-text-to-clipboard": "^3.1.0",
"feather-icons": "^4.29.0",
"shortid": "^2.2.16"
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.