@calcit/procs 0.13.0 → 0.13.1

package/editing-history/202608061340-release-0.13.1.md

@@ -0,0 +1,6 @@
+# 发布 0.13.1
+
+- 将 Cargo crate 与 npm package 的版本同步升级到 0.13.1。
+- 本 patch 修复自递归 nominal struct 的类型注解解析，避免 Optional 自引用在定义时递归展开。
+- record、struct 与 enum 的展示名称统一为 symbol；JS DevTools formatter 同步展示 nominal 定义与 enum payload。
+- 发布前通过 Rust、TypeScript 与全量集成验证。

package/history/202608061335-recursive-nominal-display.md

@@ -0,0 +1,28 @@
+# Recursive nominal types and symbol presentation
+
+## Background
+
+`defstruct` field annotations eagerly resolved a reference to their own
+definition. A recursive field such as `(:: 'Optional Node)` therefore expanded
+`Node` while it was being declared and could exhaust the Rust stack. In
+addition, nominal record, struct, and enum names were displayed as tags even
+though they are type symbols.
+
+## Changes
+
+- Preserve a strict self-reference as `TypeRef` during type annotation parsing,
+  while keeping normal trait reference resolution unchanged.
+- Add native and snapshot regression coverage for nil and nested recursive
+  nodes, plus a required recursive field that produces a regular type error.
+- Render record, struct, and enum names as quoted symbols in Rust and the JS
+  runtime.
+- Extend the browser custom formatter to expose nominal struct field types and
+  enum payload types, with structured runtime checks for the formatter output.
+
+## Verification
+
+- `cargo fmt --check`
+- `cargo clippy -- -D warnings`
+- `cargo test`
+- `yarn compile`
+- `yarn check-all`

package/lib/custom-formatter.mjs

@@ -2,6 +2,8 @@ import { isLiteral } from "./js-primes.mjs";
 import { CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
 import { CalcitRef } from "./js-ref.mjs";
 import { CalcitRecord } from "./js-record.mjs";
+import { CalcitStruct } from "./js-struct.mjs";
+import { CalcitEnum } from "./js-enum.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitSet } from "./js-set.mjs";
@@ -149,15 +151,22 @@ export let load_console_formatter_$x_ = () => {
                         }, `${obj.len()}`), preview);
                     }
                     if (obj instanceof CalcitRecord) {
+                        let name = new CalcitSymbol(obj.name.value);
                         if (obj.structRef.impls.length > 0) {
-                            let ret = div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, span({}, "%{}"), span({ marginLeft: "6px" }, embedObject(obj.structRef.impls[0])), span({ marginLeft: "6px" }, embedObject(obj.name)), span({ marginLeft: "6px" }, `...`));
+                            let ret = div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, span({}, "%{}"), span({ marginLeft: "6px" }, embedObject(obj.structRef.impls[0])), span({ marginLeft: "6px" }, embedObject(name)), span({ marginLeft: "6px" }, `...`));
                             return ret;
                         }
                         else {
-                            let ret = div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, `%{} ${obj.name} ...`);
+                            let ret = div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, "%{} ", embedObject(name), " ...");
                             return ret;
                         }
                     }
+                    if (obj instanceof CalcitStruct) {
+                        return div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, "%struct ", embedObject(new CalcitSymbol(obj.name.value)), " ...");
+                    }
+                    if (obj instanceof CalcitEnum) {
+                        return div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, "%enum ", embedObject(new CalcitSymbol(obj.prototype.name.value)), " ...");
+                    }
                     if (obj instanceof CalcitTuple) {
                         if (obj.impls.length > 0) {
                             let ret = div({ marginRight: "16px" }, div({ display: "inline-block", color: hsl(300, 100, 40) }, "%::"), div({ marginLeft: "6px", display: "inline-block" }, embedObject(obj.impls[0])), div({ marginLeft: "6px", display: "inline-block" }, embedObject(obj.tag)));
@@ -200,6 +209,9 @@ export let load_console_formatter_$x_ = () => {
                     if (obj instanceof CalcitRecord) {
                         return obj.fields.length > 0;
                     }
+                    if (obj instanceof CalcitStruct || obj instanceof CalcitEnum) {
+                        return obj instanceof CalcitStruct ? obj.fields.length > 0 : obj.prototype.fields.length > 0;
+                    }
                     return false;
                 },
                 body: (obj, config) => {
@@ -255,6 +267,20 @@ export let load_console_formatter_$x_ = () => {
                         }
                         return ret;
                     }
+                    if (obj instanceof CalcitStruct) {
+                        let ret = table({ color: hsl(280, 80, 60), borderLeft: "1px solid #eee" });
+                        for (let idx = 0; idx < obj.fields.length; idx++) {
+                            ret.push(tr({}, td({ paddingLeft: "8px", verticalAlign: "top", whiteSpace: "pre", minWidth: "40px" }, embedObject(obj.fields[idx])), td({ paddingLeft: "8px" }, embedObject(obj.fieldTypes[idx]))));
+                        }
+                        return ret;
+                    }
+                    if (obj instanceof CalcitEnum) {
+                        let ret = table({ color: hsl(280, 80, 60), borderLeft: "1px solid #eee" });
+                        for (let idx = 0; idx < obj.prototype.fields.length; idx++) {
+                            ret.push(tr({}, td({ paddingLeft: "8px", verticalAlign: "top", whiteSpace: "pre", minWidth: "40px" }, embedObject(obj.prototype.fields[idx])), td({ paddingLeft: "8px" }, embedObject(obj.prototype.values[idx]))));
+                        }
+                        return ret;
+                    }
                     return null;
                 },
             },

package/lib/js-enum.mjs

@@ -24,6 +24,6 @@ export class CalcitEnum {
         return new CalcitEnum(this.prototype.withImpls(nextImpls));
     }
     toString() {
-        return `(%enum :${this.prototype.name.value})`;
+        return `(%enum '${this.prototype.name.value})`;
     }
 }

package/lib/js-record.mjs

@@ -64,7 +64,7 @@ export class CalcitRecord {
     }
     toString(disableJsDataWarning = false) {
         // Optimize string building using array join instead of concatenation
-        const parts = ["(%{} ", this.name.toString()];
+        const parts = ["(%{} '", this.name.value];
         for (let idx = 0; idx < this.fields.length; idx++) {
             parts.push(" (", this.fields[idx].toString(), " ", toString(this.values[idx], true, disableJsDataWarning), ")");
         }

package/lib/js-struct.mjs

@@ -24,7 +24,7 @@ export class CalcitStruct {
         if (this.fields.length !== this.fieldTypes.length) {
             throw new Error("CalcitStruct: fields and fieldTypes length mismatch");
         }
-        const parts = ["(%struct :", this.name.value];
+        const parts = ["(%struct '", this.name.value];
         for (let idx = 0; idx < this.fields.length; idx++) {
             const field = this.fields[idx];
             const fieldType = this.fieldTypes[idx];

package/lib/package.json

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

package/package.json

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

package/ts-src/custom-formatter.mts

@@ -3,6 +3,8 @@ import { CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
 import { CalcitRef } from "./js-ref.mjs";
 
 import { CalcitRecord } from "./js-record.mjs";
+import { CalcitStruct } from "./js-struct.mjs";
+import { CalcitEnum } from "./js-enum.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitSet } from "./js-set.mjs";
@@ -180,20 +182,42 @@ export let load_console_formatter_$x_ = () => {
             );
           }
           if (obj instanceof CalcitRecord) {
+            let name = new CalcitSymbol(obj.name.value);
             if (obj.structRef.impls.length > 0) {
               let ret: any[] = div(
                 { color: hsl(280, 80, 60, 0.4), maxWidth: "100%" },
                 span({}, "%{}"),
                 span({ marginLeft: "6px" }, embedObject(obj.structRef.impls[0])),
-                span({ marginLeft: "6px" }, embedObject(obj.name)),
+                span({ marginLeft: "6px" }, embedObject(name)),
                 span({ marginLeft: "6px" }, `...`)
               );
               return ret;
             } else {
-              let ret: any[] = div({ color: hsl(280, 80, 60, 0.4), maxWidth: "100%" }, `%{} ${obj.name} ...`);
+              let ret: any[] = div(
+                { color: hsl(280, 80, 60, 0.4), maxWidth: "100%" },
+                "%{} ",
+                embedObject(name),
+                " ..."
+              );
               return ret;
             }
           }
+          if (obj instanceof CalcitStruct) {
+            return div(
+              { color: hsl(280, 80, 60, 0.4), maxWidth: "100%" },
+              "%struct ",
+              embedObject(new CalcitSymbol(obj.name.value)),
+              " ..."
+            );
+          }
+          if (obj instanceof CalcitEnum) {
+            return div(
+              { color: hsl(280, 80, 60, 0.4), maxWidth: "100%" },
+              "%enum ",
+              embedObject(new CalcitSymbol(obj.prototype.name.value)),
+              " ..."
+            );
+          }
           if (obj instanceof CalcitTuple) {
             if (obj.impls.length > 0) {
               let ret: any[] = div(
@@ -255,6 +279,9 @@ export let load_console_formatter_$x_ = () => {
           if (obj instanceof CalcitRecord) {
             return obj.fields.length > 0;
           }
+          if (obj instanceof CalcitStruct || obj instanceof CalcitEnum) {
+            return obj instanceof CalcitStruct ? obj.fields.length > 0 : obj.prototype.fields.length > 0;
+          }
           return false;
         },
         body: (obj, config) => {
@@ -330,6 +357,32 @@ export let load_console_formatter_$x_ = () => {
             }
             return ret;
           }
+          if (obj instanceof CalcitStruct) {
+            let ret: any[] = table({ color: hsl(280, 80, 60), borderLeft: "1px solid #eee" });
+            for (let idx = 0; idx < obj.fields.length; idx++) {
+              ret.push(
+                tr(
+                  {},
+                  td({ paddingLeft: "8px", verticalAlign: "top", whiteSpace: "pre", minWidth: "40px" }, embedObject(obj.fields[idx])),
+                  td({ paddingLeft: "8px" }, embedObject(obj.fieldTypes[idx]))
+                )
+              );
+            }
+            return ret;
+          }
+          if (obj instanceof CalcitEnum) {
+            let ret: any[] = table({ color: hsl(280, 80, 60), borderLeft: "1px solid #eee" });
+            for (let idx = 0; idx < obj.prototype.fields.length; idx++) {
+              ret.push(
+                tr(
+                  {},
+                  td({ paddingLeft: "8px", verticalAlign: "top", whiteSpace: "pre", minWidth: "40px" }, embedObject(obj.prototype.fields[idx])),
+                  td({ paddingLeft: "8px" }, embedObject(obj.prototype.values[idx]))
+                )
+              );
+            }
+            return ret;
+          }
 
           return null;
         },

package/ts-src/js-enum.mts

@@ -31,6 +31,6 @@ export class CalcitEnum {
   }
 
   toString(): string {
-    return `(%enum :${this.prototype.name.value})`;
+    return `(%enum '${this.prototype.name.value})`;
   }
 }

package/ts-src/js-record.mts

@@ -70,7 +70,7 @@ export class CalcitRecord {
   }
   toString(disableJsDataWarning: boolean = false): string {
     // Optimize string building using array join instead of concatenation
-    const parts = ["(%{} ", this.name.toString()];
+    const parts = ["(%{} '", this.name.value];
     for (let idx = 0; idx < this.fields.length; idx++) {
       parts.push(" (", this.fields[idx].toString(), " ", toString(this.values[idx], true, disableJsDataWarning), ")");
     }

package/ts-src/js-struct.mts

@@ -33,7 +33,7 @@ export class CalcitStruct {
     if (this.fields.length !== this.fieldTypes.length) {
       throw new Error("CalcitStruct: fields and fieldTypes length mismatch");
     }
-    const parts: string[] = ["(%struct :", this.name.value];
+    const parts: string[] = ["(%struct '", this.name.value];
     for (let idx = 0; idx < this.fields.length; idx++) {
       const field = this.fields[idx];
       const fieldType = this.fieldTypes[idx];