@calcit/procs 0.9.3 → 0.9.5

package/lib/js-cirru.mjs

@@ -220,11 +220,11 @@ export let extract_cirru_edn = (x, options) => {
             return parseFloat(x);
         }
         // strict behavior as Rust semantics
-        throw new Error("unknown syntax for EDN");
+        throw new Error(`unknown syntax for EDN: ${x}`);
     }
     if (x instanceof Array) {
         if (x.length === 0) {
-            throw new Error("Cannot be empty");
+            throw new Error("Cannot be empty form");
         }
         if (x[0] === "{}") {
             let result = [];
@@ -239,11 +239,11 @@ export let extract_cirru_edn = (x, options) => {
                         result.push(extract_cirru_edn(pair[0], options), extract_cirru_edn(pair[1], options));
                     }
                     else {
-                        throw new Error(`Expected a pair, got size ${pair.length}`);
+                        throw new Error(`Expected a pair, got: ${pair}`);
                     }
                 }
                 else {
-                    throw new Error(`Expected pairs for map, got ${pair}`);
+                    throw new Error(`Expected pairs for map, got: ${pair}`);
                 }
             });
             return new CalcitSliceMap(result);
@@ -251,7 +251,7 @@ export let extract_cirru_edn = (x, options) => {
         if (x[0] === "%{}") {
             let name = x[1];
             if (typeof name != "string") {
-                throw new Error("Expected string for record name");
+                throw new Error(`Expected string for record name, got: ${name}`);
             }
             // put to entries first, sort and then...
             let entries = [];
@@ -267,15 +267,15 @@ export let extract_cirru_edn = (x, options) => {
                             entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1], options)]);
                         }
                         else {
-                            throw new Error("Expected string as field");
+                            throw new Error(`Expected string as field, got: ${pair}`);
                         }
                     }
                     else {
-                        throw new Error("Expected pair of size 2");
+                        throw new Error(`Expected pair of size 2, got: ${pair}`);
                     }
                 }
                 else {
-                    throw new Error("Expected pairs for reocrd");
+                    throw new Error(`Expected pairs for reocrd, got: ${pair}`);
                 }
             });
             entries.sort((a, b) => {
@@ -321,13 +321,13 @@ export let extract_cirru_edn = (x, options) => {
         }
         if (x[0] === "quote") {
             if (x.length !== 2) {
-                throw new Error("quote expects 1 argument");
+                throw new Error(`quote expects 1 argument, got: ${x}`);
             }
             return new CalcitCirruQuote(x[1]);
         }
         if (x[0] === "::") {
             if (x.length < 2) {
-                throw new Error("tuple expects at least 1 value1");
+                throw new Error(`tuple expects at least 1 value, got: ${x}`);
             }
             return new CalcitTuple(extract_cirru_edn(x[1], options), x
                 .slice(2)
@@ -336,7 +336,7 @@ export let extract_cirru_edn = (x, options) => {
         }
     }
     console.error(x);
-    throw new Error("Unexpected data from cirru-edn");
+    throw new Error(`Unexpected data from EDN: ${x}`);
 };
 export let format_cirru_edn = (data, useInline = true) => {
     if (data == null) {

package/lib/js-list.mjs

@@ -112,7 +112,12 @@ export class CalcitSliceList {
         this.end = value.length;
     }
     turnListMode() {
-        return new CalcitList(initTernaryTreeListFromRange(this.value, this.start, this.end));
+        if (this.cachedTreeListRef != null) {
+            return this.cachedTreeListRef;
+        }
+        let ret = new CalcitList(initTernaryTreeListFromRange(this.value, this.start, this.end));
+        this.cachedTreeListRef = ret;
+        return ret;
     }
     len() {
         return this.end - this.start;

package/lib/js-map.mjs

@@ -179,14 +179,20 @@ export class CalcitSliceMap {
             throw new Error("unknown data for map");
         }
     }
+    /** convert to tree map when needed, also cached in case converted over and over again  */
     turnMap() {
+        if (this.cachedTreeMapRef != null) {
+            return this.cachedTreeMapRef;
+        }
         var dict = [];
         let halfLength = this.chunk.length >> 1;
         for (let idx = 0; idx < halfLength; idx++) {
             dict.push([this.chunk[idx << 1], this.chunk[(idx << 1) + 1]]);
         }
         let value = initTernaryTreeMapFromArray(dict);
-        return new CalcitMap(value);
+        let ret = new CalcitMap(value);
+        this.cachedTreeMapRef = ret;
+        return ret;
     }
     len() {
         return this.chunk.length >> 1;

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@calcit/procs",
-    "version": "0.9.3",
+    "version": "0.9.5",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
         "@types/node": "^22.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^22.1.0",

package/ts-src/js-cirru.mts

@@ -217,11 +217,11 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
       return parseFloat(x);
     }
     // strict behavior as Rust semantics
-    throw new Error("unknown syntax for EDN");
+    throw new Error(`unknown syntax for EDN: ${x}`);
   }
   if (x instanceof Array) {
     if (x.length === 0) {
-      throw new Error("Cannot be empty");
+      throw new Error("Cannot be empty form");
     }
     if (x[0] === "{}") {
       let result: Array<CalcitValue> = [];
@@ -234,10 +234,10 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
           if (pair.length === 2) {
             result.push(extract_cirru_edn(pair[0], options), extract_cirru_edn(pair[1], options));
           } else {
-            throw new Error(`Expected a pair, got size ${pair.length}`);
+            throw new Error(`Expected a pair, got: ${pair}`);
           }
         } else {
-          throw new Error(`Expected pairs for map, got ${pair}`);
+          throw new Error(`Expected pairs for map, got: ${pair}`);
         }
       });
       return new CalcitSliceMap(result);
@@ -245,7 +245,7 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
     if (x[0] === "%{}") {
       let name = x[1];
       if (typeof name != "string") {
-        throw new Error("Expected string for record name");
+        throw new Error(`Expected string for record name, got: ${name}`);
       }
       // put to entries first, sort and then...
       let entries: Array<[CalcitTag, CalcitValue]> = [];
@@ -259,13 +259,13 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
             if (typeof pair[0] === "string") {
               entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1], options)]);
             } else {
-              throw new Error("Expected string as field");
+              throw new Error(`Expected string as field, got: ${pair}`);
             }
           } else {
-            throw new Error("Expected pair of size 2");
+            throw new Error(`Expected pair of size 2, got: ${pair}`);
           }
         } else {
-          throw new Error("Expected pairs for reocrd");
+          throw new Error(`Expected pairs for reocrd, got: ${pair}`);
         }
       });
       entries.sort((a, b) => {
@@ -318,13 +318,13 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
     }
     if (x[0] === "quote") {
       if (x.length !== 2) {
-        throw new Error("quote expects 1 argument");
+        throw new Error(`quote expects 1 argument, got: ${x}`);
       }
       return new CalcitCirruQuote(x[1]);
     }
     if (x[0] === "::") {
       if (x.length < 2) {
-        throw new Error("tuple expects at least 1 value1");
+        throw new Error(`tuple expects at least 1 value, got: ${x}`);
       }
       return new CalcitTuple(
         extract_cirru_edn(x[1], options),
@@ -337,7 +337,7 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
     }
   }
   console.error(x);
-  throw new Error("Unexpected data from cirru-edn");
+  throw new Error(`Unexpected data from EDN: ${x}`);
 };
 
 export let format_cirru_edn = (data: CalcitValue, useInline: boolean = true): string => {

package/ts-src/js-list.mts

@@ -123,6 +123,8 @@ export class CalcitSliceList {
   start: number;
   end: number;
   cachedHash: Hash;
+  /** reference to converted list */
+  cachedTreeListRef: CalcitList;
   constructor(value: Array<CalcitValue>) {
     if (value == null) {
       value = []; // dirty, better handled from outside
@@ -134,7 +136,12 @@ export class CalcitSliceList {
     this.end = value.length;
   }
   turnListMode(): CalcitList {
-    return new CalcitList(initTernaryTreeListFromRange(this.value, this.start, this.end));
+    if (this.cachedTreeListRef != null) {
+      return this.cachedTreeListRef;
+    }
+    let ret = new CalcitList(initTernaryTreeListFromRange(this.value, this.start, this.end));
+    this.cachedTreeListRef = ret;
+    return ret;
   }
   len() {
     return this.end - this.start;

package/ts-src/js-map.mts

@@ -194,6 +194,8 @@ export class CalcitSliceMap {
   cachedHash: Hash;
   /** in arrayMode, only flatten values, instead of tree structure */
   chunk: CalcitValue[];
+  /** reference to generated HashMap in tree structure */
+  cachedTreeMapRef?: CalcitMap;
   constructor(value: CalcitValue[]) {
     if (value == null) {
       this.chunk = [];
@@ -203,14 +205,20 @@ export class CalcitSliceMap {
       throw new Error("unknown data for map");
     }
   }
+  /** convert to tree map when needed, also cached in case converted over and over again  */
   turnMap(): CalcitMap {
+    if (this.cachedTreeMapRef != null) {
+      return this.cachedTreeMapRef;
+    }
     var dict: Array<[CalcitValue, CalcitValue]> = [];
     let halfLength = this.chunk.length >> 1;
     for (let idx = 0; idx < halfLength; idx++) {
       dict.push([this.chunk[idx << 1], this.chunk[(idx << 1) + 1]]);
     }
     let value = initTernaryTreeMapFromArray(dict);
-    return new CalcitMap(value);
+    let ret = new CalcitMap(value);
+    this.cachedTreeMapRef = ret;
+    return ret;
   }
   len() {
     return this.chunk.length >> 1;