@calcit/procs 0.12.51 → 0.12.52

package/README.md

@@ -40,12 +40,11 @@ Installed binaries:
 - `calcit`, the runtime and js compiler
 - `cr-wasm`, standalone WASM codegen tool
 - `caps`, for downloading dependencies declared in `deps.cirru`
-- `bundle_calcit`, bundle code for distribution
 
 When installing from source, explicitly include both runners:
 
 ```bash
-cargo install --path . --bin cr --bin cr-wasm --bin caps --bin bundle_calcit
+cargo install --path . --bin cr --bin cr-wasm --bin caps
 ```
 
 To use Calcit in GitHub Actions, try [setup-cr](https://github.com/calcit-lang/setup-cr).

package/editing-history/2026-07-26-1220-to-js-data-options.md

@@ -0,0 +1,14 @@
+# 2026-07-26 12:20 to-js-data options validation
+
+## 修改概要
+
+- 将 `to-js-data` 的第二参数改为 options map，并保留旧 boolean `addColon` 参数的兼容警告。
+- 支持 `{} (:js-array true)`、`:js-object`、`:js-string`、`:js-number` 作为转换结果验证标记。
+- 为 JS 集成测试和 `cr query examples calcit.core/to-js-data` 增加 options 示例。
+
+## 验证
+
+- `yarn compile`
+- `cargo test -q --bin cr`
+- `yarn try-js`
+- `cr calcit/test.cirru query examples calcit.core/to-js-data`

package/editing-history/2026-07-26-1244-release-0.12.52.md

@@ -0,0 +1,12 @@
+# 2026-07-26 12:44 Release 0.12.52
+
+## 修改概要
+
+- 将 Rust crate 和 npm package 版本同步升级到 `0.12.52`。
+- 执行 `cargo update --workspace` 更新锁文件元数据。
+
+## 发布前验证
+
+- `yarn compile`
+- `cargo test -q --bin cr`
+- `yarn try-js`

package/editing-history/202607221613-remove-bundle-calcit-cli.md

@@ -0,0 +1,7 @@
+# Replace the legacy bundle CLI with a Calcit script
+
+- Removed the deprecated `bundle_calcit` Rust binary and its release artifact.
+- Added the recursive `read-dir` Calcit runtime API so filesystem workflows can be implemented in Calcit.
+- Added `calcit/bundle-calcit.cirru` as a directly executable snapshot that bundles indentation-based source files into a runnable snapshot.
+- Updated installation and bundle-mode documentation to use the script-based workflow.
+- Verified the script against `minimal-calcit`, including loading and running the generated snapshot.

package/editing-history/202607221944-replace-cr-sync-with-script.md

@@ -0,0 +1,7 @@
+# Replace the legacy cr-sync binary with a Calcit script
+
+- Removed the `cr-sync` Rust binary and its installation documentation.
+- Moved the bundle script to `calcit/scripts/` and added `sync-calcit.cirru` beside it.
+- Added `unix-time-ms` for script-generated snapshot metadata.
+- Reused `bisection-key` lexical-key APIs; `bisection-key` 0.0.18 fixes string-key append support.
+- Verified synchronization against the editor repository's real `compact.cirru` and `calcit.cirru` fixtures, then checked the output with the legacy dry-run binary.

package/lib/calcit-data.d.mts

@@ -32,7 +32,7 @@ export declare let castTag: (x: CalcitValue) => CalcitTag;
 export declare var refsRegistry: Map<string, CalcitRef>;
 export declare let hashFunction: (x: CalcitValue) => Hash;
 export declare let toString: (x: CalcitValue, escaped: boolean, disableJsDataWarning?: boolean) => string;
-export declare let to_js_data: (x: CalcitValue, addColon?: boolean) => any;
+export declare let to_js_data: (x: CalcitValue, options?: CalcitValue | boolean) => any;
 export declare let _$n_map_$o_get: (xs: CalcitValue, k: CalcitValue) => CalcitValue;
 export declare let _$n__$e_: (x: CalcitValue, y: CalcitValue) => boolean;
 /** special trick for disabling ternary tree list check */

package/lib/calcit-data.mjs

@@ -441,7 +441,38 @@ export let toString = (x, escaped, disableJsDataWarning = false) => {
     }
     return `(#js ${JSON.stringify(x)})`;
 };
-export let to_js_data = (x, addColon = false) => {
+export let to_js_data = (x, options) => {
+    let addColon = false;
+    if (typeof options === "boolean") {
+        console.warn("to-js-data: the addColon boolean argument is deprecated; pass an options map instead");
+        addColon = options;
+    }
+    else if (options !== undefined) {
+        let jsOptions = to_js_data_inner(options, false);
+        addColon = jsOptions[":add-colon"] === true || jsOptions["add-colon"] === true;
+        let value = to_js_data_inner(x, addColon);
+        let expectedType = jsOptions[":type"] ??
+            jsOptions.type ??
+            (jsOptions[":js-array"] || jsOptions["js-array"] ? "js-array" : undefined) ??
+            (jsOptions[":js-string"] || jsOptions["js-string"] ? "js-string" : undefined) ??
+            (jsOptions[":js-number"] || jsOptions["js-number"] ? "js-number" : undefined) ??
+            (jsOptions[":js-object"] || jsOptions["js-object"] ? "js-object" : undefined) ??
+            "js-object";
+        let valid = (expectedType === "js-array" && Array.isArray(value)) ||
+            (expectedType === "js-object" &&
+                value !== null &&
+                typeof value === "object" &&
+                !Array.isArray(value) &&
+                !(value instanceof Set)) ||
+            (expectedType === "js-string" && typeof value === "string") ||
+            (expectedType === "js-number" && typeof value === "number");
+        if (!valid)
+            throw new Error(`to-js-data expects ${expectedType}`);
+        return value;
+    }
+    return to_js_data_inner(x, addColon);
+};
+let to_js_data_inner = (x, addColon) => {
     if (x == null) {
         return null;
     }
@@ -470,17 +501,17 @@ export let to_js_data = (x, addColon = false) => {
         return Symbol(x.value);
     }
     if (x instanceof CalcitTuple) {
-        var result = [to_js_data(x.tag)];
+        var result = [to_js_data_inner(x.tag, false)];
         for (let i = 0; i < x.extra.length; i++) {
             let item = x.extra[i];
-            result.push(to_js_data(item));
+            result.push(to_js_data_inner(item, false));
         }
         return result;
     }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         var result = [];
         for (let item of x.items()) {
-            result.push(to_js_data(item, addColon));
+            result.push(to_js_data_inner(item, addColon));
         }
         return result;
     }
@@ -490,22 +521,22 @@ export let to_js_data = (x, addColon = false) => {
         for (let idx = 0; idx < pairs.length; idx++) {
             let k = pairs[idx][0];
             let v = pairs[idx][1];
-            var key = to_js_data(k, addColon);
-            result[key] = to_js_data(v, addColon);
+            var key = to_js_data_inner(k, addColon);
+            result[key] = to_js_data_inner(v, addColon);
         }
         return result;
     }
     if (x instanceof CalcitSet) {
         let result = new Set();
         x.values().forEach((v) => {
-            result.add(to_js_data(v, addColon));
+            result.add(to_js_data_inner(v, addColon));
         });
         return result;
     }
     if (x instanceof CalcitRecord) {
         let result = {};
         for (let idx = 0; idx < x.fields.length; idx++) {
-            result[x.fields[idx].value] = to_js_data(x.values[idx]);
+            result[x.fields[idx].value] = to_js_data_inner(x.values[idx], false);
         }
         return result;
     }

package/lib/package.json

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

package/package.json

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

package/ts-src/calcit-data.mts

@@ -472,7 +472,39 @@ export let toString = (x: CalcitValue, escaped: boolean, disableJsDataWarning: b
   return `(#js ${JSON.stringify(x)})`;
 };
 
-export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
+export let to_js_data = (x: CalcitValue, options?: CalcitValue | boolean): any => {
+  let addColon = false;
+  if (typeof options === "boolean") {
+    console.warn("to-js-data: the addColon boolean argument is deprecated; pass an options map instead");
+    addColon = options;
+  } else if (options !== undefined) {
+    let jsOptions = to_js_data_inner(options, false) as Record<string, any>;
+    addColon = jsOptions[":add-colon"] === true || jsOptions["add-colon"] === true;
+    let value = to_js_data_inner(x, addColon);
+    let expectedType =
+      jsOptions[":type"] ??
+      jsOptions.type ??
+      (jsOptions[":js-array"] || jsOptions["js-array"] ? "js-array" : undefined) ??
+      (jsOptions[":js-string"] || jsOptions["js-string"] ? "js-string" : undefined) ??
+      (jsOptions[":js-number"] || jsOptions["js-number"] ? "js-number" : undefined) ??
+      (jsOptions[":js-object"] || jsOptions["js-object"] ? "js-object" : undefined) ??
+      "js-object";
+    let valid =
+      (expectedType === "js-array" && Array.isArray(value)) ||
+      (expectedType === "js-object" &&
+        value !== null &&
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        !(value instanceof Set)) ||
+      (expectedType === "js-string" && typeof value === "string") ||
+      (expectedType === "js-number" && typeof value === "number");
+    if (!valid) throw new Error(`to-js-data expects ${expectedType}`);
+    return value;
+  }
+  return to_js_data_inner(x, addColon);
+};
+
+let to_js_data_inner = (x: CalcitValue, addColon: boolean): any => {
   if (x == null) {
     return null;
   }
@@ -501,17 +533,17 @@ export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
     return Symbol(x.value);
   }
   if (x instanceof CalcitTuple) {
-    var result: any[] = [to_js_data(x.tag)];
+    var result: any[] = [to_js_data_inner(x.tag, false)];
     for (let i = 0; i < x.extra.length; i++) {
       let item = x.extra[i];
-      result.push(to_js_data(item));
+      result.push(to_js_data_inner(item, false));
     }
     return result;
   }
   if (x instanceof CalcitList || x instanceof CalcitSliceList) {
     var result: any[] = [];
     for (let item of x.items()) {
-      result.push(to_js_data(item, addColon));
+      result.push(to_js_data_inner(item, addColon));
     }
     return result;
   }
@@ -521,22 +553,22 @@ export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
     for (let idx = 0; idx < pairs.length; idx++) {
       let k = pairs[idx][0];
       let v = pairs[idx][1];
-      var key = to_js_data(k, addColon);
-      result[key] = to_js_data(v, addColon);
+      var key = to_js_data_inner(k, addColon);
+      result[key] = to_js_data_inner(v, addColon);
     }
     return result;
   }
   if (x instanceof CalcitSet) {
     let result = new Set();
     x.values().forEach((v) => {
-      result.add(to_js_data(v, addColon));
+      result.add(to_js_data_inner(v, addColon));
     });
     return result;
   }
   if (x instanceof CalcitRecord) {
     let result: Record<string, CalcitValue> = {};
     for (let idx = 0; idx < x.fields.length; idx++) {
-      result[x.fields[idx].value] = to_js_data(x.values[idx]);
+      result[x.fields[idx].value] = to_js_data_inner(x.values[idx], false);
     }
     return result;
   }