@calcit/procs 0.11.7 → 0.12.0

package/editing-history/2026-0308-2033-schema-wrapper-migration.md

@@ -0,0 +1,45 @@
+# 2026-03-08 schema wrapper migration
+
+## Summary
+
+- 统一函数 schema 的 snapshot 输出格式，顶层改为 wrapped `:: :fn` / `:: :macro` 形式。
+- 修复 schema round-trip 中的类型信息丢失，确保嵌套函数类型与 `:rest` 在格式化后保持稳定。
+- 将 macro schema 的顶层格式统一迁移到 `:: :macro`，并让 formatter 在处理 `defmacro` 条目时自动纠正旧的 `fn` 标记。
+- 移除 legacy quote-wrapped schema normalization 与 legacy positional `fn` type annotation fallback，收紧到当前 schema-map 形式。
+- 更新 `deftrait` 文档与相关说明，避免继续传播旧写法。
+
+## Main changes
+
+### 1) 顶层 schema 输出统一
+
+- 在 `src/calcit/type_annotation.rs` 中补充顶层 wrapped schema 的解析与序列化逻辑。
+- 在 `src/snapshot.rs` 中让 `CodeEntry.schema` 写回 snapshot 时统一输出为 `:schema $ :: :fn ...` 或 `:schema $ :: :macro ...`。
+- 对 plain fn schema 去掉 wrapped payload 内冗余的 `:kind :fn`，但保留宏函数所需的 `:kind :macro`。
+
+### 2) macro schema 迁移与规范化
+
+- 扩展 parser / normalize 逻辑，使其同时接受 wrapped `fn` 与 wrapped `macro`。
+- 对 macro schema，序列化时省略冗余的 `:kind :macro` 与 `:return`，仅保留 `:args` 与可选 `:rest`。
+- 在 snapshot 读写路径中，根据代码头是否为 `defmacro` 自动纠正 schema kind。
+
+### 3) legacy fn syntax 收紧
+
+- 移除 legacy quote-wrapped schema normalization。
+- 拒绝 legacy quoted generic symbols。
+- 移除 legacy positional `fn` type annotation parsing fallback。
+- 迁移剩余 core trait 与测试注解到 schema-map `:: :fn {}` 形式。
+
+### 4) round-trip 与批量格式化
+
+- 修复 EDN 到 Calcit 的转换路径，补上 `Edn::Map` 的处理，避免嵌套 `fn` schema 的 hashmap payload 被吞掉后退化成 `:dynamic`。
+- 调整 schema 校验与 normalize 逻辑，使 wrapped 顶层 fn schema 与旧格式都能稳定读写。
+- 重新格式化了 `src/cirru/calcit-core.cirru`、`calcit/util.cirru`、`calcit/test-hygienic.cirru` 等兼容 snapshot 文件。
+
+## Validation
+
+- `cargo fmt`
+- `cargo clippy -- -D warnings`
+- `yarn compile`
+- `cargo test -q`
+- `cargo build -q`
+- `yarn check-all`

package/editing-history/2026-0308-2315-late-schema-cleanup-and-warning-compat.md

@@ -0,0 +1,27 @@
+# 2026-03-08 late schema cleanup and warning compatibility
+
+## Summary
+
+- made snapshot schema loading strict for non-nil schemas, so malformed schema data no longer silently degrades to dynamic
+- normalized loaded schema maps so legacy string keys and string `:kind` values are converted into canonical tag-based schema maps
+- restored generic type variables in `src/cirru/calcit-core.cirru` where a previous migration had incorrectly replaced them with `:symbol`
+- cleaned the remaining mistaken `:symbol` placeholders in core collection schemas, keeping only the intentional `symbol?` runtime type check
+- fixed `calcit/test-generics.cirru` after a schema-formatting edit moved `assert-type id ...` into the `let` binding section
+- kept `ns/def` warning location reporting for embedded core snapshot loading
+- stopped legacy fn-schema warnings from firing on malformed nested `:: :fn` schema payloads parsed from `calcit-core.cirru`
+- used a conservative fallback to `DynFn` for malformed nested payloads, avoiding false-positive callback type warnings without re-editing Cirru syntax
+
+## Notes
+
+- `yarn check-all` passed after the generic-schema restoration and remaining `:symbol` cleanup passes
+- the `test-generics` fix resolves the runtime error `expected binding of a pair`
+- nested function schema payloads coming from Cirru snapshot EDN may currently collapse into malformed map payloads like `(:: :fn ({} (nil ...)))` or `(:: :fn ({}))`
+- those malformed payloads are lossy, so partially reconstructing arg/return types can introduce new static-analysis warnings
+- decoding the embedded binary core snapshot with per-entry owners is necessary to preserve precise warning locations such as `calcit.core/foo`
+
+## Validation
+
+- `cargo test -q malformed_nested_fn_schema`
+- `cargo build -q`
+- `target/debug/cr calcit/test.cirru -1`
+- `yarn check-all`

package/lib/calcit-data.mjs

@@ -146,6 +146,12 @@ export let castTag = (x) => {
     if (x instanceof CalcitSymbol) {
         return newTag(x.value);
     }
+    if (typeof x === "function") {
+        const methodName = x.__calcitMethodName;
+        if (typeof methodName === "string") {
+            return newTag(methodName);
+        }
+    }
     throw new Error(`Cannot cast this to tag: ${x}`);
 };
 export var refsRegistry = new Map();

package/lib/calcit.procs.mjs

@@ -1584,9 +1584,11 @@ export let register_calcit_builtin_impls = (options) => {
 };
 /** method used as closure */
 export function invoke_method_closure(p) {
-    return (obj, ...args) => {
+    const f = (obj, ...args) => {
         return invoke_method(p, obj, ...args);
     };
+    f.__calcitMethodName = p;
+    return f;
 }
 function normalize_builtin_impls(entry) {
     if (entry == null)

package/lib/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@calcit/procs",
-    "version": "0.11.7",
+    "version": "0.12.0",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
         "@types/node": "^25.0.9",
         "typescript": "^5.9.3"
     },
     "scripts": {
-        "compile": "rm -rfv lib/* && tsc",
+        "compile": "rm -rf lib && tsc",
         "procs-link": "ln -sfn ../../ node_modules/@calcit/procs",
         "cp-mac": "cargo build --release && rm -rfv builds/* && node scripts/cp-version.js && scp builds/* rsync-user@calcit-lang.org:/web-assets/repo/calcit-lang/binaries/macos/",
         "eval": "cargo run --bin cr -- eval",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@calcit/procs",
-  "version": "0.11.7",
+  "version": "0.12.0",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^25.0.9",
     "typescript": "^5.9.3"
   },
   "scripts": {
-    "compile": "rm -rfv lib/* && tsc",
+    "compile": "rm -rf lib && tsc",
     "procs-link": "ln -sfn ../../ node_modules/@calcit/procs",
     "cp-mac": "cargo build --release && rm -rfv builds/* && node scripts/cp-version.js && scp builds/* rsync-user@calcit-lang.org:/web-assets/repo/calcit-lang/binaries/macos/",
     "eval": "cargo run --bin cr -- eval",

package/ts-src/calcit-data.mts

@@ -168,6 +168,12 @@ export let castTag = (x: CalcitValue): CalcitTag => {
   if (x instanceof CalcitSymbol) {
     return newTag(x.value);
   }
+  if (typeof x === "function") {
+    const methodName = (x as { __calcitMethodName?: unknown }).__calcitMethodName;
+    if (typeof methodName === "string") {
+      return newTag(methodName);
+    }
+  }
   throw new Error(`Cannot cast this to tag: ${x}`);
 };
 

package/ts-src/calcit.procs.mts

@@ -1714,9 +1714,11 @@ export let register_calcit_builtin_impls = (options: typeof calcit_builtin_impls
 
 /** method used as closure */
 export function invoke_method_closure(p: string) {
-  return (obj: CalcitValue, ...args: CalcitValue[]) => {
+  const f = (obj: CalcitValue, ...args: CalcitValue[]) => {
     return invoke_method(p, obj, ...args);
   };
+  (f as { __calcitMethodName?: string }).__calcitMethodName = p;
+  return f;
 }
 
 function normalize_builtin_impls(entry: CalcitImplEntry): CalcitImpl[] | null {