diff --git a/README.md b/README.md index b49f3c5..94e1608 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Text diff ### 使用者影响 -升级到 Calcit 和 `@calcit/procs` **0.40.0** 后,请重新安装依赖、编译并刷新。文本输入、Run 输出、原 Map 存档和页面 HUD 继续适用。 应用操作和 Reel 控制通过 `ResolvedOp` union 区分。Reel 面板直接接收独立控制回调,原存档结构保持兼容。 +升级到 Calcit 和 `@calcit/procs` **0.41.0** 后,请重新安装依赖、编译并刷新。文本输入、Run 输出、原 Map 存档和页面 HUD 继续适用。 应用操作和 Reel 控制通过 `ResolvedOp` union 区分。Reel 面板直接接收独立控制回调,原存档结构保持兼容。 Reel 使用 `State`。业务更新器接收具名操作。状态路径和顶层状态键统一使用 `CursorKey = Tag | String | Number`,已有 Map 或 Struct 存档仍在恢复时校验。恢复成功后才注册离页保存。 @@ -16,7 +16,7 @@ Reel 使用 `State`。业务更新器接收具名操作。状态路 Use `calcit.cirru` and `deps.cirru`; do not restore the retired `compact.cirru` or `package.cirru`. Generated `js-out/` is not committed. -Use Node 24 and Yarn 4.18.0. Install Calcit 0.40.0 and Caps 0.1.1 separately +Use Node 24 and Yarn 4.18.0. Install Calcit 0.41.0 and Caps 0.1.1 separately (the latter follows [the official Caps installation](https://github.com/calcit-lang/caps)); Corepack/Yarn does not install Caps. Strict dependency installation and the original type/test gates are retained. Browser and production acceptance remain separate from successful compilation. diff --git a/calcit.cirru b/calcit.cirru index de0f36b..7e297bc 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -42,8 +42,8 @@ -> Unit println $ :content store if dev? - Option :some $ comp-controlled-reel reel ({}) on-control - Option :none + Some $ comp-controlled-reel reel ({}) on-control + , None :examples $ [] :schema $ quote $ Fn (reel.typed/State text-diff.schema/Op text-diff.schema/Store) Fn reel.typed/Control $ -> Unit @@ -93,9 +93,9 @@ :defs $ {} '*reel $ %{} 'CodeEntry (:doc |) :code $ quote $ defref *reel - typed/State :base schema/store :store schema/store :records ([]) :pointer (Option :none) :stopped? false :display? false :merged? false + typed/State :base schema/store :store schema/store :records ([]) :pointer None :stopped? false :display? false :merged? false :examples $ [] - :schema $ quote $ Ref (reel.typed/State text-diff.schema/Op text-diff.schema/Store) + :schema $ quote $ Ref (typed/State schema/Op schema/Store) 'dispatch! $ %{} 'CodeEntry (:doc |) :code $ quote $ defn dispatch! (op) when config/dev? $ println |Dispatch: op @@ -105,7 +105,7 @@ typed/record-op updater @*reel action (generate-id!) (shared/now-ms) , &unit :examples $ [] - :schema $ quote $ Fn text-diff.schema/ResolvedOp (-> Unit) (:features :js-ffi) + :schema $ quote $ Fn schema/ResolvedOp (-> Unit) (:features :js-ffi) 'main! $ %{} 'CodeEntry (:doc |) :code $ quote $ defn main! () println "|Running mode:" $ if config/dev? |dev |release @@ -132,7 +132,7 @@ 'on-control! $ %{} 'CodeEntry (:doc |) :code $ quote $ defn on-control! (control) (dispatch! control) :examples $ [] - :schema $ quote $ Fn reel.typed/Control (-> Unit) + :schema $ quote $ Fn typed/Control (-> Unit) 'persist-storage! $ %{} 'CodeEntry (:doc |) :code $ quote $ defn persist-storage! () browser/storage-set! @@ -213,12 +213,12 @@ if (struct? data) (&struct:to-map data) data , text-diff.schema/Store :examples $ [] - :schema $ quote $ Fn Input (-> text-diff.schema/Store) (:generics Input) + :schema $ quote $ Fn Input (-> Store) (:generics Input) 'store $ %{} 'CodeEntry (:doc |) :code $ quote $ def store Store :states ({}) :content | :examples $ [] - :schema $ quote text-diff.schema/Store + :schema $ quote Store :ns $ %{} 'NsEntry (:doc |) :code $ quote $ ns text-diff.schema 'text-diff.updater $ %{} 'FileEntry diff --git a/deps.cirru b/deps.cirru index 3fd49ac..6b40c0b 100644 --- a/deps.cirru +++ b/deps.cirru @@ -1,5 +1,5 @@ -{} (:calcit-version |0.40.0) +{} (:calcit-version |0.41.0) :version |0.1.4 :dependencies $ {} (|Respo/reel.calcit |0.11.0) |Respo/respo-markdown.calcit |0.8.2 diff --git a/package.json b/package.json index db2a6b6..228d247 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "vite": "^8.3.1" }, "dependencies": { - "@calcit/procs": "0.40.0", + "@calcit/procs": "0.41.0", "cirru-color": "^0.2.4", "copy-text-to-clipboard": "^3.2.2", "dayjs": "^1.11.20", diff --git a/yarn.lock b/yarn.lock index 6f2938e..fb19c66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,15 +12,15 @@ __metadata: languageName: node linkType: hard -"@calcit/procs@npm:0.40.0": - version: 0.40.0 - resolution: "@calcit/procs@npm:0.40.0" +"@calcit/procs@npm:0.41.0": + version: 0.41.0 + resolution: "@calcit/procs@npm:0.41.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/4122eaa8d63fd57826d24c6c072dbd1cb6cdd2934dbfdb4fd0afc03f4aec73f07d71ccba246120c15e198134b7e92a324f1f1900b43c458b02e871354739cf84 + checksum: 10c0/5de94b39e435363d0f80611b63914c9abd6b0afac3c77adf9b9846ac439fce319ac0780697364cabf67b2997d39495a1e72086e1496ac560c51bb57462f37628 languageName: node linkType: hard @@ -278,7 +278,7 @@ __metadata: version: 0.0.0-use.local resolution: "calcit-workflow@workspace:." dependencies: - "@calcit/procs": "npm:0.40.0" + "@calcit/procs": "npm:0.41.0" bottom-tip: "npm:^0.1.5" cirru-color: "npm:^0.2.4" copy-text-to-clipboard: "npm:^3.2.2"