Skip to content

升级 Timegrass Viewer 到 Calcit 0.37.0 并收紧编辑和回放类型 #16

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 8, 2026
Merged

升级 Timegrass Viewer 到 Calcit 0.37.0 并收紧编辑和回放类型 #16

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
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Timegrass Viewer

### 使用者需要注意

开发工具链配对正式 **Calcit CLI / @calcit/procs 0.35.1**，请重新安装完整模块图、生成 JS 并刷新。
直接依赖使用已发布正式 Reel 0.9.2、UI 0.15.1、Respo 0.19.4、JS-FFI 0.2.13，
传递 Router 0.12.1。UI 升级可能影响细节样式，不承诺逐像素一致。
开发工具链配对正式 **Calcit CLI / @calcit/procs 0.37.0**，请重新安装完整模块图、生成 JS 并刷新。
直接依赖使用已发布正式 Reel 0.10.0、UI 0.15.2、Respo 0.19.5、JS-FFI 0.2.13，
传递 Router 0.12.2。UI 升级可能影响细节样式，不承诺逐像素一致。
其他 npm 版本保持，安装隔离期为一小时。

输入回调使用 RespoEvent，派发接收 AnyEnum。可选列表和错误提示使用 Option，状态路径按 CoordKey union 校验。原存档仍为 Map。
输入回调使用 RespoEvent，编辑状态用具名 EditorState，可选结果与错误使用 Option。应用操作与回放用 `Op | reel.typed/Control` 区分，状态路径按 CoordKey 校验。保存时写入原有 Map 格式。

日期算法、EDN 原文、Map 存档、恢复失败保护与保存时机保持；不读取真实数据，不合并或部署应用。
保留原完整 strict、全部定义、弃用调用零门禁、3 项 native unit 和 7 项 JS 业务回归。
保留原完整 strict、全部定义、弃用调用零门禁、3 项 native unit 和 8 项 JS 业务回归。
不增加验证脚本、预算、强转、compat 开关或 concurrently。

### Usage
Expand Down Expand Up @@ -63,7 +63,7 @@ The workflow uploads only built frontend assets from `dist/` to COS under `Memki
使用正式 COS action v1.2.0 内置生成 HTML 资源引用及公开字节/SHA-256 校验，不新增 CDN 验证脚本或测试。PR 构建路径按 PR/run/attempt 隔离，仅 upload job 按 PR/production 排队；保持原 tested artifact 下载、重跑复用、过期部署保护和 secret 策略。

默认入口为浏览器 JS；CI 检查所有定义、完整 strict workflow
和 deprecated-call 清零，保留原有 3 项 native unit 和 7 项业务回归。
和 deprecated-call 清零，保留原有 3 项 native unit 和 8 项业务回归。
回归测试仅将 Reel 构造及渲染树遍历适配到新版库的公开接口，不削弱业务断言。
`yarn dev` 先编译一次再 Vite，实时编译另终端运行 `calcit calcit.cirru js -w`，
无需 concurrently。不新增验证脚本，COS 只使用 Action 自带验证。
Expand Down
157 changes: 115 additions & 42 deletions calcit.cirru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $ {}
Expand All @@ -20,31 +20,27 @@
cursor $ decode-map-as
.unwrap-or (get states :cursor) ([])
List respo.schema/CoordKey
raw-state $ .unwrap-or (get states :data) nil
state $ decode-map-as
if (nil? raw-state)
{} (:content |) (:list? false) (:data nil) (:error nil)
, raw-state
Map Tag Dynamic
content $ decode-map-as
.unwrap $ get state :content
, 'String
listing? $ decode-map-as
.unwrap $ get state :list?
, 'Bool
data $ .unwrap-or (get state :data) nil
error $ .unwrap-or (get state :error) nil
state $ match (get states :data)
(:some raw)
if (nil? raw)
app.schema/EditorState :content | :list? false :data (Option :none) :error $ Option :none
read-editor raw
(:none)
app.schema/EditorState :content | :list? false :data (Option :none) :error $ Option :none
content $ :content state
div
{} $ :style $ .merge ui/fullscreen ui/column
if listing?
if (:list? state)
div
{} $ :style ui/expand
div ({})
button $ {} (:style ui/button) (:inner-text |Edit)
:on-click $ fn (e d!)
d! $ schema/Op :states cursor $ assoc state :list? false
d! $ schema/Op :editor cursor $ assoc state :list? false
space-y 8
if (nil? data) &unit $ comp-viewer $ read-info data
match (:data state)
(:some data) (comp-viewer data)
(:none) &unit
div
{} $ :style $ .merge ui/global ui/expand ui/column
div
Expand All @@ -55,30 +51,33 @@
match (try-parse-cirru-edn content)
(:ok parsed)
if (map? parsed)
d! $ schema/Op :states cursor $ -> state (assoc :list? true)
assoc :data $ grab-info $ decode-map-as parsed (Map Dynamic Dynamic)
assoc :error nil
d! $ schema/Op :states cursor $ assoc state :error |Expected-map
d! $ schema/Op :editor cursor $ -> state (assoc :list? true)
assoc :data $ Option :some $ grab-info
decode-map-as parsed $ Map Dynamic Dynamic
assoc :error $ Option :none
d! $ schema/Op :editor cursor $ assoc state :error (Option :some |Expected-map)
(:err message)
d! $ schema/Op :states cursor $ assoc state :error message
d! $ schema/Op :editor cursor $ assoc state :error (Option :some message)
fn (message)
d! $ schema/Op :states cursor $ -> state (assoc :list? false) (assoc :error message)
d! $ schema/Op :editor cursor $ -> state (assoc :list? false)
assoc :error $ Option :some message
, &unit
, &unit
textarea $ {} (:value content) (:placeholder |Content)
:style $ .merge ui/expand ui/textarea $ {} (:height |420px) (:font-family ui/font-code) (:white-space |nowrap)
: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
d! $ schema/Op :editor cursor $ assoc state :content
decode-map-as (:value e) 'String
space-x 8
if (string? error)
Option :some $ <> error $ {} (:color :red)
Option :none
match (:error state)
(:some error)
Option :some $ <> error $ {} (:color :red)
(:none) (Option :none)
if dev?
Option :some $ comp-reel (>> states :reel) (reel-view/view-data reel) ({})
Option :some $ comp-typed-reel (>> states :reel) reel $ {}
Option :none
:examples $ []
:schema $ quote $ Fn
Expand Down Expand Up @@ -171,6 +170,30 @@
, :grouped-tasks grouped-tasks :grouped-notes grouped-notes
:examples $ []
:schema $ quote $ Fn (Map Dynamic Dynamic) (-> app.schema/Info) (:features :js-ffi)
'read-editor $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn read-editor (raw)
hint-fn $ Fn Dynamic $ -> app.schema/EditorState
let
state $ decode-map-as raw $ Map Tag Dynamic
app.schema/EditorState :content
decode-map-as
.unwrap $ get state :content
, 'String
, :list?
decode-map-as
.unwrap $ get state :list?
, 'Bool
, :data
match (get state :data)
(:some data)
if (nil? data) (Option :none)
Option :some $ read-info data
(:none) (Option :none)
, :error $ match (get state :error)
(:some error)
if (string? error) (Option :some error) (Option :none)
(:none) (Option :none)
:examples $ []
'read-entry $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn read-entry (value)
decode-map-as
Expand Down Expand Up @@ -230,10 +253,15 @@
:schema $ quote $ Map Tag Number
'task-time $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn task-time (task)
let
finished $ .unwrap-or (get task :finished-time) nil
created $ .unwrap-or (get task :created-time) nil
if (number? finished) finished $ decode-map-as created 'Number
match (get task :finished-time)
(:some finished)
if (number? finished) finished $ decode-map-as
.unwrap $ get task :created-time
, 'Number
(:none)
decode-map-as
.unwrap $ get task :created-time
, 'Number
:examples $ []
:schema $ quote $ Fn (Map Dynamic Dynamic) (-> Number)
:tests $ []
Expand All @@ -252,10 +280,9 @@
respo-ui.core :as ui
respo.core :refer $ defcomp <> >> list-> div button textarea
respo.comp.space :refer $ space-x space-y
reel.comp.reel :refer $ comp-reel
app.config :refer $ dev?
app.schema :as schema
reel.typed-compat :as reel-view
reel.comp.reel :refer $ comp-typed-reel
'app.config $ %{} 'FileEntry
:defs $ {}
'dev? $ %{} 'CodeEntry (:doc |)
Expand Down Expand Up @@ -288,14 +315,28 @@
'dispatch! $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn dispatch! (message)
if (enum? message)
reset! *reel $ match (typed/decode-control message)
(:some control) (typed/apply-control updater @*reel control)
(:none)
typed/record-op updater @*reel (schema/decode-op message) (generate-id!) (shared/now-ms)
cond
= (enum-definition message) (Option :some schema/Op)
dispatch-resolved! $ decode-map-as message 'app.schema/Op
(= (enum-definition message) (Option :some typed/Control))
dispatch-resolved! $ decode-map-as message 'reel.typed/Control
true $ match (typed/decode-control message)
(:some control) (dispatch-resolved! control)
(:none)
dispatch-resolved! $ schema/decode-op message
raise "|Expected Enum operation"
, &unit
:examples $ []
:schema $ quote $ Fn app.schema/DispatchOp (-> Unit) (:features :js-ffi)
'dispatch-resolved! $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn dispatch-resolved! (op)
hint-fn $ Fn app.schema/ResolvedOp (-> Unit) (:features :js-ffi)
reset! *reel $ match op
(reel.typed/Control control) (typed/apply-control updater @*reel control)
(app.schema/Op action)
typed/record-op updater @*reel action (generate-id!) (shared/now-ms)
, &unit
:examples $ []
'main! $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn main! ()
if config/dev? $ load-console-formatter!
Expand Down Expand Up @@ -344,8 +385,8 @@
, &unit
fn (message) (reset! *storage-failed? true)
reset! *reel $ typed/record-op updater @*reel
schema/Op :states ([])
{} (:content |) (:list? false) (:data nil) (:error "|存档加载失败，已暂停自动保存以保留原始值；请修复存档后重新加载。")
schema/Op :editor ([])
app.schema/EditorState :content | :list? false :data (Option :none) :error $ Option :some "|存档加载失败，已暂停自动保存以保留原始值；请修复存档后重新加载。"
generate-id!
shared/now-ms
eprintln "|Storage restore failed; original value kept."
Expand All @@ -372,6 +413,12 @@
:code $ quote $ def DispatchOp (:: :unhandled)
:examples $ []
:schema $ quote AnyEnum
'EditorState $ %{} 'CodeEntry (:doc |)
:code $ quote $ defstruct EditorState (:content String) (:list? Bool)
:data $ Option app.schema/Info
:error $ Option String
:examples $ []
:schema $ quote StructDef
'Entry $ %{} 'CodeEntry (:doc |)
:code $ quote $ defstruct Entry (:text String) (:time Number)
:examples $ []
Expand All @@ -385,9 +432,14 @@
'Op $ %{} 'CodeEntry (:doc |)
:code $ quote $ defenum Op
:states (List respo.schema/CoordKey) Dynamic
:editor (List respo.schema/CoordKey) app.schema/EditorState
:hydrate-storage $ Map Tag Dynamic
:examples $ []
:schema $ quote EnumDef
'ResolvedOp $ %{} 'CodeEntry (:doc |)
:code $ quote $ defunion ResolvedOp Op reel.typed/Control
:examples $ []
:schema $ quote UnionDef
'decode-op $ %{} 'CodeEntry (:doc |)
:code $ quote $ defn decode-op (message)
match message
Expand Down Expand Up @@ -455,6 +507,27 @@
conj cursor :data
, value
Map Dynamic Dynamic
(:editor cursor state)
let
base $ {}
:content $ :content state
:list? $ :list? state
:data nil
:error nil
with-data $ match (:data state)
(:some data) (assoc base :data data)
(:none) base
wire $ match (:error state)
(:some error) (assoc with-data :error error)
(:none) with-data
assoc store :states $ decode-map-as
assoc-in
decode-map-as
.unwrap $ get store :states
Map Dynamic Dynamic
conj cursor :data
, wire
Map Dynamic Dynamic
(:hydrate-storage data) data
:examples $ []
:schema $ quote $ Fn (Map Tag Dynamic) app.schema/Op String Number
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,6 +1,6 @@
{} (:calcit-version |0.35.1)
{} (:calcit-version |0.37.0)
:version |0.0.1
: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
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 @@ -18,7 +18,7 @@
"vite": "8.3.3"
},
"dependencies": {
"@calcit/procs": "0.35.1",
"@calcit/procs": "0.37.0",
"cirru-color": "^0.2.4",
"copy-text-to-clipboard": "^3.2.2",
"dayjs": "^1.11.21",
Expand Down
10 changes: 5 additions & 5 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.