@calcit/procs 0.5.37 → 0.5.40

package/lib/calcit-data.mjs

@@ -3,7 +3,7 @@ import { overwriteComparator } from "@calcit/ternary-tree";
 import { overwriteMapComparator } from "./js-map.mjs";
 import { CalcitRecord, fieldsEqual } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
-import "./js-primes.mjs";
+import { _$n_compare } from "./js-primes.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitSet, overwriteSetComparator } from "./js-set.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
@@ -220,9 +220,10 @@ export let hashFunction = (x) => {
         return base;
     }
     if (x instanceof CalcitSet) {
-        // TODO not using dirty solution for code
         let base = defaultHash_set;
         let values = x.values();
+        // sort elements for stable hash result
+        values.sort((a, b) => _$n_compare(a, b));
         for (let idx = 0; idx < values.length; idx++) {
             let item = values[idx];
             base = mergeValueHash(base, hashFunction(item));
@@ -249,7 +250,9 @@ export let hashFunction = (x) => {
     }
     if (x instanceof CalcitSliceMap) {
         let base = defaultHash_map;
-        for (let [k, v] of x.pairs()) {
+        let pairs = x.pairs();
+        pairs.sort((a, b) => _$n_compare(a[0], b[0]));
+        for (let [k, v] of pairs) {
             base = mergeValueHash(base, hashFunction(k));
             base = mergeValueHash(base, hashFunction(v));
         }
@@ -258,7 +261,9 @@ export let hashFunction = (x) => {
     }
     if (x instanceof CalcitMap) {
         let base = defaultHash_map;
-        for (let [k, v] of x.pairs()) {
+        let pairs = x.pairs();
+        pairs.sort((a, b) => _$n_compare(a[0], b[0]));
+        for (let [k, v] of pairs) {
             base = mergeValueHash(base, hashFunction(k));
             base = mergeValueHash(base, hashFunction(v));
         }

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.5.37";
+export const calcit_version = "0.5.40";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import "./js-primes.mjs";
@@ -848,7 +848,7 @@ export let aget = (x, name) => {
 export let aset = (x, name, v) => {
     return (x[name] = v);
 };
-export let get_env = (name) => {
+export let get_env = (name, v0) => {
     let v = undefined;
     if (inNodeJs) {
         // only available for Node.js
@@ -857,10 +857,13 @@ export let get_env = (name) => {
     else if (typeof URLSearchParams != null && typeof location != null) {
         v = new URLSearchParams(location.search).get(name);
     }
-    if (v == null) {
-        console.warn(`(get-env "${name}"): ${v}`);
+    if (v != null && v0 != null) {
+        console.log(`(get-env ${name}): ${v}`);
     }
-    return v;
+    if (v == null && v0 == null) {
+        console.warn(`(get-env "${name}"): config not found`);
+    }
+    return v !== null && v !== void 0 ? v : v0;
 };
 export let turn_keyword = (x) => {
     if (typeof x === "string") {

package/lib/js-list.mjs

@@ -110,7 +110,10 @@ export class CalcitSliceList {
         return this.end - this.start;
     }
     get(idx) {
-        return this.value[this.start + idx];
+        if (idx >= 0 && this.start + idx < this.end) {
+            return this.value[this.start + idx];
+        }
+        return null;
     }
     assoc(idx, v) {
         return this.turnListMode().assoc(idx, v);
@@ -147,6 +150,10 @@ export class CalcitSliceList {
         if (to < from) {
             throw new Error("end index too small");
         }
+        if (from === to) {
+            // when it's empty, just return empty list
+            return new CalcitSliceList([]);
+        }
         let result = new CalcitSliceList(this.value);
         result.start = this.start + from;
         result.end = this.start + to;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.37",
+  "version": "0.5.40",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^17.0.23",
+    "@types/node": "^17.0.29",
     "typescript": "^4.6.3"
   },
   "scripts": {

package/ts-src/calcit-data.mts

@@ -5,7 +5,7 @@ import { overwriteMapComparator } from "./js-map.mjs";
 import { CalcitRecord, fieldsEqual } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 
-import { CalcitValue } from "./js-primes.mjs";
+import { CalcitValue, _$n_compare } from "./js-primes.mjs";
 import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitSet, overwriteSetComparator } from "./js-set.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
@@ -251,9 +251,10 @@ export let hashFunction = (x: CalcitValue): Hash => {
     return base;
   }
   if (x instanceof CalcitSet) {
-    // TODO not using dirty solution for code
     let base = defaultHash_set;
     let values = x.values();
+    // sort elements for stable hash result
+    values.sort((a, b) => _$n_compare(a, b));
     for (let idx = 0; idx < values.length; idx++) {
       let item = values[idx];
       base = mergeValueHash(base, hashFunction(item));
@@ -280,7 +281,9 @@ export let hashFunction = (x: CalcitValue): Hash => {
   }
   if (x instanceof CalcitSliceMap) {
     let base = defaultHash_map;
-    for (let [k, v] of x.pairs()) {
+    let pairs = x.pairs();
+    pairs.sort((a, b) => _$n_compare(a[0], b[0]));
+    for (let [k, v] of pairs) {
       base = mergeValueHash(base, hashFunction(k));
       base = mergeValueHash(base, hashFunction(v));
     }
@@ -289,7 +292,10 @@ export let hashFunction = (x: CalcitValue): Hash => {
   }
   if (x instanceof CalcitMap) {
     let base = defaultHash_map;
-    for (let [k, v] of x.pairs()) {
+
+    let pairs = x.pairs();
+    pairs.sort((a, b) => _$n_compare(a[0], b[0]));
+    for (let [k, v] of pairs) {
       base = mergeValueHash(base, hashFunction(k));
       base = mergeValueHash(base, hashFunction(v));
     }

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.5.37";
+export const calcit_version = "0.5.40";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -935,7 +935,7 @@ export let aset = (x: any, name: string, v: any): any => {
   return (x[name] = v);
 };
 
-export let get_env = (name: string): string => {
+export let get_env = (name: string, v0: string): string => {
   let v = undefined;
   if (inNodeJs) {
     // only available for Node.js
@@ -943,10 +943,13 @@ export let get_env = (name: string): string => {
   } else if (typeof URLSearchParams != null && typeof location != null) {
     v = new URLSearchParams(location.search).get(name);
   }
-  if (v == null) {
-    console.warn(`(get-env "${name}"): ${v}`);
+  if (v != null && v0 != null) {
+    console.log(`(get-env ${name}): ${v}`);
   }
-  return v;
+  if (v == null && v0 == null) {
+    console.warn(`(get-env "${name}"): config not found`);
+  }
+  return v ?? v0;
 };
 
 export let turn_keyword = (x: CalcitValue): CalcitKeyword => {

package/ts-src/js-list.mts

@@ -132,7 +132,10 @@ export class CalcitSliceList {
     return this.end - this.start;
   }
   get(idx: number) {
-    return this.value[this.start + idx];
+    if (idx >= 0 && this.start + idx < this.end) {
+      return this.value[this.start + idx];
+    }
+    return null;
   }
   assoc(idx: number, v: CalcitValue) {
     return this.turnListMode().assoc(idx, v);
@@ -166,6 +169,10 @@ export class CalcitSliceList {
     if (to < from) {
       throw new Error("end index too small");
     }
+    if (from === to) {
+      // when it's empty, just return empty list
+      return new CalcitSliceList([]);
+    }
     let result = new CalcitSliceList(this.value);
     result.start = this.start + from;
     result.end = this.start + to;