@calcit/procs 0.5.0-a9 → 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;
             }

package/lib/calcit.procs.js

@@ -1,7 +1,7 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.5.0-a9";
-import { initTernaryTreeMap } from "@calcit/ternary-tree";
+export const calcit_version = "0.5.0";
+import "@calcit/ternary-tree";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import "./js-primes";
@@ -16,8 +16,8 @@ export * from "./js-primes";
 export * from "./js-tuple";
 export * from "./custom-formatter";
 export * from "./js-cirru";
-import { CalcitList, foldl } from "./js-list";
-import { CalcitMap } from "./js-map";
+import { CalcitList, CalcitSliceList, foldl } from "./js-list";
+import { CalcitMap, CalcitSliceMap } from "./js-map";
 import { CalcitSet } from "./js-set";
 import { CalcitTuple } from "./js-tuple";
 import { to_calcit_data, extract_cirru_edn } from "./js-cirru";
@@ -32,10 +32,10 @@ export let type_of = (x) => {
     if (x instanceof CalcitKeyword) {
         return kwd("keyword");
     }
-    if (x instanceof CalcitList) {
+    if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         return kwd("list");
     }
-    if (x instanceof CalcitMap) {
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         return kwd("map");
     }
     if (x == null) {
@@ -76,7 +76,7 @@ export let print = (...xs) => {
     console.log(xs.map((x) => toString(x, false)).join(" "));
 };
 export function _$n_list_$o_count(x) {
-    if (x instanceof CalcitList)
+    if (x instanceof CalcitList || x instanceof CalcitSliceList)
         return x.len();
     throw new Error(`expected a list ${x}`);
 }
@@ -86,7 +86,7 @@ export function _$n_str_$o_count(x) {
     throw new Error(`expected a string ${x}`);
 }
 export function _$n_map_$o_count(x) {
-    if (x instanceof CalcitMap)
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap)
         return x.len();
     throw new Error(`expected a map ${x}`);
 }
@@ -101,17 +101,17 @@ export function _$n_set_$o_count(x) {
     throw new Error(`expected a set ${x}`);
 }
 export let _$L_ = (...xs) => {
-    return new CalcitList(xs);
+    return new CalcitSliceList(xs);
 };
 // single quote as alias for list
 export let _SQUO_ = (...xs) => {
-    return new CalcitList(xs);
+    return new CalcitSliceList(xs);
 };
 export let _$n__$M_ = (...xs) => {
     if (xs.length % 2 !== 0) {
         throw new Error("&map expects even number of arguments");
     }
-    return new CalcitMap(xs);
+    return new CalcitSliceMap(xs);
 };
 export let defatom = (path, x) => {
     let v = new CalcitRef(x, path);
@@ -151,7 +151,7 @@ export let _$n_str_$o_contains_$q_ = (xs, x) => {
     throw new Error("string `contains?` expected a string");
 };
 export let _$n_list_$o_contains_$q_ = (xs, x) => {
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (typeof x != "number") {
             throw new Error("Expected number index for detecting");
         }
@@ -164,7 +164,7 @@ export let _$n_list_$o_contains_$q_ = (xs, x) => {
     throw new Error("list `contains?` expected a list");
 };
 export let _$n_map_$o_contains_$q_ = (xs, x) => {
-    if (xs instanceof CalcitMap)
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap)
         return xs.contains(x);
     throw new Error("map `contains?` expected a map");
 };
@@ -183,7 +183,7 @@ export let _$n_str_$o_includes_$q_ = (xs, x) => {
     throw new Error("string includes? expected a string");
 };
 export let _$n_list_$o_includes_$q_ = (xs, x) => {
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         let size = xs.len();
         for (let v of xs.items()) {
             if (_$n__$e_(v, x)) {
@@ -195,7 +195,7 @@ export let _$n_list_$o_includes_$q_ = (xs, x) => {
     throw new Error("list includes? expected a list");
 };
 export let _$n_map_$o_includes_$q_ = (xs, x) => {
-    if (xs instanceof CalcitMap) {
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
         for (let [k, v] of xs.pairs()) {
             if (_$n__$e_(v, x)) {
                 return true;
@@ -225,7 +225,7 @@ export let _$n_list_$o_nth = function (xs, k) {
         throw new Error("nth takes 2 arguments");
     if (typeof k !== "number")
         throw new Error("Expected number index for a list");
-    if (xs instanceof CalcitList)
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList)
         return xs.get(k);
     throw new Error("Does not support `nth` on this type");
 };
@@ -249,7 +249,7 @@ export let _$n_record_$o_get = function (xs, k) {
 export let _$n_list_$o_assoc = function (xs, k, v) {
     if (arguments.length !== 3)
         throw new Error("assoc takes 3 arguments");
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (typeof k !== "number") {
             throw new Error("Expected number index for lists");
         }
@@ -273,7 +273,7 @@ export let _$n_map_$o_assoc = function (xs, ...args) {
         throw new Error("assoc takes at least 3 arguments");
     if (args.length % 2 !== 0)
         throw new Error("assoc expected odd arguments");
-    if (xs instanceof CalcitMap)
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap)
         return xs.assoc(...args);
     throw new Error("map `assoc` expected a map");
 };
@@ -288,7 +288,7 @@ export let _$n_list_$o_assoc_before = function (xs, k, v) {
     if (arguments.length !== 3) {
         throw new Error("assoc takes 3 arguments");
     }
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (typeof k !== "number") {
             throw new Error("Expected number index for lists");
         }
@@ -300,7 +300,7 @@ export let _$n_list_$o_assoc_after = function (xs, k, v) {
     if (arguments.length !== 3) {
         throw new Error("assoc takes 3 arguments");
     }
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (typeof k !== "number") {
             throw new Error("Expected number index for lists");
         }
@@ -311,7 +311,7 @@ export let _$n_list_$o_assoc_after = function (xs, k, v) {
 export let _$n_list_$o_dissoc = function (xs, k) {
     if (arguments.length !== 2)
         throw new Error("dissoc takes 2 arguments");
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (typeof k !== "number")
             throw new Error("Expected number index for lists");
         return xs.dissoc(k);
@@ -321,7 +321,7 @@ export let _$n_list_$o_dissoc = function (xs, k) {
 export let _$n_map_$o_dissoc = function (xs, ...args) {
     if (args.length < 1)
         throw new Error("dissoc takes at least 2 arguments");
-    if (xs instanceof CalcitMap) {
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
         return xs.dissoc(...args);
     }
     throw new Error("`dissoc` expected a map");
@@ -355,7 +355,7 @@ export let remove_watch = (a, k) => {
     return null;
 };
 export let range = (n, m, m2) => {
-    var result = new CalcitList([]);
+    var result = new CalcitSliceList([]);
     if (m2 != null) {
         console.warn("TODO range with 3 arguments"); // TODO
     }
@@ -376,17 +376,17 @@ export let range = (n, m, m2) => {
     return result;
 };
 export function _$n_list_$o_empty_$q_(xs) {
-    if (xs instanceof CalcitList)
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList)
         return xs.isEmpty();
     throw new Error(`expected a list ${xs}`);
 }
 export function _$n_str_$o_empty_$q_(xs) {
-    if (typeof xs == "string")
-        return xs.length == 0;
+    if (typeof xs === "string")
+        return xs.length === 0;
     throw new Error(`expected a string ${xs}`);
 }
 export function _$n_map_$o_empty_$q_(xs) {
-    if (xs instanceof CalcitMap)
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap)
         return xs.isEmpty();
     throw new Error(`expected a list ${xs}`);
 }
@@ -396,7 +396,7 @@ export function _$n_set_$o_empty_$q_(xs) {
     throw new Error(`expected a list ${xs}`);
 }
 export let _$n_list_$o_first = (xs) => {
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (xs.isEmpty()) {
             return null;
         }
@@ -413,11 +413,11 @@ export let _$n_str_$o_first = (xs) => {
     throw new Error("Expected a string");
 };
 export let _$n_map_$o_first = (xs) => {
-    if (xs instanceof CalcitMap) {
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
         // TODO order may not be stable enough
         let ys = xs.pairs();
         if (ys.length > 0) {
-            return new CalcitList(ys[0]);
+            return new CalcitSliceList(ys[0]);
         }
         else {
             return null;
@@ -444,7 +444,7 @@ export let timeout_call = (duration, f) => {
     return null;
 };
 export let _$n_list_$o_rest = (xs) => {
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (xs.len() === 0) {
             return null;
         }
@@ -466,13 +466,13 @@ export let _$n_set_$o_rest = (xs) => {
     throw new Error("Expect a set");
 };
 export let _$n_map_$o_rest = (xs) => {
-    if (xs instanceof CalcitMap) {
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
         if (xs.len() > 0) {
             let k0 = xs.pairs()[0][0];
             return xs.dissoc(k0);
         }
         else {
-            return new CalcitMap(initTernaryTreeMap([]));
+            return new CalcitSliceMap([]);
         }
     }
     console.error(xs);
@@ -488,19 +488,19 @@ export let not = (x) => {
     return !x;
 };
 export let prepend = (xs, v) => {
-    if (!(xs instanceof CalcitList)) {
+    if (!(xs instanceof CalcitList || xs instanceof CalcitSliceList)) {
         throw new Error("Expected array");
     }
     return xs.prepend(v);
 };
 export let append = (xs, v) => {
-    if (!(xs instanceof CalcitList)) {
+    if (!(xs instanceof CalcitList || xs instanceof CalcitSliceList)) {
         throw new Error("Expected array");
     }
     return xs.append(v);
 };
 export let last = (xs) => {
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (xs.isEmpty()) {
             return null;
         }
@@ -513,7 +513,7 @@ export let last = (xs) => {
     throw new Error("Data not ready for last");
 };
 export let butlast = (xs) => {
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         if (xs.len() === 0) {
             return null;
         }
@@ -555,7 +555,7 @@ export let _$n_list_$o_slice = (xs, from, to) => {
         to = size;
     }
     else if (to <= from) {
-        return new CalcitList([]);
+        return new CalcitSliceList([]);
     }
     else if (to > size) {
         to = size;
@@ -563,12 +563,12 @@ export let _$n_list_$o_slice = (xs, from, to) => {
     return xs.slice(from, to);
 };
 export let _$n_list_$o_concat = (...lists) => {
-    let result = new CalcitList([]);
+    let result = new CalcitSliceList([]);
     for (let item of lists) {
         if (item == null) {
             continue;
         }
-        if (item instanceof CalcitList) {
+        if (item instanceof CalcitList || item instanceof CalcitSliceList) {
             if (result.isEmpty()) {
                 result = item;
             }
@@ -608,7 +608,7 @@ export let _$n_number_$o_rem = (a, b) => {
     return a % b;
 };
 export let round_$q_ = (a) => {
-    return a == Math.round(a);
+    return a === Math.round(a);
 };
 export let _$n_str_$o_concat = (a, b) => {
     let buffer = "";
@@ -624,9 +624,9 @@ export let sort = (xs, f) => {
     if (xs == null) {
         return null;
     }
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         let ys = xs.toArray();
-        return new CalcitList(ys.sort(f));
+        return new CalcitSliceList(ys.sort(f));
     }
     throw new Error("Expected list");
 };
@@ -640,8 +640,8 @@ export let _$n_merge = (a, b) => {
     if (b == null) {
         return a;
     }
-    if (a instanceof CalcitMap) {
-        if (b instanceof CalcitMap) {
+    if (a instanceof CalcitMap || a instanceof CalcitSliceMap) {
+        if (b instanceof CalcitMap || b instanceof CalcitSliceMap) {
             return a.merge(b);
         }
         else {
@@ -649,7 +649,7 @@ export let _$n_merge = (a, b) => {
         }
     }
     if (a instanceof CalcitRecord) {
-        if (b instanceof CalcitMap) {
+        if (b instanceof CalcitMap || b instanceof CalcitSliceMap) {
             let values = [];
             for (let item of a.values) {
                 values.push(item);
@@ -682,26 +682,26 @@ export let _$n_merge_non_nil = (a, b) => {
     if (b == null) {
         return a;
     }
-    if (!(a instanceof CalcitMap)) {
+    if (!(a instanceof CalcitMap || a instanceof CalcitSliceMap)) {
         throw new Error("Expected map");
     }
-    if (!(b instanceof CalcitMap)) {
+    if (!(b instanceof CalcitMap || b instanceof CalcitSliceMap)) {
         throw new Error("Expected map");
     }
     return a.mergeSkip(b, null);
 };
 export let to_pairs = (xs) => {
-    if (xs instanceof CalcitMap) {
+    if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
         let result = [];
         for (let [k, v] of xs.pairs()) {
-            result.push(new CalcitList([k, v]));
+            result.push(new CalcitSliceList([k, v]));
         }
         return new CalcitSet(result);
     }
     else if (xs instanceof CalcitRecord) {
         let arr_result = [];
         for (let idx = 0; idx < xs.fields.length; idx++) {
-            arr_result.push(new CalcitList([xs.fields[idx], xs.values[idx]]));
+            arr_result.push(new CalcitSliceList([xs.fields[idx], xs.values[idx]]));
         }
         return new CalcitSet(arr_result);
     }
@@ -785,10 +785,10 @@ export let _$n_str_$o_replace = (x, y, z) => {
     return result;
 };
 export let split = (xs, x) => {
-    return new CalcitList(xs.split(x));
+    return new CalcitSliceList(xs.split(x));
 };
 export let split_lines = (xs) => {
-    return new CalcitList(xs.split("\n"));
+    return new CalcitSliceList(xs.split("\n"));
 };
 export let _$n_str_$o_slice = (xs, m, n) => {
     if (n <= m) {
@@ -811,13 +811,13 @@ export let trim = (x, c) => {
         var buffer = x;
         var size = buffer.length;
         var idx = 0;
-        while (idx < size && buffer[idx] == c) {
+        while (idx < size && buffer[idx] === c) {
             idx = idx + 1;
         }
         buffer = buffer.substring(idx);
         var size = buffer.length;
         var idx = size;
-        while (idx > 1 && buffer[idx - 1] == c) {
+        while (idx > 1 && buffer[idx - 1] === c) {
             idx = idx - 1;
         }
         buffer = buffer.substring(0, idx);
@@ -840,7 +840,7 @@ export let char_from_code = (n) => {
     return String.fromCharCode(n);
 };
 export let _$n_set_$o_to_list = (x) => {
-    return new CalcitList(x.values());
+    return new CalcitSliceList(x.values());
 };
 export let aget = (x, name) => {
     return x[name];
@@ -964,13 +964,13 @@ export let _$n_str_$o_compare = (x, y) => {
     return 0;
 };
 export let arrayToList = (xs) => {
-    return new CalcitList(xs !== null && xs !== void 0 ? xs : []);
+    return new CalcitSliceList(xs !== null && xs !== void 0 ? xs : []);
 };
 export let listToArray = (xs) => {
     if (xs == null) {
         return null;
     }
-    if (xs instanceof CalcitList) {
+    if (xs instanceof CalcitList || xs instanceof CalcitSliceList) {
         return xs.toArray();
     }
     else {
@@ -993,10 +993,10 @@ export let keyword_$q_ = (x) => {
     return x instanceof CalcitKeyword;
 };
 export let map_$q_ = (x) => {
-    return x instanceof CalcitMap;
+    return x instanceof CalcitSliceMap || x instanceof CalcitMap;
 };
 export let list_$q_ = (x) => {
-    return x instanceof CalcitList;
+    return x instanceof CalcitSliceList || x instanceof CalcitList;
 };
 export let set_$q_ = (x) => {
     return x instanceof CalcitSet;
@@ -1052,7 +1052,7 @@ export let format_to_lisp = (x) => {
     else if (x instanceof CalcitSymbol) {
         return x.value;
     }
-    else if (x instanceof CalcitList) {
+    else if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         let chunk = "(";
         for (let item of x.items()) {
             if (chunk != "(") {
@@ -1082,7 +1082,7 @@ export let transform_code_to_cirru = (x) => {
     else if (x instanceof CalcitSymbol) {
         return x.value;
     }
-    else if (x instanceof CalcitList) {
+    else if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         let xs = [];
         for (let item of x.items()) {
             xs.push(transform_code_to_cirru(item));
@@ -1166,13 +1166,13 @@ export function invoke_method(p) {
         else if (obj instanceof CalcitSet) {
             klass = calcit_builtin_classes.set;
         }
-        else if (obj instanceof CalcitList) {
+        else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
             klass = calcit_builtin_classes.list;
         }
         else if (obj instanceof CalcitRecord) {
             klass = calcit_builtin_classes.record;
         }
-        else if (obj instanceof CalcitMap) {
+        else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
             klass = calcit_builtin_classes.map;
         }
         else {
@@ -1195,12 +1195,12 @@ export function invoke_method(p) {
     };
 }
 export let _$n_map_$o_to_list = (m) => {
-    if (m instanceof CalcitMap) {
+    if (m instanceof CalcitMap || m instanceof CalcitSliceMap) {
         let ys = [];
         for (let pair of m.pairs()) {
-            ys.push(new CalcitList(pair));
+            ys.push(new CalcitSliceList(pair));
         }
-        return new CalcitList(ys);
+        return new CalcitSliceList(ys);
     }
     else {
         throw new Error("&map:to-list expected a Map");
@@ -1244,11 +1244,11 @@ let typeAsInt = (x) => {
         return PseudoTypeIndex.tuple;
     if (x instanceof CalcitRecur)
         return PseudoTypeIndex.recur;
-    if (x instanceof CalcitList)
+    if (x instanceof CalcitList || x instanceof CalcitSliceList)
         return PseudoTypeIndex.list;
     if (x instanceof CalcitSet)
         return PseudoTypeIndex.set;
-    if (x instanceof CalcitMap)
+    if (x instanceof CalcitMap || x instanceof CalcitSliceMap)
         return PseudoTypeIndex.map;
     if (x instanceof CalcitRecord)
         return PseudoTypeIndex.record;
@@ -1307,7 +1307,7 @@ export let _$n_compare = (a, b) => {
     }
 };
 export let _$n_map_$o_diff_new = (a, b) => {
-    if (a instanceof CalcitMap && b instanceof CalcitMap) {
+    if ((a instanceof CalcitMap || a instanceof CalcitSliceMap) && (b instanceof CalcitMap || b instanceof CalcitSliceMap)) {
         return a.diffNew(b);
     }
     else {
@@ -1315,7 +1315,7 @@ export let _$n_map_$o_diff_new = (a, b) => {
     }
 };
 export let _$n_map_$o_diff_keys = (a, b) => {
-    if (a instanceof CalcitMap && b instanceof CalcitMap) {
+    if ((a instanceof CalcitMap || a instanceof CalcitSliceMap) && (b instanceof CalcitMap || b instanceof CalcitSliceMap)) {
         return a.diffKeys(b);
     }
     else {
@@ -1323,7 +1323,7 @@ export let _$n_map_$o_diff_keys = (a, b) => {
     }
 };
 export let _$n_map_$o_common_keys = (a, b) => {
-    if (a instanceof CalcitMap && b instanceof CalcitMap) {
+    if ((a instanceof CalcitMap || a instanceof CalcitSliceMap) && (b instanceof CalcitMap || b instanceof CalcitSliceMap)) {
         return a.commonKeys(b);
     }
     else {
@@ -1355,7 +1355,7 @@ export let _$n_list_$o_distinct = (xs) => {
         }
         result.push(data[idx]);
     }
-    return new CalcitList(result);
+    return new CalcitSliceList(result);
 };
 export let _$n_get_os = () => {
     return kwd("js-engine");