@calcit/procs 0.6.0-a1 → 0.6.0

package/lib/calcit-data.mjs

@@ -8,6 +8,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 "@cirru/writer.ts";
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";
 let keywordIdx = 0;
@@ -166,6 +167,7 @@ let defaultHash_set = valueHash("set:");
 let defaultHash_list = valueHash("list:");
 let defaultHash_map = valueHash("map:");
 let defaultHash_record = valueHash("record:");
+let defaultHash_cirru_quote = valueHash("cirru-quote:");
 let defaultHash_unknown = valueHash("unknown:");
 let fnHashCounter = 0;
 let jsObjectHashCounter = 0;
@@ -280,6 +282,11 @@ export let hashFunction = (x) => {
         x.cachedHash = base;
         return base;
     }
+    if (x instanceof CalcitCirruQuote) {
+        let base = defaultHash_cirru_quote;
+        base = hashCirru(base, x.value);
+        return base;
+    }
     console.warn(`[warn] calcit-js has no method for hashing this: ${x}`);
     // currently we use dirty solution here to generate a custom hash
     // probably happening in .to-pairs of maps, putting a js object into a set
@@ -290,6 +297,18 @@ export let hashFunction = (x) => {
     x[calcit_dirty_hash_key] = hashJsObject;
     return hashJsObject;
 };
+/// traverse Cirru tree to make unique hash
+let hashCirru = (base, x) => {
+    if (typeof x === "string") {
+        return mergeValueHash(base, hashFunction(x));
+    }
+    else {
+        for (let idx = 0; idx < x.length; idx++) {
+            base = mergeValueHash(base, hashCirru(base, x[idx]));
+        }
+        return base;
+    }
+};
 // Dirty code to change ternary-tree behavior
 overwriteHashGenerator(hashFunction);
 export let toString = (x, escaped, disableJsDataWarning = false) => {

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.6.0-a1";
+export const calcit_version = "0.6.0";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import "./js-primes.mjs";
@@ -1322,6 +1322,9 @@ export let _$n_buffer = (...xs) => {
 export let _$n_hash = (x) => {
     return hashFunction(x);
 };
+export let _$n_cirru_quote_$o_to_list = (x) => {
+    return x.toList();
+};
 // special procs have to be defined manually
 export let reduce = foldl;
 let unavailableProc = (...xs) => {

package/lib/js-cirru.mjs

@@ -14,6 +14,9 @@ export class CalcitCirruQuote {
     toString() {
         return `(cirru-quote ${JSON.stringify(this.value)})`;
     }
+    toList() {
+        return to_calcit_data(this.value, true);
+    }
 }
 export let format_cirru = (data, useInline) => {
     if (data instanceof CalcitCirruQuote) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@calcit/procs",
-  "version": "0.6.0-a1",
+  "version": "0.6.0",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.0.6",
     "typescript": "^4.7.4"
   },
   "scripts": {

package/ts-src/calcit-data.mts

@@ -10,6 +10,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 { CirruWriterNode } from "@cirru/writer.ts";
 
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";
@@ -193,6 +194,7 @@ let defaultHash_set = valueHash("set:");
 let defaultHash_list = valueHash("list:");
 let defaultHash_map = valueHash("map:");
 let defaultHash_record = valueHash("record:");
+let defaultHash_cirru_quote = valueHash("cirru-quote:");
 
 let defaultHash_unknown = valueHash("unknown:");
 
@@ -312,6 +314,11 @@ export let hashFunction = (x: CalcitValue): Hash => {
     x.cachedHash = base;
     return base;
   }
+  if (x instanceof CalcitCirruQuote) {
+    let base = defaultHash_cirru_quote;
+    base = hashCirru(base, x.value);
+    return base;
+  }
   console.warn(`[warn] calcit-js has no method for hashing this: ${x}`);
   // currently we use dirty solution here to generate a custom hash
   // probably happening in .to-pairs of maps, putting a js object into a set
@@ -323,6 +330,18 @@ export let hashFunction = (x: CalcitValue): Hash => {
   return hashJsObject;
 };
 
+/// traverse Cirru tree to make unique hash
+let hashCirru = (base: number, x: CirruWriterNode) => {
+  if (typeof x === "string") {
+    return mergeValueHash(base, hashFunction(x));
+  } else {
+    for (let idx = 0; idx < x.length; idx++) {
+      base = mergeValueHash(base, hashCirru(base, x[idx]));
+    }
+    return base;
+  }
+};
+
 // Dirty code to change ternary-tree behavior
 overwriteHashGenerator(hashFunction);
 

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.6.0-a1";
+export const calcit_version = "0.6.0";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -37,7 +37,7 @@ import { CalcitList, CalcitSliceList, foldl } from "./js-list.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet } from "./js-set.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
-import { to_calcit_data, extract_cirru_edn } from "./js-cirru.mjs";
+import { to_calcit_data, extract_cirru_edn, CalcitCirruQuote } from "./js-cirru.mjs";
 
 let inNodeJs = typeof process !== "undefined" && process?.release?.name === "node";
 
@@ -1419,6 +1419,10 @@ export let _$n_hash = (x: CalcitValue): number => {
   return hashFunction(x);
 };
 
+export let _$n_cirru_quote_$o_to_list = (x: CalcitCirruQuote): CalcitValue => {
+  return x.toList();
+};
+
 // special procs have to be defined manually
 export let reduce = foldl;
 

package/ts-src/js-cirru.mts

@@ -19,6 +19,9 @@ export class CalcitCirruQuote {
   toString(): string {
     return `(cirru-quote ${JSON.stringify(this.value)})`;
   }
+  toList(): CalcitValue {
+    return to_calcit_data(this.value, true);
+  }
 }
 
 export let format_cirru = (data: CalcitCirruQuote | CalcitList, useInline: boolean): string => {