diff --git a/README.md b/README.md index 4c3c672..efbe040 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ http://r.tiye.me/Memkits/diffview/ ### 使用者影响 -CLI 与 `@calcit/procs` 配对升级到正式 **0.38.0**,需要重新安装完整模块图、 +CLI 与 `@calcit/procs` 配对升级到正式 **0.40.0**,需要重新安装完整模块图、 生成 JS 并完整刷新,不能跨工具链热重载旧 Reel。依赖使用正式 Reel **0.10.0**、 UI **0.15.2**、Respo **0.19.5**、JS-FFI **0.2.13**,传递 Router **0.12.2**。 不使用 main/hash 或 alpha,不关闭 Caps strict 解决冲突。 @@ -31,7 +31,7 @@ DiffChunk、StoreData 和 `Map Tag String` site 配置沿用。存档入口接 ### 安装与原门禁 -使用 Calcit 0.38.0、Caps 0.1.1、Node.js 24、Yarn 4.18.0。 +使用 Calcit 0.40.0、Caps 0.1.1、Node.js 24、Yarn 4.18.0。 Caps 独立安装,见 [官方说明](https://github.com/calcit-lang/caps);Corepack/Yarn 不会安装它。 新解析 npm 包保留 60 分钟年龄门禁,无单包例外。lock 只更新 procs 配对;已有 undici Dependabot #48 单独保留。 diff --git a/calcit.cirru b/calcit.cirru index 10f0920..b6b786d 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -33,13 +33,12 @@ sorted? $ :sorted? store show-result? $ :show-result? store by-word? $ :by-word? store - differ $ if by-word? diff/diffWords diff/diffLines + old-text $ :old-text store + new-text $ :new-text store + left $ if sorted? (sort-by-line old-text) old-text + right $ if sorted? (sort-by-line new-text) new-text changes $ decode-map-as - to-calcit-data $ if sorted? - differ - sort-by-line $ :old-text store - sort-by-line $ :new-text store - differ (:old-text store) (:new-text store) + to-calcit-data $ if by-word? (diff/diffWords left right) (diff/diffLines left right) List app.schema/DiffChunk div {} $ :class-name $ str-spaced css/global css/fullscreen css/column @@ -397,7 +396,7 @@ if (struct? raw) (&struct:to-map raw) raw , 'app.schema/StoreData :examples $ [] - :schema $ quote $ Fn Dynamic (-> app.schema/StoreData) + :schema $ quote $ Fn Input (-> app.schema/StoreData) (:generics Input) 'store $ %{} 'CodeEntry (:doc |) :code $ quote $ def store StoreData :states ({}) :page :editor :sorted? false :show-result? false :by-word? false :old-text | :new-text | diff --git a/deps.cirru b/deps.cirru index 0a183e9..8bbf0a2 100644 --- a/deps.cirru +++ b/deps.cirru @@ -1,5 +1,5 @@ -{} (:calcit-version |0.38.0) +{} (:calcit-version |0.40.0) :version |0.1.5 :dependencies $ {} (|Respo/reel.calcit |0.10.0) |Respo/respo-ui.calcit |0.15.2 diff --git a/package.json b/package.json index f017626..b0eae41 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "vite": "8.3.3" }, "dependencies": { - "@calcit/procs": "0.38.0", + "@calcit/procs": "0.40.0", "diff": "^8.0.2" } } diff --git a/yarn.lock b/yarn.lock index 097f9c2..6fd0ef1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,15 +12,15 @@ __metadata: languageName: node linkType: hard -"@calcit/procs@npm:0.38.0": - version: 0.38.0 - resolution: "@calcit/procs@npm:0.38.0" +"@calcit/procs@npm:0.40.0": + version: 0.40.0 + resolution: "@calcit/procs@npm:0.40.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/8d1910cc739b1b23b5d5b549fb519053b2a578ab05f11814d28c09fbf4c18be5d3a14f52ff3b9bea4c9a3a42ab79d56a59021cd533d68ecc5e26e61da1e347ba + checksum: 10c0/4122eaa8d63fd57826d24c6c072dbd1cb6cdd2934dbfdb4fd0afc03f4aec73f07d71ccba246120c15e198134b7e92a324f1f1900b43c458b02e871354739cf84 languageName: node linkType: hard @@ -201,7 +201,7 @@ __metadata: version: 0.0.0-use.local resolution: "calcit-workflow@workspace:." dependencies: - "@calcit/procs": "npm:0.38.0" + "@calcit/procs": "npm:0.40.0" bottom-tip: "npm:^0.1.5" diff: "npm:^8.0.2" vite: "npm:8.3.3"