@calcit/procs 0.7.3 → 0.7.5

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.7.3";
+export const calcit_version = "0.7.5";
 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";

package/lib/js-cirru.mjs

@@ -127,8 +127,11 @@ export let to_cirru_edn = (x) => {
             // turn `x.snd` with CalcitList into raw Cirru nodes, which is in plain Array
             return ["quote", toWriterNode(x.get(1))];
         }
+        else if (x.tag instanceof CalcitTag) {
+            return ["::", x.tag.toString(), ...x.extra.map(to_cirru_edn)];
+        }
         else if (x.tag instanceof CalcitRecord) {
-            return ["::", x.tag.name.toString(), to_cirru_edn(x.get(1))];
+            return ["::", x.tag.name.toString(), ...x.extra.map(to_cirru_edn)];
         }
         else {
             throw new Error(`Unsupported tag for EDN: ${x.tag}`);

package/lib/js-tuple.mjs

@@ -56,6 +56,6 @@ export class CalcitTuple {
             }
             content += toString(args[i], false, disableJsDataWarning);
         }
-        return `(&tuple ${content})`;
+        return `(:: ${content})`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.3.2",

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.7.3";
+export const calcit_version = "0.7.5";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";

package/ts-src/js-cirru.mts

@@ -129,8 +129,10 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
     if (x.tag instanceof CalcitSymbol && x.tag.value === "quote") {
       // turn `x.snd` with CalcitList into raw Cirru nodes, which is in plain Array
       return ["quote", toWriterNode(x.get(1) as any)] as CirruEdnFormat;
+    } else if (x.tag instanceof CalcitTag) {
+      return ["::", x.tag.toString(), ...x.extra.map(to_cirru_edn)];
     } else if (x.tag instanceof CalcitRecord) {
-      return ["::", x.tag.name.toString(), to_cirru_edn(x.get(1))];
+      return ["::", x.tag.name.toString(), ...x.extra.map(to_cirru_edn)];
     } else {
       throw new Error(`Unsupported tag for EDN: ${x.tag}`);
     }

package/ts-src/js-tuple.mts

@@ -61,6 +61,6 @@ export class CalcitTuple {
       }
       content += toString(args[i], false, disableJsDataWarning);
     }
-    return `(&tuple ${content})`;
+    return `(:: ${content})`;
   }
 }