@calcit/procs 0.6.27 → 0.6.28

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.6.27";
+export const calcit_version = "0.6.28";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import { CalcitSymbol, CalcitKeyword, CalcitRef, CalcitRecur, kwd, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
@@ -244,6 +244,13 @@ export let _$n_tuple_$o_nth = function (xs, k) {
         return xs.get(k);
     throw new Error("Does not support `nth` on this type");
 };
+export let _$n_tuple_$o_count = function (xs) {
+    if (arguments.length !== 1)
+        throw new Error("&tuple:count takes 1 arguments");
+    if (xs instanceof CalcitTuple)
+        return xs.count();
+    throw new Error("Does not support `count` on this type");
+};
 export let _$n_record_$o_get = function (xs, k) {
     if (arguments.length !== 2) {
         throw new Error("record &get takes 2 arguments");
@@ -1154,8 +1161,8 @@ export let _$n_js_object = (...xs) => {
     }
     return ret;
 };
-export let _$o__$o_ = (a, b) => {
-    return new CalcitTuple(a, b);
+export let _$o__$o_ = (a, b, ...extra) => {
+    return new CalcitTuple(a, b, extra);
 };
 // mutable place for core to register
 let calcit_builtin_classes = {

package/lib/js-cirru.mjs

@@ -245,10 +245,10 @@ export let extract_cirru_edn = (x) => {
             return new CalcitCirruQuote(x[1]);
         }
         if (x[0] === "::") {
-            if (x.length !== 3) {
-                throw new Error("tuple expects 2 values");
+            if (x.length < 3) {
+                throw new Error("tuple expects at least 2 values");
             }
-            return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]));
+            return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]), x.slice(3).map(extract_cirru_edn));
         }
     }
     console.error(x);

package/lib/js-tuple.mjs

@@ -1,8 +1,9 @@
 import { toString } from "./calcit-data.mjs";
 export class CalcitTuple {
-    constructor(a, b) {
+    constructor(a, b, extra) {
         this.fst = a;
         this.snd = b;
+        this.extra = extra;
         this.cachedHash = null;
     }
     get(n) {
@@ -12,21 +13,32 @@ export class CalcitTuple {
         else if (n === 1) {
             return this.snd;
         }
+        else if (n - 2 < this.extra.length) {
+            return this.extra[n - 2];
+        }
         else {
             throw new Error("Tuple only have 2 elements");
         }
     }
     assoc(n, v) {
         if (n === 0) {
-            return new CalcitTuple(v, this.snd);
+            return new CalcitTuple(v, this.snd, this.extra);
         }
         else if (n === 1) {
-            return new CalcitTuple(this.fst, v);
+            return new CalcitTuple(this.fst, v, this.extra);
+        }
+        else if (n - 2 < this.extra.length) {
+            let next_extra = this.extra.slice();
+            next_extra[n - 2] = v;
+            return new CalcitTuple(this.fst, this.snd, next_extra);
         }
         else {
             throw new Error("Tuple only have 2 elements");
         }
     }
+    count() {
+        return 2 + this.extra.length;
+    }
     toString(disableJsDataWarning = false) {
         return `(&tuple ${toString(this.fst, false, disableJsDataWarning)} ${toString(this.snd, false, disableJsDataWarning)})`;
     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@calcit/procs",
-  "version": "0.6.27",
+  "version": "0.6.28",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^18.16.3",
+    "@types/node": "^20.2.3",
     "typescript": "^5.0.4"
   },
   "scripts": {

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.6.27";
+export const calcit_version = "0.6.28";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -290,6 +290,13 @@ export let _$n_tuple_$o_nth = function (xs: CalcitValue, k: CalcitValue) {
 
   throw new Error("Does not support `nth` on this type");
 };
+export let _$n_tuple_$o_count = function (xs: CalcitValue) {
+  if (arguments.length !== 1) throw new Error("&tuple:count takes 1 arguments");
+
+  if (xs instanceof CalcitTuple) return xs.count();
+
+  throw new Error("Does not support `count` on this type");
+};
 
 export let _$n_record_$o_get = function (xs: CalcitValue, k: CalcitKeyword) {
   if (arguments.length !== 2) {
@@ -1253,8 +1260,8 @@ export let _$n_js_object = (...xs: CalcitValue[]): Record<string, CalcitValue> =
   return ret;
 };
 
-export let _$o__$o_ = (a: CalcitValue, b: CalcitValue): CalcitTuple => {
-  return new CalcitTuple(a, b);
+export let _$o__$o_ = (a: CalcitValue, b: CalcitValue, ...extra: CalcitValue[]): CalcitTuple => {
+  return new CalcitTuple(a, b, extra);
 };
 
 // mutable place for core to register

package/ts-src/js-cirru.mts

@@ -246,10 +246,10 @@ export let extract_cirru_edn = (x: CirruEdnFormat): CalcitValue => {
       return new CalcitCirruQuote(x[1]);
     }
     if (x[0] === "::") {
-      if (x.length !== 3) {
-        throw new Error("tuple expects 2 values");
+      if (x.length < 3) {
+        throw new Error("tuple expects at least 2 values");
       }
-      return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]));
+      return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]), x.slice(3).map(extract_cirru_edn));
     }
   }
   console.error(x);

package/ts-src/js-tuple.mts

@@ -6,10 +6,12 @@ import { toString } from "./calcit-data.mjs";
 export class CalcitTuple {
   fst: CalcitValue;
   snd: CalcitValue;
+  extra: CalcitValue[];
   cachedHash: Hash;
-  constructor(a: CalcitValue, b: CalcitValue) {
+  constructor(a: CalcitValue, b: CalcitValue, extra: CalcitValue[]) {
     this.fst = a;
     this.snd = b;
+    this.extra = extra;
     this.cachedHash = null;
   }
   get(n: number) {
@@ -17,19 +19,28 @@ export class CalcitTuple {
       return this.fst;
     } else if (n === 1) {
       return this.snd;
+    } else if (n - 2 < this.extra.length) {
+      return this.extra[n - 2];
     } else {
       throw new Error("Tuple only have 2 elements");
     }
   }
   assoc(n: number, v: CalcitValue) {
     if (n === 0) {
-      return new CalcitTuple(v, this.snd);
+      return new CalcitTuple(v, this.snd, this.extra);
     } else if (n === 1) {
-      return new CalcitTuple(this.fst, v);
+      return new CalcitTuple(this.fst, v, this.extra);
+    } else if (n - 2 < this.extra.length) {
+      let next_extra = this.extra.slice();
+      next_extra[n - 2] = v;
+      return new CalcitTuple(this.fst, this.snd, next_extra);
     } else {
       throw new Error("Tuple only have 2 elements");
     }
   }
+  count() {
+    return 2 + this.extra.length;
+  }
   toString(disableJsDataWarning: boolean = false): string {
     return `(&tuple ${toString(this.fst, false, disableJsDataWarning)} ${toString(this.snd, false, disableJsDataWarning)})`;
   }