@calcit/procs 0.8.48 → 0.8.50

package/lib/calcit-data.mjs

@@ -1,6 +1,7 @@
 import { overwriteHashGenerator, valueHash, mergeValueHash } from "@calcit/ternary-tree";
 import { overwriteComparator } from "@calcit/ternary-tree";
 import { overwriteMapComparator } from "./js-map.mjs";
+import { disableListStructureCheck } from "@calcit/ternary-tree";
 import { CalcitRecord, fieldsEqual } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { _$n_compare } from "./js-primes.mjs";
@@ -476,22 +477,24 @@ export let _$n__$e_ = (x, y) => {
         return false;
     }
     if (tx === "string") {
-        return x === y;
+        // already checked above
+        return false;
     }
     if (tx === "boolean") {
-        return x === y;
+        // already checked above
+        return false;
     }
     if (tx === "number") {
-        return x === y;
+        // already checked above
+        return false;
     }
     if (tx === "function") {
         // comparing functions by reference
         return x === y;
     }
     if (x instanceof CalcitTag) {
-        if (y instanceof CalcitTag) {
-            return x === y;
-        }
+        // comparing tags by reference
+        // already checked above
         return false;
     }
     if (x instanceof CalcitSymbol) {
@@ -618,3 +621,5 @@ export let _$n__$e_ = (x, y) => {
 overwriteComparator(_$n__$e_);
 overwriteMapComparator(_$n__$e_);
 overwriteSetComparator(_$n__$e_);
+/** special trick for disabling ternary tree list check */
+export let disable_list_structure_check_$x_ = disableListStructureCheck;

package/lib/calcit.procs.mjs

@@ -383,10 +383,9 @@ export let reset_$x_ = (a, v) => {
     }
     let prev = a.value;
     a.value = v;
-    for (let k in a.listeners) {
-        let f = a.listeners.get(k);
+    a.listeners.forEach((f) => {
         f(v, prev);
-    }
+    });
     return null;
 };
 export let add_watch = (a, k, f) => {
@@ -1225,28 +1224,40 @@ export function invoke_method_closure(p) {
 function lookup_class(obj) {
     let klass;
     let tag;
-    if (obj == null) {
-        tag = "&core-nil-class";
-        klass = calcit_builtin_classes.nil;
+    if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
+        tag = "&core-list-class";
+        klass = calcit_builtin_classes.list;
     }
-    else if (obj instanceof CalcitTuple) {
+    else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
+        tag = "&core-map-class";
+        klass = calcit_builtin_classes.map;
+    }
+    else if (obj instanceof CalcitRecord) {
         if (obj.klass instanceof CalcitRecord) {
-            tag = obj.tag.toString();
+            tag = obj.name.toString();
             klass = obj.klass;
         }
         else {
             throw new Error("Method invoking expected a record as class");
         }
     }
-    else if (obj instanceof CalcitRecord) {
+    else if (obj instanceof CalcitTuple) {
         if (obj.klass instanceof CalcitRecord) {
-            tag = obj.name.toString();
+            tag = obj.tag.toString();
             klass = obj.klass;
         }
         else {
             throw new Error("Method invoking expected a record as class");
         }
     }
+    else if (obj instanceof CalcitSet) {
+        tag = "&core-set-class";
+        klass = calcit_builtin_classes.set;
+    }
+    else if (obj == null) {
+        tag = "&core-nil-class";
+        klass = calcit_builtin_classes.nil;
+    }
     else if (typeof obj === "number") {
         tag = "&core-number-class";
         klass = calcit_builtin_classes.number;
@@ -1259,18 +1270,6 @@ function lookup_class(obj) {
         tag = "&core-fn-class";
         klass = calcit_builtin_classes.fn;
     }
-    else if (obj instanceof CalcitSet) {
-        tag = "&core-set-class";
-        klass = calcit_builtin_classes.set;
-    }
-    else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
-        tag = "&core-list-class";
-        klass = calcit_builtin_classes.list;
-    }
-    else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
-        tag = "&core-map-class";
-        klass = calcit_builtin_classes.map;
-    }
     else {
         return null;
     }

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@calcit/procs",
-    "version": "0.8.48",
+    "version": "0.8.50",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
         "@types/node": "^20.11.28",
@@ -21,7 +21,7 @@
         "url": "https://github.com/calcit-lang/calcit"
     },
     "dependencies": {
-        "@calcit/ternary-tree": "0.0.23",
+        "@calcit/ternary-tree": "0.0.24",
         "@cirru/parser.ts": "^0.0.6",
         "@cirru/writer.ts": "^0.1.5"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.48",
+  "version": "0.8.50",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.11.28",
@@ -21,7 +21,7 @@
     "url": "https://github.com/calcit-lang/calcit"
   },
   "dependencies": {
-    "@calcit/ternary-tree": "0.0.23",
+    "@calcit/ternary-tree": "0.0.24",
     "@cirru/parser.ts": "^0.0.6",
     "@cirru/writer.ts": "^0.1.5"
   }

package/ts-src/calcit-data.mts

@@ -1,6 +1,7 @@
 import { Hash, overwriteHashGenerator, valueHash, mergeValueHash } from "@calcit/ternary-tree";
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { overwriteMapComparator } from "./js-map.mjs";
+import { disableListStructureCheck } from "@calcit/ternary-tree";
 
 import { CalcitRecord, fieldsEqual } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
@@ -518,22 +519,24 @@ export let _$n__$e_ = (x: CalcitValue, y: CalcitValue): boolean => {
   }
 
   if (tx === "string") {
-    return (x as string) === (y as string);
+    // already checked above
+    return false;
   }
   if (tx === "boolean") {
-    return (x as boolean) === (y as boolean);
+    // already checked above
+    return false;
   }
   if (tx === "number") {
-    return x === y;
+    // already checked above
+    return false;
   }
   if (tx === "function") {
     // comparing functions by reference
     return x === y;
   }
   if (x instanceof CalcitTag) {
-    if (y instanceof CalcitTag) {
-      return x === y;
-    }
+    // comparing tags by reference
+    // already checked above
     return false;
   }
   if (x instanceof CalcitSymbol) {
@@ -660,3 +663,6 @@ export let _$n__$e_ = (x: CalcitValue, y: CalcitValue): boolean => {
 overwriteComparator(_$n__$e_);
 overwriteMapComparator(_$n__$e_);
 overwriteSetComparator(_$n__$e_);
+
+/** special trick for disabling ternary tree list check */
+export let disable_list_structure_check_$x_ = disableListStructureCheck;

package/ts-src/calcit.procs.mts

@@ -437,10 +437,9 @@ export let reset_$x_ = (a: CalcitRef, v: CalcitValue): null => {
   }
   let prev = a.value;
   a.value = v;
-  for (let k in a.listeners) {
-    let f = a.listeners.get(k);
+  a.listeners.forEach((f) => {
     f(v, prev);
-  }
+  });
   return null;
 };
 
@@ -1328,23 +1327,32 @@ export function invoke_method_closure(p: string) {
 function lookup_class(obj: CalcitValue): [CalcitRecord, string] {
   let klass: CalcitRecord;
   let tag: string;
-  if (obj == null) {
-    tag = "&core-nil-class";
-    klass = calcit_builtin_classes.nil;
-  } else if (obj instanceof CalcitTuple) {
+  if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
+    tag = "&core-list-class";
+    klass = calcit_builtin_classes.list;
+  } else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
+    tag = "&core-map-class";
+    klass = calcit_builtin_classes.map;
+  } else if (obj instanceof CalcitRecord) {
     if (obj.klass instanceof CalcitRecord) {
-      tag = obj.tag.toString();
+      tag = obj.name.toString();
       klass = obj.klass;
     } else {
       throw new Error("Method invoking expected a record as class");
     }
-  } else if (obj instanceof CalcitRecord) {
+  } else if (obj instanceof CalcitTuple) {
     if (obj.klass instanceof CalcitRecord) {
-      tag = obj.name.toString();
+      tag = obj.tag.toString();
       klass = obj.klass;
     } else {
       throw new Error("Method invoking expected a record as class");
     }
+  } else if (obj instanceof CalcitSet) {
+    tag = "&core-set-class";
+    klass = calcit_builtin_classes.set;
+  } else if (obj == null) {
+    tag = "&core-nil-class";
+    klass = calcit_builtin_classes.nil;
   } else if (typeof obj === "number") {
     tag = "&core-number-class";
     klass = calcit_builtin_classes.number;
@@ -1354,15 +1362,6 @@ function lookup_class(obj: CalcitValue): [CalcitRecord, string] {
   } else if (typeof obj === "function") {
     tag = "&core-fn-class";
     klass = calcit_builtin_classes.fn;
-  } else if (obj instanceof CalcitSet) {
-    tag = "&core-set-class";
-    klass = calcit_builtin_classes.set;
-  } else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
-    tag = "&core-list-class";
-    klass = calcit_builtin_classes.list;
-  } else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
-    tag = "&core-map-class";
-    klass = calcit_builtin_classes.map;
   } else {
     return null;
   }