@calcit/procs 0.7.14 → 0.8.0-a2

package/lib/calcit.procs.mjs

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

@@ -109,6 +109,20 @@ export let to_cirru_edn = (x) => {
         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 = is_literal(a[1]);
+            let b1_literal = is_literal(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]);
+            }
+        });
         return buffer;
     }
     if (x instanceof CalcitSet) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.7.14",
+  "version": "0.8.0-a2",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.4.8",

package/ts-src/calcit.procs.mts

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

package/ts-src/js-cirru.mts

@@ -108,10 +108,22 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
     return buffer;
   }
   if (x instanceof CalcitRecord) {
-    let buffer: CirruEdnFormat = ["%{}", x.name.toString()];
+    let buffer: [string, CirruEdnFormat] = ["%{}", x.name.toString()];
     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 = is_literal(a[1] as CalcitValue);
+      let b1_literal = is_literal(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);
+      }
+    });
     return buffer;
   }
   if (x instanceof CalcitSet) {