@calcit/procs 0.9.16 → 0.9.18

package/README.md

@@ -39,7 +39,7 @@ To use Calcit in GitHub Actions, try [setup-cr](https://github.com/calcit-lang/s
 
 ### Usage
 
-Snippets evaling:
+Snippets evaluating:
 
 ```bash
 cr eval 'range 100'

package/lib/calcit-data.mjs

@@ -97,36 +97,32 @@ export let getStringName = (x) => {
 };
 /** returns -1 when not found */
 export function findInFields(xs, y) {
-    let lower = 0;
-    let upper = xs.length - 1;
-    while (upper - lower > 1) {
-        let pos = (lower + upper) >> 1;
-        let v = xs[pos];
-        if (y.idx < v.idx) {
-            upper = pos - 1;
+    let low = 0;
+    let high = xs.length - 1;
+    while (low <= high) {
+        const mid = Math.floor((low + high) / 2);
+        const midVal = xs[mid];
+        if (midVal.idx < y.idx) {
+            low = mid + 1;
         }
-        else if (y.idx > v.idx) {
-            lower = pos + 1;
+        else if (midVal.idx > y.idx) {
+            high = mid - 1;
         }
         else {
-            return pos;
+            return mid;
         }
     }
-    if (y === xs[lower])
-        return lower;
-    if (y === xs[upper])
-        return upper;
     return -1;
 }
-var tagRegistery = {};
+var tagRegistry = {};
 export let newTag = (content) => {
-    let item = tagRegistery[content];
+    let item = tagRegistry[content];
     if (item != null) {
         return item;
     }
     else {
         let v = new CalcitTag(content);
-        tagRegistery[content] = v;
+        tagRegistry[content] = v;
         return v;
     }
 };
@@ -554,23 +550,30 @@ export let _$n__$e_ = (x, y) => {
                 return false;
             }
             let values = x.values();
+            let yValues = y.values();
+            // Optimize: create a Map for O(1) lookup instead of O(n) iteration
+            let yMap = new Map();
+            for (let idx = 0; idx < yValues.length; idx++) {
+                let yv = yValues[idx];
+                yMap.set(yv, true);
+            }
             for (let idx = 0; idx < values.length; idx++) {
                 let v = values[idx];
                 let found = false;
-                // testing by doing iteration is O(n2), could be slow
-                // but Set::contains does not satisfy here
-                let yValues = y.values();
-                for (let idx = 0; idx < yValues.length; idx++) {
-                    let yv = yValues[idx];
-                    if (_$n__$e_(v, yv)) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (found) {
-                    continue;
+                // First try direct lookup for primitive values
+                if (yMap.has(v)) {
+                    found = true;
                 }
                 else {
+                    // Fallback to deep equality check for complex values
+                    for (let yv of yValues) {
+                        if (_$n__$e_(v, yv)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+                if (!found) {
                     return false;
                 }
             }

package/lib/calcit.procs.mjs

@@ -638,14 +638,10 @@ export let round_$q_ = (a) => {
     return a === Math.round(a);
 };
 export let _$n_str_$o_concat = (a, b) => {
-    let buffer = "";
-    if (a != null) {
-        buffer += toString(a, false);
-    }
-    if (b != null) {
-        buffer += toString(b, false);
-    }
-    return buffer;
+    // Optimize string concatenation by avoiding unnecessary toString calls
+    const aStr = a != null ? toString(a, false) : "";
+    const bStr = b != null ? toString(b, false) : "";
+    return aStr + bStr;
 };
 export let sort = (xs, f) => {
     if (xs == null) {
@@ -837,7 +833,7 @@ export let parse_float = (x) => {
 export let trim = (x, c) => {
     if (c != null) {
         if (c.length !== 1) {
-            throw new Error("Expceted c of a character");
+            throw new Error("Expected c of a character");
         }
         var buffer = x;
         var size = buffer.length;

package/lib/js-cirru.mjs

@@ -280,7 +280,7 @@ export let extract_cirru_edn = (x, options) => {
                     }
                 }
                 else {
-                    throw new Error(`Expected pairs for reocrd, got: ${pair}`);
+                    throw new Error(`Expected pairs for record, got: ${pair}`);
                 }
             });
             entries.sort((a, b) => {

package/lib/js-list.mjs

@@ -313,7 +313,7 @@ export let foldl = function (xs, acc, f) {
         });
         return result;
     }
-    throw new Error("Unknow data for foldl");
+    throw new Error("Unknown data for foldl");
 };
 export let foldl_shortcut = function (xs, acc, v0, f) {
     if (arguments.length !== 4) {
@@ -411,7 +411,7 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
         }
         return v0;
     }
-    throw new Error("Unknow data for foldl-shortcut");
+    throw new Error("Unknown data for foldl-shortcut");
 };
 export let foldr_shortcut = function (xs, acc, v0, f) {
     if (arguments.length !== 4) {
@@ -442,5 +442,5 @@ export let foldr_shortcut = function (xs, acc, v0, f) {
         }
         return v0;
     }
-    throw new Error("Unknow data for foldr-shortcut, expected only list");
+    throw new Error("Unknown data for foldr-shortcut, expected only list");
 };

package/lib/js-map.mjs

@@ -154,7 +154,7 @@ export class CalcitMap {
         }
         return new CalcitSet(ret);
     }
-    /** detecthing in custom formatter */
+    /** detecting in custom formatter */
     nestedDataInChildren() {
         let pairs = this.pairs();
         for (let idx = 0; idx < pairs.length; idx++) {
@@ -365,7 +365,7 @@ export class CalcitSliceMap {
         }
         return new CalcitSet(ret);
     }
-    /** detecthing in custom formatter */
+    /** detecting in custom formatter */
     nestedDataInChildren() {
         let pairs = this.pairs();
         for (let idx = 0; idx < pairs.length; idx++) {

package/lib/js-primes.mjs

@@ -40,7 +40,7 @@ var PseudoTypeIndex;
     PseudoTypeIndex[PseudoTypeIndex["cirru_quote"] = 14] = "cirru_quote";
 })(PseudoTypeIndex || (PseudoTypeIndex = {}));
 let typeAsInt = (x) => {
-    // based on order used in Ord traint
+    // based on order used in Ord trait
     if (x == null)
         return PseudoTypeIndex.nil;
     let t = typeof x;

package/lib/js-record.mjs

@@ -61,11 +61,13 @@ export class CalcitRecord {
         return idx >= 0;
     }
     toString(disableJsDataWarning = false) {
-        let ret = "(%{} " + this.name;
+        // Optimize string building using array join instead of concatenation
+        const parts = ["(%{} ", this.name.toString()];
         for (let idx = 0; idx < this.fields.length; idx++) {
-            ret += " (" + this.fields[idx] + " " + toString(this.values[idx], true, disableJsDataWarning) + ")";
+            parts.push(" (", this.fields[idx].toString(), " ", toString(this.values[idx], true, disableJsDataWarning), ")");
         }
-        return ret + ")";
+        parts.push(")");
+        return parts.join("");
     }
     withClass(klass) {
         if (klass instanceof CalcitRecord) {

package/lib/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@calcit/procs",
-    "version": "0.9.16",
+    "version": "0.9.18",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
-        "@types/node": "^22.15.24",
-        "typescript": "^5.8.3"
+        "@types/node": "^24.1.0",
+        "typescript": "^5.9.2"
     },
     "scripts": {
         "compile": "rm -rfv lib/* && tsc",
@@ -22,7 +22,7 @@
         "url": "https://github.com/calcit-lang/calcit"
     },
     "dependencies": {
-        "@calcit/ternary-tree": "0.0.24",
+        "@calcit/ternary-tree": "0.0.25",
         "@cirru/parser.ts": "^0.0.6",
         "@cirru/writer.ts": "^0.1.5"
     }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@calcit/procs",
-  "version": "0.9.16",
+  "version": "0.9.18",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^22.15.24",
-    "typescript": "^5.8.3"
+    "@types/node": "^24.1.0",
+    "typescript": "^5.9.2"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",
@@ -22,7 +22,7 @@
     "url": "https://github.com/calcit-lang/calcit"
   },
   "dependencies": {
-    "@calcit/ternary-tree": "0.0.24",
+    "@calcit/ternary-tree": "0.0.25",
     "@cirru/parser.ts": "^0.0.6",
     "@cirru/writer.ts": "^0.1.5"
   }

package/ts-src/calcit-data.mts

@@ -118,35 +118,32 @@ export let getStringName = (x: CalcitValue): string => {
 
 /** returns -1 when not found */
 export function findInFields(xs: Array<CalcitTag>, y: CalcitTag): number {
-  let lower = 0;
-  let upper = xs.length - 1;
-
-  while (upper - lower > 1) {
-    let pos = (lower + upper) >> 1;
-    let v = xs[pos];
-    if (y.idx < v.idx) {
-      upper = pos - 1;
-    } else if (y.idx > v.idx) {
-      lower = pos + 1;
+  let low = 0;
+  let high = xs.length - 1;
+
+  while (low <= high) {
+    const mid = Math.floor((low + high) / 2);
+    const midVal = xs[mid];
+    if (midVal.idx < y.idx) {
+      low = mid + 1;
+    } else if (midVal.idx > y.idx) {
+      high = mid - 1;
     } else {
-      return pos;
+      return mid;
     }
   }
-
-  if (y === xs[lower]) return lower;
-  if (y === xs[upper]) return upper;
   return -1;
 }
 
-var tagRegistery: Record<string, CalcitTag> = {};
+var tagRegistry: Record<string, CalcitTag> = {};
 
 export let newTag = (content: string) => {
-  let item = tagRegistery[content];
+  let item = tagRegistry[content];
   if (item != null) {
     return item;
   } else {
     let v = new CalcitTag(content);
-    tagRegistery[content] = v;
+    tagRegistry[content] = v;
     return v;
   }
 };
@@ -591,22 +588,30 @@ export let _$n__$e_ = (x: CalcitValue, y: CalcitValue): boolean => {
         return false;
       }
       let values = x.values();
+      let yValues = y.values();
+      // Optimize: create a Map for O(1) lookup instead of O(n) iteration
+      let yMap = new Map();
+      for (let idx = 0; idx < yValues.length; idx++) {
+        let yv = yValues[idx];
+        yMap.set(yv, true);
+      }
+
       for (let idx = 0; idx < values.length; idx++) {
         let v = values[idx];
         let found = false;
-        // testing by doing iteration is O(n2), could be slow
-        // but Set::contains does not satisfy here
-        let yValues = y.values();
-        for (let idx = 0; idx < yValues.length; idx++) {
-          let yv = yValues[idx];
-          if (_$n__$e_(v, yv)) {
-            found = true;
-            break;
+        // First try direct lookup for primitive values
+        if (yMap.has(v)) {
+          found = true;
+        } else {
+          // Fallback to deep equality check for complex values
+          for (let yv of yValues) {
+            if (_$n__$e_(v, yv)) {
+              found = true;
+              break;
+            }
           }
         }
-        if (found) {
-          continue;
-        } else {
+        if (!found) {
           return false;
         }
       }

package/ts-src/calcit.procs.mts

@@ -696,14 +696,10 @@ export let round_$q_ = (a: number) => {
   return a === Math.round(a);
 };
 export let _$n_str_$o_concat = (a: string, b: string) => {
-  let buffer = "";
-  if (a != null) {
-    buffer += toString(a, false);
-  }
-  if (b != null) {
-    buffer += toString(b, false);
-  }
-  return buffer;
+  // Optimize string concatenation by avoiding unnecessary toString calls
+  const aStr = a != null ? toString(a, false) : "";
+  const bStr = b != null ? toString(b, false) : "";
+  return aStr + bStr;
 };
 export let sort = (xs: CalcitList | CalcitSliceList, f: CalcitFn): CalcitSliceList => {
   if (xs == null) {
@@ -907,7 +903,7 @@ export let parse_float = (x: string): number => {
 export let trim = (x: string, c: string): string => {
   if (c != null) {
     if (c.length !== 1) {
-      throw new Error("Expceted c of a character");
+      throw new Error("Expected c of a character");
     }
     var buffer = x;
     var size = buffer.length;

package/ts-src/js-cirru.mts

@@ -270,7 +270,7 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
             throw new Error(`Expected pair of size 2, got: ${pair}`);
           }
         } else {
-          throw new Error(`Expected pairs for reocrd, got: ${pair}`);
+          throw new Error(`Expected pairs for record, got: ${pair}`);
         }
       });
       entries.sort((a, b) => {

package/ts-src/js-list.mts

@@ -332,7 +332,7 @@ export let foldl = function (xs: CalcitValue, acc: CalcitValue, f: CalcitFn): Ca
     });
     return result;
   }
-  throw new Error("Unknow data for foldl");
+  throw new Error("Unknown data for foldl");
 };
 
 export let foldl_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: CalcitValue, f: CalcitFn): CalcitValue {
@@ -424,7 +424,7 @@ export let foldl_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: Cal
     }
     return v0;
   }
-  throw new Error("Unknow data for foldl-shortcut");
+  throw new Error("Unknown data for foldl-shortcut");
 };
 export let foldr_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: CalcitValue, f: CalcitFn): CalcitValue {
   if (arguments.length !== 4) {
@@ -455,5 +455,5 @@ export let foldr_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: Cal
     return v0;
   }
 
-  throw new Error("Unknow data for foldr-shortcut, expected only list");
+  throw new Error("Unknown data for foldr-shortcut, expected only list");
 };

package/ts-src/js-map.mts

@@ -176,7 +176,7 @@ export class CalcitMap {
     return new CalcitSet(ret);
   }
 
-  /** detecthing in custom formatter */
+  /** detecting in custom formatter */
   nestedDataInChildren() {
     let pairs = this.pairs();
     for (let idx = 0; idx < pairs.length; idx++) {
@@ -392,7 +392,7 @@ export class CalcitSliceMap {
     return new CalcitSet(ret);
   }
 
-  /** detecthing in custom formatter */
+  /** detecting in custom formatter */
   nestedDataInChildren() {
     let pairs = this.pairs();
     for (let idx = 0; idx < pairs.length; idx++) {

package/ts-src/js-primes.mts

@@ -55,7 +55,7 @@ enum PseudoTypeIndex {
 }
 
 let typeAsInt = (x: CalcitValue): number => {
-  // based on order used in Ord traint
+  // based on order used in Ord trait
   if (x == null) return PseudoTypeIndex.nil;
   let t = typeof x;
   if (t === "boolean") return PseudoTypeIndex.bool;

package/ts-src/js-record.mts

@@ -66,11 +66,13 @@ export class CalcitRecord {
     return idx >= 0;
   }
   toString(disableJsDataWarning: boolean = false): string {
-    let ret = "(%{} " + this.name;
+    // Optimize string building using array join instead of concatenation
+    const parts = ["(%{} ", this.name.toString()];
     for (let idx = 0; idx < this.fields.length; idx++) {
-      ret += " (" + this.fields[idx] + " " + toString(this.values[idx], true, disableJsDataWarning) + ")";
+      parts.push(" (", this.fields[idx].toString(), " ", toString(this.values[idx], true, disableJsDataWarning), ")");
     }
-    return ret + ")";
+    parts.push(")");
+    return parts.join("");
   }
   withClass(klass: CalcitValue): CalcitRecord {
     if (klass instanceof CalcitRecord) {