@calcit/procs 0.7.8 → 0.7.10

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.7.8";
+export const calcit_version = "0.7.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";
@@ -441,12 +441,13 @@ export let _$n_str_$o_first = (xs) => {
     console.error(xs);
     throw new Error("Expected a string");
 };
-export let _$n_map_$o_first = (xs) => {
+export let _$n_map_$o_destruct = (xs) => {
     if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
-        // TODO order may not be stable enough
-        let ys = xs.pairs();
-        if (ys.length > 0) {
-            return new CalcitSliceList(ys[0]);
+        // order not stable
+        if (xs.len() > 0) {
+            let pair = xs.pairs()[0];
+            let k0 = pair[0];
+            return new CalcitSliceList([new CalcitSliceList(pair), xs.dissoc(k0)]);
         }
         else {
             return null;
@@ -455,12 +456,11 @@ export let _$n_map_$o_first = (xs) => {
     console.error(xs);
     throw new Error("Expected a map");
 };
-export let _$n_set_$o_first = (xs) => {
-    if (xs instanceof CalcitSet) {
-        return xs.first();
-    }
+export let _$n_set_$o_destruct = (xs) => {
+    if (xs instanceof CalcitSet)
+        return xs.destruct();
     console.error(xs);
-    throw new Error("Expected a set");
+    throw new Error("Expect a set");
 };
 export let timeout_call = (duration, f) => {
     if (typeof duration !== "number") {
@@ -488,25 +488,6 @@ export let _$n_str_$o_rest = (xs) => {
     console.error(xs);
     throw new Error("Expects a string");
 };
-export let _$n_set_$o_rest = (xs) => {
-    if (xs instanceof CalcitSet)
-        return xs.rest();
-    console.error(xs);
-    throw new Error("Expect a set");
-};
-export let _$n_map_$o_rest = (xs) => {
-    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
-        if (xs.len() > 0) {
-            let k0 = xs.pairs()[0][0];
-            return xs.dissoc(k0);
-        }
-        else {
-            return new CalcitSliceMap([]);
-        }
-    }
-    console.error(xs);
-    throw new Error("Expected map");
-};
 export let recur = (...xs) => {
     return new CalcitRecur(xs);
 };

package/lib/js-set.mjs

@@ -1,6 +1,7 @@
 import { toString } from "./calcit-data.mjs";
 import { mapLen, assocMap, dissocMap, toPairsArray, contains, initTernaryTreeMapFromArray, initEmptyTernaryTreeMap, } from "@calcit/ternary-tree";
 import * as ternaryTree from "@calcit/ternary-tree";
+import { CalcitSliceList } from "./js-list.mjs";
 /** need to compare by Calcit */
 let DATA_EQUAL = (x, y) => {
     return x === y;
@@ -67,20 +68,14 @@ export class CalcitSet {
         }
         return new CalcitSet(result);
     }
-    first() {
-        // rather suspicious solution since set has no logical order
+    destruct() {
         if (mapLen(this.value) === 0) {
             return null;
         }
-        return toPairsArray(this.value)[0][0];
-    }
-    rest() {
-        if (mapLen(this.value) === 0) {
-            return null;
-        }
-        let x0 = this.first();
+        // rather suspicious solution since set has no logical order
+        let x0 = toPairsArray(this.value)[0][0];
         let result = dissocMap(this.value, x0);
-        return new CalcitSet(result);
+        return new CalcitSliceList([x0, new CalcitSet(result)]);
     }
     toString(disableJsDataWarning = false) {
         let itemsCode = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.4.4",

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.7.8";
+export const calcit_version = "0.7.10";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -497,12 +497,14 @@ export let _$n_str_$o_first = (xs: CalcitValue): CalcitValue => {
   console.error(xs);
   throw new Error("Expected a string");
 };
-export let _$n_map_$o_first = (xs: CalcitValue): CalcitValue => {
+
+export let _$n_map_$o_destruct = (xs: CalcitValue): CalcitValue => {
   if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
-    // TODO order may not be stable enough
-    let ys = xs.pairs();
-    if (ys.length > 0) {
-      return new CalcitSliceList(ys[0]);
+    // order not stable
+    if (xs.len() > 0) {
+      let pair = xs.pairs()[0];
+      let k0 = pair[0];
+      return new CalcitSliceList([new CalcitSliceList(pair), xs.dissoc(k0)]);
     } else {
       return null;
     }
@@ -510,13 +512,12 @@ export let _$n_map_$o_first = (xs: CalcitValue): CalcitValue => {
   console.error(xs);
   throw new Error("Expected a map");
 };
-export let _$n_set_$o_first = (xs: CalcitValue): CalcitValue => {
-  if (xs instanceof CalcitSet) {
-    return xs.first();
-  }
+
+export let _$n_set_$o_destruct = (xs: CalcitValue): CalcitValue => {
+  if (xs instanceof CalcitSet) return xs.destruct();
 
   console.error(xs);
-  throw new Error("Expected a set");
+  throw new Error("Expect a set");
 };
 
 export let timeout_call = (duration: number, f: CalcitFn): null => {
@@ -547,24 +548,6 @@ export let _$n_str_$o_rest = (xs: CalcitValue): CalcitValue => {
   console.error(xs);
   throw new Error("Expects a string");
 };
-export let _$n_set_$o_rest = (xs: CalcitValue): CalcitValue => {
-  if (xs instanceof CalcitSet) return xs.rest();
-
-  console.error(xs);
-  throw new Error("Expect a set");
-};
-export let _$n_map_$o_rest = (xs: CalcitValue): CalcitValue => {
-  if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
-    if (xs.len() > 0) {
-      let k0 = xs.pairs()[0][0];
-      return xs.dissoc(k0);
-    } else {
-      return new CalcitSliceMap([]);
-    }
-  }
-  console.error(xs);
-  throw new Error("Expected map");
-};
 
 export let recur = (...xs: CalcitValue[]): CalcitRecur => {
   return new CalcitRecur(xs);

package/ts-src/js-set.mts

@@ -15,6 +15,7 @@ import {
   initEmptyTernaryTreeMap,
 } from "@calcit/ternary-tree";
 import * as ternaryTree from "@calcit/ternary-tree";
+import { CalcitSliceList } from "./js-list.mjs";
 
 /** need to compare by Calcit */
 let DATA_EQUAL = (x: CalcitValue, y: CalcitValue): boolean => {
@@ -87,22 +88,15 @@ export class CalcitSet {
     return new CalcitSet(result);
   }
 
-  first(): CalcitValue {
-    // rather suspicious solution since set has no logical order
-
+  destruct(): CalcitSliceList {
     if (mapLen(this.value) === 0) {
       return null;
     }
+    // rather suspicious solution since set has no logical order
+    let x0 = toPairsArray(this.value)[0][0];
 
-    return toPairsArray(this.value)[0][0];
-  }
-  rest(): CalcitSet {
-    if (mapLen(this.value) === 0) {
-      return null;
-    }
-    let x0 = this.first();
     let result = dissocMap(this.value, x0);
-    return new CalcitSet(result);
+    return new CalcitSliceList([x0, new CalcitSet(result)]);
   }
 
   toString(disableJsDataWarning: boolean = false) {