@calcit/procs 0.12.54 → 0.12.55

package/README.md

@@ -139,8 +139,9 @@ Run `caps` to download. Sources are downloaded into `~/.config/calcit/modules/`.
 To load modules, use `:modules` configuration and the runtime snapshot file `calcit.cirru` (legacy: `compact.cirru`):
 
 ```cirru
-:configs $ {}
-  :modules $ [] |memof/calcit.cirru |lilac/
+:entries $ {}
+  :default $ {}
+    :modules $ [] |memof/calcit.cirru |lilac/
 ```
 
 Paths defined in `:modules` field are just loaded as files from `~/.config/calcit/modules/`,

package/RFCs/04-13-type-slot-mechanism-rfc.md

@@ -281,13 +281,15 @@ evaluate(with-type-slot body) -> 在遇到 dependency 时临时影响编译
 
 ### 8.2 已实现的配置语法
 
-默认 entry 在 `:configs` 中绑定短 slot 名，值必须是完整 definition path 或 `:dynamic`：
+默认 entry 在 `:entries.default` 中绑定短 slot 名，值必须是完整 definition path 或 `:dynamic`：
 
 ```cirru
-:configs $ {}
-  :init-fn |app.main/main!
-  :type-slots $ {}
-    :dispatch-op |app.schema/Op
+:entries $ {}
+  :default $ {}
+    :mode :native
+    :init-fn |app.main/main!
+    :type-slots $ {}
+      :dispatch-op |app.schema/Op
 ```
 
 命名 entry 使用自己的完整配置，可以选择另一类型：
@@ -295,12 +297,13 @@ evaluate(with-type-slot body) -> 在遇到 dependency 时临时影响编译
 ```cirru
 :entries $ {}
   :server $ {}
+    :mode :native
     :init-fn |app.server/main!
     :type-slots $ {}
       :dispatch-op |app.schema/ServerOp
 ```
 
-命名 entry 不继承默认 `:configs.type-slots`。这里使用完整 definition path，而不是在配置解析阶段求值任意 Calcit expression，因此配置可序列化、可查询，也不依赖入口函数的执行顺序。对应命令为：
+命名 entry 不继承 `:entries.default.type-slots`。这里使用完整 definition path，而不是在配置解析阶段求值任意 Calcit expression，因此配置可序列化、可查询，也不依赖入口函数的执行顺序。对应命令为：
 
 ```bash
 cr config set-type-slot :dispatch-op app.schema/Op
@@ -574,7 +577,7 @@ cr config type-slots --entry server
 
 ## 15. 尚待决定的问题
 
-已决定：`:configs` 与每个命名 entry 各自保存完整 `:type-slots`，不做隐式继承；配置值只接受完整 definition path 或 `:dynamic`。
+已决定：所有入口统一存放在 `:entries`，`:default` 是无参数入口；每个 entry 各自保存完整 `:type-slots`，不做隐式继承；配置值只接受完整 definition path 或 `:dynamic`。
 
 仍待决定：
 

package/build.rs

@@ -6,16 +6,71 @@ use std::env;
 use std::fs;
 use std::path::Path;
 
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum SnapshotRunMode {
+  #[default]
+  Native,
+  Js,
+}
+
+fn deserialize_run_mode<'de, D>(deserializer: D) -> Result<SnapshotRunMode, D::Error>
+where
+  D: serde::Deserializer<'de>,
+{
+  let value = Edn::deserialize(deserializer)?;
+  let mode = match value {
+    Edn::Tag(tag) => tag.ref_str().to_owned(),
+    Edn::Str(text) | Edn::Symbol(text) => text.trim_start_matches(':').to_owned(),
+    other => return Err(serde::de::Error::custom(format!("expected :native or :js, got {other:?}"))),
+  };
+  match mode.as_str() {
+    "native" => Ok(SnapshotRunMode::Native),
+    "js" => Ok(SnapshotRunMode::Js),
+    _ => Err(serde::de::Error::custom(format!("expected :native or :js, got {mode}"))),
+  }
+}
+
+fn deserialize_ns_def<'de, D>(deserializer: D) -> Result<String, D::Error>
+where
+  D: serde::Deserializer<'de>,
+{
+  match Edn::deserialize(deserializer)? {
+    Edn::Str(text) | Edn::Symbol(text) => Ok(text.to_string()),
+    other => Err(serde::de::Error::custom(format!(
+      "expected namespace/definition string or symbol, got {other:?}"
+    ))),
+  }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SnapshotConfigs {
-  #[serde(rename = "init-fn")]
+pub struct SnapshotEntry {
+  #[serde(default, deserialize_with = "deserialize_run_mode")]
+  pub mode: SnapshotRunMode,
+  #[serde(rename = "init-fn", deserialize_with = "deserialize_ns_def")]
   pub init_fn: String,
-  #[serde(rename = "reload-fn")]
+  #[serde(rename = "reload-fn", deserialize_with = "deserialize_ns_def")]
+  pub reload_fn: String,
+  #[serde(default)]
+  pub description: String,
+  #[serde(default)]
+  pub modules: Vec<String>,
+  #[serde(default, rename = "type-slots")]
+  pub type_slots: HashMap<String, String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct LegacySnapshotConfigs {
+  #[serde(rename = "init-fn", deserialize_with = "deserialize_ns_def")]
+  pub init_fn: String,
+  #[serde(rename = "reload-fn", deserialize_with = "deserialize_ns_def")]
   pub reload_fn: String,
   #[serde(default)]
   pub modules: Vec<String>,
   #[serde(default)]
   pub version: String,
+  #[serde(default, rename = "type-slots")]
+  pub type_slots: HashMap<String, String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -46,8 +101,9 @@ pub struct FileInSnapShot {
 pub struct Snapshot {
   pub package: String,
   pub about: Option<String>,
-  pub configs: SnapshotConfigs,
-  pub entries: HashMap<String, SnapshotConfigs>,
+  #[serde(default)]
+  pub version: String,
+  pub entries: HashMap<String, SnapshotEntry>,
   pub files: HashMap<String, FileInSnapShot>,
 }
 
@@ -417,11 +473,37 @@ fn main() {
 
   let files = parse_files(data.get_or_nil("files")).unwrap_or_else(|e| panic!("failed to parse calcit-core `:files`: {e}"));
 
+  let legacy_configs = match data.get_or_nil("configs") {
+    Edn::Nil => None,
+    value => {
+      Some(from_edn::<LegacySnapshotConfigs>(value).unwrap_or_else(|e| panic!("failed to parse calcit-core legacy `:configs`: {e}")))
+    }
+  };
+  let mut entries: HashMap<String, SnapshotEntry> =
+    from_edn(data.get_or_nil("entries")).unwrap_or_else(|e| panic!("failed to parse calcit-core `:entries`: {e}"));
+  if let Some(configs) = &legacy_configs {
+    entries.insert(
+      "default".to_owned(),
+      SnapshotEntry {
+        mode: SnapshotRunMode::Native,
+        init_fn: configs.init_fn.clone(),
+        reload_fn: configs.reload_fn.clone(),
+        description: String::new(),
+        modules: configs.modules.clone(),
+        type_slots: configs.type_slots.clone(),
+      },
+    );
+  }
+  let version = match data.get_or_nil("version") {
+    Edn::Nil => legacy_configs.map(|configs| configs.version).unwrap_or_default(),
+    value => from_edn(value).unwrap_or_else(|e| panic!("failed to parse calcit-core `:version`: {e}")),
+  };
+
   let snapshot = Snapshot {
     package: pkg,
     about,
-    configs: from_edn(data.get_or_nil("configs")).unwrap_or_else(|e| panic!("failed to parse calcit-core `:configs`: {e}")),
-    entries: from_edn(data.get_or_nil("entries")).unwrap_or_else(|e| panic!("failed to parse calcit-core `:entries`: {e}")),
+    version,
+    entries,
     files,
   };
 

package/editing-history/202607301620-program-diff-type-slots.md

@@ -0,0 +1,6 @@
+# Program diff 补齐 entry type slots
+
+- `SnapshotConfigs.type_slots` 已用于默认 `:configs` 和命名 `:entries`，但 program diff 仍只枚举旧的 `init-fn`、`reload-fn`、`version` 与 `modules` 字段，导致纯 type-slot 修改被误报为无变化。
+- 为字符串 map 增加稳定按 key 排序的结构化 diff，slot 标签保留 `:dispatch-op` 形式；新增或删除整个 entry 时也完整展示其 type slots。
+- `Snapshot` 与 `SnapshotConfigs` 的 program diff 改为无 `..` 的完整字段解构。以后新增字段而未更新 diff 时会产生编译错误，避免同类静默遗漏。
+- 回归测试覆盖默认 entry 的 slot 新增、删除、替换，命名 entry 的 slot 修改，以及新增 entry 时的 slot 详情。

package/editing-history/202607301959-unify-snapshot-entries.md

@@ -0,0 +1,7 @@
+# Unify snapshot entries and run modes
+
+- Replaced the split top-level `:configs` plus `:entries` model with a single `:entries` map. `:default` is now the required implicit entry and the project version lives at top-level `:version`.
+- Added entry-level `:mode` with the supported values `:native` and `:js`. A bare `cr <snapshot> [--entry name]` now follows the selected entry's mode; the explicit `js` subcommand remains available as an override.
+- Kept legacy snapshot loading compatible: old `:configs` is migrated in memory to `entries.default` with native mode, while canonical writes emit only the unified schema.
+- Updated config/query/diff/type-slot/module selection, embedded core serialization, repository snapshots, bundle/sync scripts, CLI help, RFCs, and user/Agent documentation.
+- Added coverage for new-format round trips, legacy migration, configured JS dispatch, and default-entry module extraction.

package/editing-history/202607310027-entry-description.md

@@ -0,0 +1,7 @@
+# Entry description snapshot metadata
+
+- `SnapshotEntry` now carries an optional `description` string for semantic context about an executable entry.
+- Existing snapshots without `:description` remain valid and deserialize to an empty string; canonical snapshot writes include the field.
+- Keep the build-script snapshot model synchronized with runtime `SnapshotEntry`, otherwise the embedded core MessagePack snapshot cannot be decoded.
+- `cr config set [--entry <name>] description "..."` updates the field, and `cr config show` displays it.
+- Program diffs expose description changes independently from runtime configuration and type-slot changes.

package/editing-history/202607310032-initialize-entry-descriptions.md

@@ -0,0 +1,6 @@
+# Initialize entry descriptions in repository snapshots
+
+- Installed the current `cr` 0.12.54 binary globally from this checkout.
+- Used `cr <snapshot> config set description ''` to canonicalize every complete `calcit/**/*.cirru` snapshot.
+- The migration updates 58 snapshots and 60 entry configurations, including named entries, with an explicit empty `:description` field.
+- Empty values preserve existing runtime behavior while providing a stable place for future semantic descriptions.

package/editing-history/202607310041-entry-functions-as-symbols.md

@@ -0,0 +1,7 @@
+# Store entry functions as Calcit symbols
+
+- `:init-fn` and `:reload-fn` describe namespace/definition references, so canonical snapshot output now writes them as Cirru EDN symbols such as `'app.main/main!`.
+- Snapshot readers continue to accept the prior string form (`|app.main/main!`) for compatibility.
+- The embedded core-snapshot build model accepts either representation when deserializing entry metadata.
+- Reinstalled `cr` globally and used it to rewrite all `calcit/**/*.cirru` snapshots; 120 entry function references now use symbols.
+- Updated snapshot documentation and round-trip coverage to make the canonical syntax explicit.

package/editing-history/202607310052-release-0.12.55.md

@@ -0,0 +1,5 @@
+# Release 0.12.55
+
+- Bumped the Rust crate and npm package versions together to `0.12.55`.
+- Refreshed the workspace lockfile before the release commit.
+- This release includes semantic snapshot entry descriptions and canonical symbol storage for entry functions, while preserving legacy string input compatibility.

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@calcit/procs",
-    "version": "0.12.54",
+    "version": "0.12.55",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
         "@types/node": "^25.7.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.12.54",
+  "version": "0.12.55",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^25.7.0",