@calcit/procs 0.8.46 → 0.8.47

package/lib/custom-formatter.mjs

@@ -92,7 +92,8 @@ export let load_console_formatter_$x_ = () => {
                     if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
                         let preview = "";
                         let hasCollection = false;
-                        for (let idx = 0; idx < obj.len(); idx++) {
+                        let size = obj.len();
+                        for (let idx = 0; idx < size; idx++) {
                             preview += " ";
                             if (isLiteral(obj.get(idx))) {
                                 preview += saveString(obj.get(idx));

package/lib/js-cirru.mjs

@@ -68,10 +68,10 @@ export let to_cirru_edn = (x) => {
         return `|${x}`;
     }
     if (typeof x === "number") {
-        return x.toString();
+        return `${x}`;
     }
     if (typeof x === "boolean") {
-        return x.toString();
+        return `${x}`;
     }
     if (x instanceof CalcitTag) {
         return x.toString();
@@ -80,8 +80,12 @@ export let to_cirru_edn = (x) => {
         return x.toString();
     }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-        // TODO can be faster
-        return ["[]"].concat(x.toArray().map(to_cirru_edn));
+        let ret = ["[]"];
+        let arr = x.toArray();
+        for (let idx = 0; idx < arr.length; idx++) {
+            ret.push(to_cirru_edn(arr[idx]));
+        }
+        return ret;
     }
     if (x instanceof CalcitCirruQuote) {
         return ["quote", x.value];
@@ -126,24 +130,14 @@ export let to_cirru_edn = (x) => {
         return buffer;
     }
     if (x instanceof CalcitRecord) {
-        let buffer = ["%{}", x.name.toString()];
+        let buffer = [];
         for (let idx = 0; idx < x.fields.length; idx++) {
             buffer.push([x.fields[idx].toString(), to_cirru_edn(x.values[idx])]);
         }
         // placed literals first
-        buffer.sort((a, b) => {
-            let a1_literal = isLiteral(a[1]);
-            let b1_literal = isLiteral(b[1]);
-            if (a1_literal && !b1_literal) {
-                return -1;
-            }
-            else if (!a1_literal && b1_literal) {
-                return 1;
-            }
-            else {
-                return _$n_compare(a[0], b[0]);
-            }
-        });
+        buffer.sort(recordFieldOrder);
+        buffer.unshift(x.name.toString());
+        buffer.unshift("%{}");
         return buffer;
     }
     if (x instanceof CalcitSet) {
@@ -176,6 +170,19 @@ export let to_cirru_edn = (x) => {
     console.error(x);
     throw new Error("Unexpected data to to-cirru-edn");
 };
+let recordFieldOrder = (a, b) => {
+    let a1_literal = isLiteral(a[1]);
+    let b1_literal = isLiteral(b[1]);
+    if (a1_literal && !b1_literal) {
+        return -1;
+    }
+    else if (!a1_literal && b1_literal) {
+        return 1;
+    }
+    else {
+        return _$n_compare(a[0], b[0]);
+    }
+};
 /** makes sure we got string */
 let extractFieldTag = (x) => {
     if (x[0] === ":") {

package/lib/js-list.mjs

@@ -92,7 +92,8 @@ export class CalcitList {
         return new CalcitList(ternaryTree.reverse(this.value));
     }
     nestedDataInChildren() {
-        for (let idx = 0; idx < this.len(); idx++) {
+        let size = this.len();
+        for (let idx = 0; idx < size; idx++) {
             if (!isLiteral(this.get(idx))) {
                 return true;
             }
@@ -247,7 +248,8 @@ export class CalcitSliceList {
         return this.turnListMode().reverse();
     }
     nestedDataInChildren() {
-        for (let idx = 0; idx < this.len(); idx++) {
+        let size = this.len();
+        for (let idx = 0; idx < size; idx++) {
             if (!isLiteral(this.get(idx))) {
                 return true;
             }
@@ -275,7 +277,8 @@ export let foldl = function (xs, acc, f) {
     }
     if (xs instanceof CalcitSliceList || xs instanceof CalcitList) {
         var result = acc;
-        for (let idx = 0; idx < xs.len(); idx++) {
+        let size = xs.len();
+        for (let idx = 0; idx < size; idx++) {
             let item = xs.get(idx);
             result = f(result, item);
         }
@@ -316,7 +319,8 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
     }
     if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         var state = acc;
-        for (let idx = 0; idx < xs.len(); idx++) {
+        let size = xs.len();
+        for (let idx = 0; idx < size; idx++) {
             let item = xs.get(idx);
             let pair = f(state, item);
             if (pair instanceof CalcitTuple) {

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@calcit/procs",
-    "version": "0.8.46",
+    "version": "0.8.47",
     "main": "./lib/calcit.procs.mjs",
     "devDependencies": {
         "@types/node": "^20.11.28",
@@ -23,6 +23,6 @@
     "dependencies": {
         "@calcit/ternary-tree": "0.0.23",
         "@cirru/parser.ts": "^0.0.6",
-        "@cirru/writer.ts": "^0.1.4"
+        "@cirru/writer.ts": "^0.1.5"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.46",
+  "version": "0.8.47",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.11.28",
@@ -23,6 +23,6 @@
   "dependencies": {
     "@calcit/ternary-tree": "0.0.23",
     "@cirru/parser.ts": "^0.0.6",
-    "@cirru/writer.ts": "^0.1.4"
+    "@cirru/writer.ts": "^0.1.5"
   }
 }

package/ts-src/custom-formatter.mts

@@ -106,7 +106,8 @@ export let load_console_formatter_$x_ = () => {
           if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
             let preview = "";
             let hasCollection = false;
-            for (let idx = 0; idx < obj.len(); idx++) {
+            let size = obj.len();
+            for (let idx = 0; idx < size; idx++) {
               preview += " ";
               if (isLiteral(obj.get(idx))) {
                 preview += saveString(obj.get(idx));

package/ts-src/js-cirru.mts

@@ -73,10 +73,10 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
     return `|${x}`;
   }
   if (typeof x === "number") {
-    return x.toString();
+    return `${x}`;
   }
   if (typeof x === "boolean") {
-    return x.toString();
+    return `${x}`;
   }
   if (x instanceof CalcitTag) {
     return x.toString();
@@ -85,8 +85,12 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
     return x.toString();
   }
   if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-    // TODO can be faster
-    return (["[]"] as CirruEdnFormat[]).concat(x.toArray().map(to_cirru_edn));
+    let ret: CirruEdnFormat[] = ["[]"];
+    let arr = x.toArray();
+    for (let idx = 0; idx < arr.length; idx++) {
+      ret.push(to_cirru_edn(arr[idx]));
+    }
+    return ret;
   }
   if (x instanceof CalcitCirruQuote) {
     return ["quote", x.value];
@@ -126,22 +130,14 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
     return buffer;
   }
   if (x instanceof CalcitRecord) {
-    let buffer: [string, CirruEdnFormat] = ["%{}", x.name.toString()];
+    let buffer: [string, CirruEdnFormat][] = [];
     for (let idx = 0; idx < x.fields.length; idx++) {
       buffer.push([x.fields[idx].toString(), to_cirru_edn(x.values[idx])]);
     }
     // placed literals first
-    buffer.sort((a, b) => {
-      let a1_literal = isLiteral(a[1] as CalcitValue);
-      let b1_literal = isLiteral(b[1] as CalcitValue);
-      if (a1_literal && !b1_literal) {
-        return -1;
-      } else if (!a1_literal && b1_literal) {
-        return 1;
-      } else {
-        return _$n_compare(a[0] as CalcitValue, b[0] as CalcitValue);
-      }
-    });
+    buffer.sort(recordFieldOrder);
+    (buffer as any[]).unshift(x.name.toString());
+    (buffer as any[]).unshift("%{}");
     return buffer;
   }
   if (x instanceof CalcitSet) {
@@ -172,6 +168,18 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
   throw new Error("Unexpected data to to-cirru-edn");
 };
 
+let recordFieldOrder = (a: [string, CirruEdnFormat], b: [string, CirruEdnFormat]) => {
+  let a1_literal = isLiteral(a[1] as CalcitValue);
+  let b1_literal = isLiteral(b[1] as CalcitValue);
+  if (a1_literal && !b1_literal) {
+    return -1;
+  } else if (!a1_literal && b1_literal) {
+    return 1;
+  } else {
+    return _$n_compare(a[0] as CalcitValue, b[0] as CalcitValue);
+  }
+};
+
 /** makes sure we got string */
 let extractFieldTag = (x: string) => {
   if (x[0] === ":") {

package/ts-src/js-list.mts

@@ -107,7 +107,8 @@ export class CalcitList {
     return new CalcitList(ternaryTree.reverse(this.value));
   }
   nestedDataInChildren(): boolean {
-    for (let idx = 0; idx < this.len(); idx++) {
+    let size = this.len();
+    for (let idx = 0; idx < size; idx++) {
       if (!isLiteral(this.get(idx))) {
         return true;
       }
@@ -262,7 +263,8 @@ export class CalcitSliceList {
     return this.turnListMode().reverse();
   }
   nestedDataInChildren(): boolean {
-    for (let idx = 0; idx < this.len(); idx++) {
+    let size = this.len();
+    for (let idx = 0; idx < size; idx++) {
       if (!isLiteral(this.get(idx))) {
         return true;
       }
@@ -292,7 +294,8 @@ export let foldl = function (xs: CalcitValue, acc: CalcitValue, f: CalcitFn): Ca
   }
   if (xs instanceof CalcitSliceList || xs instanceof CalcitList) {
     var result = acc;
-    for (let idx = 0; idx < xs.len(); idx++) {
+    let size = xs.len();
+    for (let idx = 0; idx < size; idx++) {
       let item = xs.get(idx);
       result = f(result, item);
     }
@@ -335,7 +338,8 @@ export let foldl_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: Cal
   }
   if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
     var state = acc;
-    for (let idx = 0; idx < xs.len(); idx++) {
+    let size = xs.len();
+    for (let idx = 0; idx < size; idx++) {
       let item = xs.get(idx);
       let pair = f(state, item);
       if (pair instanceof CalcitTuple) {