@calcit/procs 0.8.47 → 0.8.49

package/lib/calcit-data.mjs

@@ -258,7 +258,8 @@ export let hashFunction = (x) => {
         let pairs = x.pairs();
         pairs.sort((a, b) => _$n_compare(a[0], b[0]));
         for (let idx = 0; idx < pairs.length; idx++) {
-            let [k, v] = pairs[idx];
+            let k = pairs[idx][0];
+            let v = pairs[idx][1];
             base = mergeValueHash(base, hashFunction(k));
             base = mergeValueHash(base, hashFunction(v));
         }
@@ -270,7 +271,8 @@ export let hashFunction = (x) => {
         let pairs = x.pairs();
         pairs.sort((a, b) => _$n_compare(a[0], b[0]));
         for (let idx = 0; idx < pairs.length; idx++) {
-            let [k, v] = pairs[idx];
+            let k = pairs[idx][0];
+            let v = pairs[idx][1];
             base = mergeValueHash(base, hashFunction(k));
             base = mergeValueHash(base, hashFunction(v));
         }
@@ -421,7 +423,8 @@ export let to_js_data = (x, addColon = false) => {
         let result = {};
         let pairs = x.pairs();
         for (let idx = 0; idx < pairs.length; idx++) {
-            let [k, v] = pairs[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);
         }
@@ -473,22 +476,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) {
@@ -527,7 +532,8 @@ export let _$n__$e_ = (x, y) => {
             }
             let pairs = x.pairs();
             for (let idx = 0; idx < pairs.length; idx++) {
-                let [k, v] = pairs[idx];
+                let k = pairs[idx][0];
+                let v = pairs[idx][1];
                 if (!y.contains(k)) {
                     return false;
                 }

package/lib/calcit.procs.mjs

@@ -383,9 +383,9 @@ export let reset_$x_ = (a, v) => {
     }
     let prev = a.value;
     a.value = v;
-    for (let [k, f] of a.listeners) {
+    a.listeners.forEach((f) => {
         f(v, prev);
-    }
+    });
     return null;
 };
 export let add_watch = (a, k, f) => {
@@ -687,7 +687,8 @@ export let _$n_merge = (a, b) => {
             }
             let pairs = b.pairs();
             for (let idx = 0; idx < pairs.length; idx++) {
-                let [k, v] = pairs[idx];
+                let k = pairs[idx][0];
+                let v = pairs[idx][1];
                 let field;
                 if (k instanceof CalcitTag) {
                     field = k;
@@ -1223,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;
@@ -1257,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;
     }
@@ -1279,7 +1280,8 @@ export function invoke_method(p, obj, ...args) {
     if (pair == null) {
         throw new Error(`No class for ${obj?.toString() || JSON.stringify(obj)} to lookup .${p}`);
     }
-    let [klass, tag] = pair;
+    let klass = pair[0];
+    let tag = pair[1];
     let method = klass.getOrNil(p);
     if (method == null) {
         throw new Error(`No method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd) => fd.value).join(" ")}`);

package/lib/custom-formatter.mjs

@@ -116,7 +116,10 @@ export let load_console_formatter_$x_ = () => {
                     if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
                         let preview = "";
                         let hasCollection = false;
-                        for (let [k, v] of obj.pairs()) {
+                        let pairs = obj.pairs();
+                        for (let idx = 0; idx < pairs.length; idx++) {
+                            let k = pairs[idx][0];
+                            let v = pairs[idx][1];
                             preview += " ";
                             if (isLiteral(k) && isLiteral(v)) {
                                 preview += `(${saveString(k)} ${saveString(v)})`;
@@ -243,7 +246,8 @@ export let load_console_formatter_$x_ = () => {
                             }
                         });
                         for (let idx = 0; idx < pairs.length; idx++) {
-                            let [k, v] = pairs[idx];
+                            let k = pairs[idx][0];
+                            let v = pairs[idx][1];
                             ret.push(tr({}, td({ paddingLeft: "8px", verticalAlign: "top", whiteSpace: "nowrap", minWidth: "40px" }, embedObject(k)), td({ paddingLeft: "8px" }, embedObject(v))));
                         }
                         return ret;

package/lib/js-cirru.mjs

@@ -124,7 +124,8 @@ export let to_cirru_edn = (x) => {
             }
         });
         for (let idx = 0; idx < pairs_buffer.length; idx++) {
-            let [k, v] = pairs_buffer[idx];
+            let k = pairs_buffer[idx][0];
+            let v = pairs_buffer[idx][1];
             buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);
         }
         return buffer;

package/lib/js-map.mjs

@@ -50,7 +50,8 @@ export class CalcitMap {
         let itemsCode = "";
         let pairs = this.pairs();
         for (let idx = 0; idx < pairs.length; idx++) {
-            let [k, v] = pairs[idx];
+            let k = pairs[idx][0];
+            let v = pairs[idx][1];
             if (shorter) {
                 let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
                 let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
@@ -155,7 +156,10 @@ export class CalcitMap {
     }
     /** detecthing in custom formatter */
     nestedDataInChildren() {
-        for (let [k, v] of this.pairs()) {
+        let pairs = this.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let k = pairs[idx][0];
+            let v = pairs[idx][1];
             if (!isLiteral(k) || !isLiteral(v)) {
                 return true;
             }
@@ -247,7 +251,8 @@ export class CalcitSliceMap {
         let itemsCode = "";
         let pairs = this.pairs();
         for (let idx = 0; idx < pairs.length; idx++) {
-            let [k, v] = pairs[idx];
+            let k = pairs[idx][0];
+            let v = pairs[idx][1];
             if (shorter) {
                 let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
                 let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
@@ -356,7 +361,10 @@ export class CalcitSliceMap {
     }
     /** detecthing in custom formatter */
     nestedDataInChildren() {
-        for (let [k, v] of this.pairs()) {
+        let pairs = this.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let k = pairs[idx][0];
+            let v = pairs[idx][1];
             if (!isLiteral(k) || !isLiteral(v)) {
                 return true;
             }

package/lib/js-record.mjs

@@ -182,7 +182,8 @@ export let _$n_record_$o_from_map = (proto, data) => {
         let pairs_buffer = [];
         let pairs = data.pairs();
         for (let i = 0; i < pairs.length; i++) {
-            let [k, v] = pairs[i];
+            let k = pairs[i][0];
+            let v = pairs[i][1];
             pairs_buffer.push([castTag(k), v]);
         }
         // mutable sort

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@calcit/procs",
-    "version": "0.8.47",
+    "version": "0.8.49",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
         "@types/node": "^20.11.28",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.47",
+  "version": "0.8.49",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.11.28",

package/ts-src/calcit-data.mts

@@ -290,7 +290,8 @@ export let hashFunction = (x: CalcitValue): Hash => {
     let pairs = x.pairs();
     pairs.sort((a, b) => _$n_compare(a[0], b[0]));
     for (let idx = 0; idx < pairs.length; idx++) {
-      let [k, v] = pairs[idx];
+      let k = pairs[idx][0];
+      let v = pairs[idx][1];
       base = mergeValueHash(base, hashFunction(k));
       base = mergeValueHash(base, hashFunction(v));
     }
@@ -303,7 +304,8 @@ export let hashFunction = (x: CalcitValue): Hash => {
     let pairs = x.pairs();
     pairs.sort((a, b) => _$n_compare(a[0], b[0]));
     for (let idx = 0; idx < pairs.length; idx++) {
-      let [k, v] = pairs[idx];
+      let k = pairs[idx][0];
+      let v = pairs[idx][1];
       base = mergeValueHash(base, hashFunction(k));
       base = mergeValueHash(base, hashFunction(v));
     }
@@ -456,7 +458,8 @@ export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
     let result: Record<string, CalcitValue> = {};
     let pairs = x.pairs();
     for (let idx = 0; idx < pairs.length; idx++) {
-      let [k, v] = pairs[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);
     }
@@ -515,22 +518,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) {
@@ -569,7 +574,8 @@ export let _$n__$e_ = (x: CalcitValue, y: CalcitValue): boolean => {
       }
       let pairs = x.pairs();
       for (let idx = 0; idx < pairs.length; idx++) {
-        let [k, v] = pairs[idx];
+        let k = pairs[idx][0];
+        let v = pairs[idx][1];
         if (!y.contains(k)) {
           return false;
         }

package/ts-src/calcit.procs.mts

@@ -437,9 +437,9 @@ export let reset_$x_ = (a: CalcitRef, v: CalcitValue): null => {
   }
   let prev = a.value;
   a.value = v;
-  for (let [k, f] of a.listeners) {
+  a.listeners.forEach((f) => {
     f(v, prev);
-  }
+  });
   return null;
 };
 
@@ -760,7 +760,8 @@ export let _$n_merge = (a: CalcitValue, b: CalcitMap | CalcitSliceMap): CalcitVa
       }
       let pairs = b.pairs();
       for (let idx = 0; idx < pairs.length; idx++) {
-        let [k, v] = pairs[idx];
+        let k = pairs[idx][0];
+        let v = pairs[idx][1];
         let field: CalcitTag;
         if (k instanceof CalcitTag) {
           field = k;
@@ -1326,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;
@@ -1352,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;
   }
@@ -1372,7 +1373,8 @@ export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[
   if (pair == null) {
     throw new Error(`No class for ${obj?.toString() || JSON.stringify(obj)} to lookup .${p}`);
   }
-  let [klass, tag] = pair;
+  let klass = pair[0];
+  let tag = pair[1];
   let method = klass.getOrNil(p);
   if (method == null) {
     throw new Error(`No method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd: CalcitTag) => fd.value).join(" ")}`);

package/ts-src/custom-formatter.mts

@@ -137,7 +137,10 @@ export let load_console_formatter_$x_ = () => {
           if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
             let preview = "";
             let hasCollection = false;
-            for (let [k, v] of obj.pairs()) {
+            let pairs = obj.pairs();
+            for (let idx = 0; idx < pairs.length; idx++) {
+              let k = pairs[idx][0];
+              let v = pairs[idx][1];
               preview += " ";
               if (isLiteral(k) && isLiteral(v)) {
                 preview += `(${saveString(k)} ${saveString(v)})`;
@@ -306,7 +309,8 @@ export let load_console_formatter_$x_ = () => {
               }
             });
             for (let idx = 0; idx < pairs.length; idx++) {
-              let [k, v] = pairs[idx];
+              let k = pairs[idx][0];
+              let v = pairs[idx][1];
               ret.push(
                 tr(
                   {},

package/ts-src/js-cirru.mts

@@ -124,7 +124,8 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
       }
     });
     for (let idx = 0; idx < pairs_buffer.length; idx++) {
-      let [k, v] = pairs_buffer[idx];
+      let k = pairs_buffer[idx][0];
+      let v = pairs_buffer[idx][1];
       buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);
     }
     return buffer;

package/ts-src/js-map.mts

@@ -70,7 +70,8 @@ export class CalcitMap {
     let itemsCode = "";
     let pairs = this.pairs();
     for (let idx = 0; idx < pairs.length; idx++) {
-      let [k, v] = pairs[idx];
+      let k = pairs[idx][0];
+      let v = pairs[idx][1];
       if (shorter) {
         let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
         let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
@@ -177,7 +178,10 @@ export class CalcitMap {
 
   /** detecthing in custom formatter */
   nestedDataInChildren() {
-    for (let [k, v] of this.pairs()) {
+    let pairs = this.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let k = pairs[idx][0];
+      let v = pairs[idx][1];
       if (!isLiteral(k) || !isLiteral(v)) {
         return true;
       }
@@ -267,7 +271,8 @@ export class CalcitSliceMap {
     let itemsCode = "";
     let pairs = this.pairs();
     for (let idx = 0; idx < pairs.length; idx++) {
-      let [k, v] = pairs[idx];
+      let k = pairs[idx][0];
+      let v = pairs[idx][1];
       if (shorter) {
         let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
         let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
@@ -381,7 +386,10 @@ export class CalcitSliceMap {
 
   /** detecthing in custom formatter */
   nestedDataInChildren() {
-    for (let [k, v] of this.pairs()) {
+    let pairs = this.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let k = pairs[idx][0];
+      let v = pairs[idx][1];
       if (!isLiteral(k) || !isLiteral(v)) {
         return true;
       }

package/ts-src/js-record.mts

@@ -188,7 +188,8 @@ export let _$n_record_$o_from_map = (proto: CalcitValue, data: CalcitValue): Cal
     let pairs_buffer: Array<[CalcitTag, CalcitValue]> = [];
     let pairs = data.pairs();
     for (let i = 0; i < pairs.length; i++) {
-      let [k, v] = pairs[i];
+      let k = pairs[i][0];
+      let v = pairs[i][1];
       pairs_buffer.push([castTag(k), v]);
     }
     // mutable sort