@calcit/procs 0.5.0-a6 → 0.5.0

package/lib/calcit-data.js

@@ -2,9 +2,9 @@ import { overwriteHashGenerator, valueHash, mergeValueHash } from "@calcit/terna
 import { overwriteComparator } from "@calcit/ternary-tree";
 import { overwriteMapComparator } from "./js-map";
 import { CalcitRecord, fieldsEqual } from "./js-record";
-import { CalcitMap } from "./js-map";
+import { CalcitMap, CalcitSliceMap } from "./js-map";
 import "./js-primes";
-import { CalcitList } from "./js-list";
+import { CalcitList, CalcitSliceList } from "./js-list";
 import { CalcitSet, overwriteSetComparator } from "./js-set";
 import { CalcitTuple } from "./js-tuple";
 // we have to inject cache in a dirty way in some cases
@@ -51,10 +51,10 @@ export class CalcitRecur {
     }
 }
 export let isNestedCalcitData = (x) => {
-    if (x instanceof CalcitList) {
+    if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         return x.len() > 0;
     }
-    if (x instanceof CalcitMap) {
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         return x.len() > 0;
     }
     if (x instanceof CalcitRecord) {
@@ -66,10 +66,10 @@ export let isNestedCalcitData = (x) => {
     return false;
 };
 export let tipNestedCalcitData = (x) => {
-    if (x instanceof CalcitList) {
+    if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         return "'[]...";
     }
-    if (x instanceof CalcitMap) {
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         return "'{}...";
     }
     if (x instanceof CalcitRecord) {
@@ -120,9 +120,9 @@ export function findInFields(xs, y) {
             return pos;
         }
     }
-    if (y == xs[lower])
+    if (y === xs[lower])
         return lower;
-    if (y == xs[upper])
+    if (y === xs[upper])
         return upper;
     return -1;
 }
@@ -148,7 +148,7 @@ export let castKwd = (x) => {
     if (x instanceof CalcitSymbol) {
         return kwd(x.value);
     }
-    throw new Error("Cannot cast thst to keyword");
+    throw new Error(`Cannot cast this to keyword: ${x}`);
 };
 export var refsRegistry = new Map();
 let defaultHash_nil = valueHash("nil:");
@@ -229,6 +229,16 @@ let hashFunction = (x) => {
         }
         return base;
     }
+    if (x instanceof CalcitSliceList) {
+        let base = defaultHash_list;
+        // low-level code for perf
+        for (let idx = x.start; idx < x.end; idx++) {
+            let item = x.value[idx];
+            base = mergeValueHash(base, hashFunction(item));
+        }
+        x.cachedHash = base;
+        return base;
+    }
     if (x instanceof CalcitList) {
         let base = defaultHash_list;
         for (let item of x.items()) {
@@ -237,6 +247,15 @@ let hashFunction = (x) => {
         x.cachedHash = base;
         return base;
     }
+    if (x instanceof CalcitSliceMap) {
+        let base = defaultHash_map;
+        for (let [k, v] of x.pairs()) {
+            base = mergeValueHash(base, hashFunction(k));
+            base = mergeValueHash(base, hashFunction(v));
+        }
+        x.cachedHash = base;
+        return base;
+    }
     if (x instanceof CalcitMap) {
         let base = defaultHash_map;
         for (let [k, v] of x.pairs()) {
@@ -300,10 +319,10 @@ export let toString = (x, escaped) => {
     if (x instanceof CalcitKeyword) {
         return x.toString();
     }
-    if (x instanceof CalcitList) {
+    if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         return x.toString();
     }
-    if (x instanceof CalcitMap) {
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         return x.toString();
     }
     if (x instanceof CalcitSet) {
@@ -349,14 +368,14 @@ export let to_js_data = (x, addColon = false) => {
         }
         return Symbol(x.value);
     }
-    if (x instanceof CalcitList) {
+    if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         var result = [];
         for (let item of x.items()) {
             result.push(to_js_data(item, addColon));
         }
         return result;
     }
-    if (x instanceof CalcitMap) {
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         let result = {};
         for (let [k, v] of x.pairs()) {
             var key = to_js_data(k, addColon);
@@ -390,7 +409,7 @@ export let _$n_map_$o_get = function (xs, k) {
     if (arguments.length !== 2) {
         throw new Error("map &get takes 2 arguments");
     }
-    if (xs instanceof CalcitMap)
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap)
         return xs.get(k);
     throw new Error("Does not support `&get` on this type");
 };
@@ -434,8 +453,8 @@ export let _$n__$e_ = (x, y) => {
         }
         return false;
     }
-    if (x instanceof CalcitList) {
-        if (y instanceof CalcitList) {
+    if (x instanceof CalcitList || x instanceof CalcitSliceList) {
+        if (y instanceof CalcitList || y instanceof CalcitSliceList) {
             if (x.len() !== y.len()) {
                 return false;
             }
@@ -451,8 +470,8 @@ export let _$n__$e_ = (x, y) => {
         }
         return false;
     }
-    if (x instanceof CalcitMap) {
-        if (y instanceof CalcitMap) {
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
+        if (y instanceof CalcitMap || y instanceof CalcitSliceMap) {
             if (x.len() !== y.len()) {
                 return false;
             }