@calcit/procs 0.9.5 → 0.9.7

package/lib/calcit-data.mjs

@@ -9,6 +9,7 @@ import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitSet, overwriteSetComparator } from "./js-set.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
 import { CalcitCirruQuote, cirru_deep_equal } from "./js-cirru.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";
 let tagIdx = 0;
@@ -82,17 +83,6 @@ export let tipNestedCalcitData = (x) => {
     }
     return x.toString();
 };
-export class CalcitRef {
-    constructor(x, path) {
-        this.value = x;
-        this.path = path;
-        this.listeners = new Map();
-        this.cachedHash = null;
-    }
-    toString() {
-        return `(&ref ${this.value.toString()})`;
-    }
-}
 export let getStringName = (x) => {
     if (typeof x === "string") {
         return x;

package/lib/calcit.procs.mjs

@@ -3,7 +3,8 @@ export const calcit_version = pkg.version;
 export const calcit_package_json = pkg;
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
-import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
+import { CalcitSymbol, CalcitTag, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction } from "./calcit-data.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 export * from "./calcit-data.mjs";
 export * from "./js-record.mjs";
@@ -120,12 +121,7 @@ export let defatom = (path, x) => {
     refsRegistry.set(path, v);
     return v;
 };
-var atomCounter = 0;
-export let atom = (x) => {
-    atomCounter = atomCounter + 1;
-    let v = new CalcitRef(x, `atom-${atomCounter}`);
-    return v;
-};
+export { atom } from "./js-ref.mjs";
 export let peekDefatom = (path) => {
     return refsRegistry.get(path);
 };

package/lib/custom-formatter.mjs

@@ -1,5 +1,6 @@
 import { isLiteral } from "./js-primes.mjs";
-import { CalcitRef, CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
+import { CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";

package/lib/js-cirru.mjs

@@ -4,9 +4,11 @@ import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet } from "./js-set.mjs";
-import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, newTag } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRecur, newTag } from "./calcit-data.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 import { deepEqual } from "@calcit/ternary-tree/lib/utils.mjs";
+import { atom } from "./js-ref.mjs";
 export class CalcitCirruQuote {
     constructor(value) {
         if (value == null) {
@@ -168,6 +170,9 @@ export let to_cirru_edn = (x) => {
             throw new Error(`Unsupported tag for EDN: ${x.tag}`);
         }
     }
+    if (x instanceof CalcitRef) {
+        return ["atom", to_cirru_edn(x.value)];
+    }
     console.error(x);
     throw new Error("Unexpected data to to-cirru-edn");
 };
@@ -334,6 +339,12 @@ export let extract_cirru_edn = (x, options) => {
                 .filter(notComment)
                 .map((x) => extract_cirru_edn(x, options)), undefined);
         }
+        if (x[0] === "atom") {
+            if (x.length !== 2) {
+                throw new Error(`atom expects 1 argument, got: ${x}`);
+            }
+            return atom(extract_cirru_edn(x[1], options));
+        }
     }
     console.error(x);
     throw new Error(`Unexpected data from EDN: ${x}`);

package/lib/js-primes.mjs

@@ -1,4 +1,5 @@
-import { CalcitTag, CalcitSymbol, CalcitRef, CalcitRecur } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRecur } from "./calcit-data.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";

package/lib/js-ref.mjs

@@ -0,0 +1,17 @@
+export class CalcitRef {
+    constructor(x, path) {
+        this.value = x;
+        this.path = path;
+        this.listeners = new Map();
+        this.cachedHash = null;
+    }
+    toString() {
+        return `(&ref ${this.value.toString()})`;
+    }
+}
+var atomCounter = 0;
+export let atom = (x) => {
+    atomCounter = atomCounter + 1;
+    let v = new CalcitRef(x, `atom-${atomCounter}`);
+    return v;
+};

package/lib/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@calcit/procs",
-    "version": "0.9.5",
+    "version": "0.9.7",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
-        "@types/node": "^22.1.0",
-        "typescript": "^5.5.4"
+        "@types/node": "^22.10.5",
+        "typescript": "^5.7.2"
     },
     "scripts": {
         "compile": "rm -rfv lib/* && tsc",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@calcit/procs",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^22.1.0",
-    "typescript": "^5.5.4"
+    "@types/node": "^22.10.5",
+    "typescript": "^5.7.2"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",

package/ts-src/calcit-data.mts

@@ -12,6 +12,7 @@ import { CalcitSet, overwriteSetComparator } from "./js-set.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
 import { CalcitCirruQuote, cirru_deep_equal } from "./js-cirru.mjs";
 import { CirruWriterNode } from "@cirru/writer.ts";
+import { CalcitRef } from "./js-ref.mjs";
 
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";
@@ -100,22 +101,6 @@ export let tipNestedCalcitData = (x: CalcitValue): string => {
   return x.toString();
 };
 
-export class CalcitRef {
-  value: CalcitValue;
-  path: string;
-  listeners: Map<CalcitValue, CalcitFn>;
-  cachedHash: Hash;
-  constructor(x: CalcitValue, path: string) {
-    this.value = x;
-    this.path = path;
-    this.listeners = new Map();
-    this.cachedHash = null;
-  }
-  toString(): string {
-    return `(&ref ${this.value.toString()})`;
-  }
-}
-
 export type CalcitFn = (...xs: CalcitValue[]) => CalcitValue;
 
 export let getStringName = (x: CalcitValue): string => {

package/ts-src/calcit.procs.mts

@@ -7,21 +7,9 @@ import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 
 import { CalcitValue } from "./js-primes.mjs";
-import {
-  CalcitSymbol,
-  CalcitTag,
-  CalcitRef,
-  CalcitFn,
-  CalcitRecur,
-  newTag,
-  refsRegistry,
-  toString,
-  getStringName,
-  to_js_data,
-  _$n__$e_,
-  hashFunction,
-} from "./calcit-data.mjs";
+import { CalcitSymbol, CalcitTag, CalcitFn, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction } from "./calcit-data.mjs";
 
+import { CalcitRef } from "./js-ref.mjs";
 import { fieldsEqual, CalcitRecord } from "./js-record.mjs";
 
 export * from "./calcit-data.mjs";
@@ -148,13 +136,7 @@ export let defatom = (path: string, x: CalcitValue): CalcitValue => {
   return v;
 };
 
-var atomCounter = 0;
-
-export let atom = (x: CalcitValue): CalcitValue => {
-  atomCounter = atomCounter + 1;
-  let v = new CalcitRef(x, `atom-${atomCounter}`);
-  return v;
-};
+export { atom } from "./js-ref.mjs";
 
 export let peekDefatom = (path: string): CalcitRef => {
   return refsRegistry.get(path);

package/ts-src/custom-formatter.mts

@@ -1,5 +1,6 @@
 import { CalcitValue, isLiteral } from "./js-primes.mjs";
-import { CalcitRef, CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
+import { CalcitSymbol, CalcitTag } from "./calcit-data.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";

package/ts-src/js-cirru.mts

@@ -6,9 +6,11 @@ import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet } from "./js-set.mjs";
-import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, newTag } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRecur, newTag } from "./calcit-data.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 import { deepEqual } from "@calcit/ternary-tree/lib/utils.mjs";
+import { atom } from "./js-ref.mjs";
 
 type CirruEdnFormat = string | CirruEdnFormat[];
 
@@ -165,6 +167,9 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
       throw new Error(`Unsupported tag for EDN: ${x.tag}`);
     }
   }
+  if (x instanceof CalcitRef) {
+    return ["atom", to_cirru_edn(x.value)];
+  }
   console.error(x);
   throw new Error("Unexpected data to to-cirru-edn");
 };
@@ -335,6 +340,12 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
         undefined
       );
     }
+    if (x[0] === "atom") {
+      if (x.length !== 2) {
+        throw new Error(`atom expects 1 argument, got: ${x}`);
+      }
+      return atom(extract_cirru_edn(x[1], options));
+    }
   }
   console.error(x);
   throw new Error(`Unexpected data from EDN: ${x}`);

package/ts-src/js-primes.mts

@@ -1,4 +1,5 @@
-import { CalcitTag, CalcitSymbol, CalcitRef, CalcitFn, CalcitRecur } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitFn, CalcitRecur } from "./calcit-data.mjs";
+import { CalcitRef } from "./js-ref.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";

package/ts-src/js-ref.mts

@@ -0,0 +1,27 @@
+import { Hash } from "@calcit/ternary-tree";
+import type { CalcitFn } from "./calcit-data.mjs";
+import type { CalcitValue } from "./js-primes.mts";
+
+export class CalcitRef {
+  value: CalcitValue;
+  path: string;
+  listeners: Map<CalcitValue, CalcitFn>;
+  cachedHash: Hash;
+  constructor(x: CalcitValue, path: string) {
+    this.value = x;
+    this.path = path;
+    this.listeners = new Map();
+    this.cachedHash = null;
+  }
+  toString(): string {
+    return `(&ref ${this.value.toString()})`;
+  }
+}
+
+var atomCounter = 0;
+
+export let atom = (x: CalcitValue): CalcitValue => {
+  atomCounter = atomCounter + 1;
+  let v = new CalcitRef(x, `atom-${atomCounter}`);
+  return v;
+};