@calcit/procs 0.8.8 → 0.8.10

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.8.8";
+export const calcit_version = "0.8.10";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
@@ -1377,6 +1377,22 @@ export let _$n_buffer = (...xs) => {
     }
     return buf;
 };
+export let _$n_cirru_nth = (xs, idx) => {
+    if (xs instanceof CalcitCirruQuote) {
+        return xs.nth(idx);
+    }
+    else {
+        throw new Error("Expected a Cirru Quote");
+    }
+};
+export let _$n_cirru_type = (xs, idx) => {
+    if (xs instanceof CalcitCirruQuote) {
+        return Array.isArray(xs.value) ? newTag("list") : newTag("leaf");
+    }
+    else {
+        throw new Error("Expected a Cirru Quote");
+    }
+};
 export let _$n_hash = (x) => {
     return hashFunction(x);
 };

package/lib/custom-formatter.mjs

@@ -126,6 +126,19 @@ export let load_console_formatter_$x_ = () => {
                     if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
                         let ret = ["div", { style: "color: hsl(280, 80%, 60%)" }];
                         let pairs = obj.pairs();
+                        pairs.sort((pa, pb) => {
+                            let ka = pa[0].toString();
+                            let kb = pb[0].toString();
+                            if (ka < kb) {
+                                return -1;
+                            }
+                            else if (ka > kb) {
+                                return 1;
+                            }
+                            else {
+                                return 0;
+                            }
+                        });
                         for (let idx = 0; idx < pairs.length; idx++) {
                             let [k, v] = pairs[idx];
                             ret.push([

package/lib/js-cirru.mjs

@@ -9,6 +9,9 @@ import { CalcitTuple } from "./js-tuple.mjs";
 import { deepEqual } from "@calcit/ternary-tree/lib/utils.mjs";
 export class CalcitCirruQuote {
     constructor(value) {
+        if (value == null) {
+            throw new Error("cirru node cannot be null");
+        }
         this.value = value;
     }
     toString() {
@@ -17,6 +20,19 @@ export class CalcitCirruQuote {
     toList() {
         return to_calcit_data(this.value, true);
     }
+    nth(idx) {
+        if (Array.isArray(this.value)) {
+            if (idx < this.value.length) {
+                return new CalcitCirruQuote(this.value[idx]);
+            }
+            else {
+                throw new Error(`nth out of range: ${idx}`);
+            }
+        }
+        else {
+            throw new Error(`&cirru-nth does not read into a string: ${this.value}`);
+        }
+    }
     /** provide a simple text representation in Console or std out, with indentations */
     textForm() {
         if (Array.isArray(this.value) && this.value.every((x) => Array.isArray(x))) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.8",
+  "version": "0.8.10",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^20.6.2",
+    "@types/node": "^20.9.0",
     "typescript": "^5.2.2"
   },
   "scripts": {

package/rust-toolchain.toml

@@ -0,0 +1,3 @@
+
+[toolchain]
+channel = "nightly"

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.8.8";
+export const calcit_version = "0.8.10";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -1475,6 +1475,22 @@ export let _$n_buffer = (...xs: CalcitValue[]): Uint8Array => {
   return buf;
 };
 
+export let _$n_cirru_nth = (xs: CalcitCirruQuote, idx: number) => {
+  if (xs instanceof CalcitCirruQuote) {
+    return xs.nth(idx);
+  } else {
+    throw new Error("Expected a Cirru Quote");
+  }
+};
+
+export let _$n_cirru_type = (xs: CalcitCirruQuote, idx: number) => {
+  if (xs instanceof CalcitCirruQuote) {
+    return Array.isArray(xs.value) ? newTag("list") : newTag("leaf");
+  } else {
+    throw new Error("Expected a Cirru Quote");
+  }
+};
+
 export let _$n_hash = (x: CalcitValue): number => {
   return hashFunction(x);
 };

package/ts-src/custom-formatter.mts

@@ -143,6 +143,17 @@ export let load_console_formatter_$x_ = () => {
           if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
             let ret: any[] = ["div", { style: "color: hsl(280, 80%, 60%)" }];
             let pairs = obj.pairs();
+            pairs.sort((pa, pb) => {
+              let ka = pa[0].toString();
+              let kb = pb[0].toString();
+              if (ka < kb) {
+                return -1;
+              } else if (ka > kb) {
+                return 1;
+              } else {
+                return 0;
+              }
+            });
             for (let idx = 0; idx < pairs.length; idx++) {
               let [k, v] = pairs[idx];
               ret.push([

package/ts-src/js-cirru.mts

@@ -15,6 +15,9 @@ type CirruEdnFormat = string | CirruEdnFormat[];
 export class CalcitCirruQuote {
   value: CirruWriterNode;
   constructor(value: CirruWriterNode) {
+    if (value == null) {
+      throw new Error("cirru node cannot be null");
+    }
     this.value = value;
   }
   toString(): string {
@@ -23,6 +26,17 @@ export class CalcitCirruQuote {
   toList(): CalcitValue {
     return to_calcit_data(this.value, true);
   }
+  nth(idx: number): CalcitValue {
+    if (Array.isArray(this.value)) {
+      if (idx < this.value.length) {
+        return new CalcitCirruQuote(this.value[idx]);
+      } else {
+        throw new Error(`nth out of range: ${idx}`);
+      }
+    } else {
+      throw new Error(`&cirru-nth does not read into a string: ${this.value}`);
+    }
+  }
   /** provide a simple text representation in Console or std out, with indentations */
   textForm(): string {
     if (Array.isArray(this.value) && this.value.every((x) => Array.isArray(x))) {