@calcit/procs 0.5.32 → 0.5.35

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.5.32";
+export const calcit_version = "0.5.35";
 import "@calcit/ternary-tree";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";

package/lib/js-cirru.mjs

@@ -1,6 +1,6 @@
 import "@calcit/ternary-tree";
 import { writeCirruCode } from "@cirru/writer.ts";
-import { _$n_compare } from "./js-primes.mjs";
+import { is_literal, _$n_compare } from "./js-primes.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
@@ -50,7 +50,30 @@ export let to_cirru_edn = (x) => {
             pairs.push(pair);
         }
         pairs.sort((a, b) => {
-            return _$n_compare(a[0], b[0]);
+            let a0_literal = is_literal(a[0]);
+            let a1_literal = is_literal(a[1]);
+            let b0_literal = is_literal(b[0]);
+            let b1_literal = is_literal(b[1]);
+            if (a0_literal && b0_literal) {
+                if (a1_literal && !b1_literal) {
+                    return -1;
+                }
+                else if (!a1_literal && b1_literal) {
+                    return 1;
+                }
+                else {
+                    return _$n_compare(a[0], b[0]);
+                }
+            }
+            else if (a0_literal && !b0_literal) {
+                return -1;
+            }
+            else if (!a0_literal && b0_literal) {
+                return 1;
+            }
+            else {
+                return _$n_compare(a[0], b[0]);
+            }
         });
         for (let [k, v] of pairs) {
             buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);

package/lib/js-primes.mjs

@@ -4,6 +4,21 @@ import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet as CalcitSet } from "./js-set.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
+export let is_literal = (x) => {
+    if (x == null)
+        return true;
+    if (typeof x == "string")
+        return true;
+    if (typeof x == "boolean")
+        return true;
+    if (typeof x == "number")
+        return true;
+    if (x instanceof CalcitKeyword)
+        return true;
+    if (x instanceof CalcitSymbol)
+        return true;
+    return false;
+};
 var PseudoTypeIndex;
 (function (PseudoTypeIndex) {
     PseudoTypeIndex[PseudoTypeIndex["nil"] = 0] = "nil";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.32",
+  "version": "0.5.35",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^17.0.23",

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.5.32";
+export const calcit_version = "0.5.35";
 
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { parse, ICirruNode } from "@cirru/parser.ts";

package/ts-src/js-cirru.mts

@@ -1,7 +1,7 @@
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { CirruWriterNode, writeCirruCode } from "@cirru/writer.ts";
 
-import { CalcitValue, _$n_compare } from "./js-primes.mjs";
+import { CalcitValue, is_literal, _$n_compare } from "./js-primes.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
@@ -55,7 +55,25 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
       pairs.push(pair);
     }
     pairs.sort((a, b) => {
-      return _$n_compare(a[0], b[0]);
+      let a0_literal = is_literal(a[0]);
+      let a1_literal = is_literal(a[1]);
+      let b0_literal = is_literal(b[0]);
+      let b1_literal = is_literal(b[1]);
+      if (a0_literal && b0_literal) {
+        if (a1_literal && !b1_literal) {
+          return -1;
+        } else if (!a1_literal && b1_literal) {
+          return 1;
+        } else {
+          return _$n_compare(a[0], b[0]);
+        }
+      } else if (a0_literal && !b0_literal) {
+        return -1;
+      } else if (!a0_literal && b0_literal) {
+        return 1;
+      } else {
+        return _$n_compare(a[0], b[0]);
+      }
     });
     for (let [k, v] of pairs) {
       buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);

package/ts-src/js-primes.mts

@@ -23,6 +23,16 @@ export type CalcitValue =
   | CalcitRecord
   | null;
 
+export let is_literal = (x: CalcitValue): boolean => {
+  if (x == null) return true;
+  if (typeof x == "string") return true;
+  if (typeof x == "boolean") return true;
+  if (typeof x == "number") return true;
+  if (x instanceof CalcitKeyword) return true;
+  if (x instanceof CalcitSymbol) return true;
+  return false;
+};
+
 enum PseudoTypeIndex {
   nil,
   bool,