@calcit/ternary-tree 0.0.16 → 0.0.19-a1

package/lib/index.d.mts

@@ -0,0 +1,4 @@
+export * from "./types.mjs";
+export * from "./map.mjs";
+export * from "./list.mjs";
+export { overwriteComparator } from "./utils.mjs";

package/lib/index.mjs

@@ -0,0 +1,4 @@
+export * from "./types.mjs";
+export * from "./map.mjs";
+export * from "./list.mjs";
+export { overwriteComparator } from "./utils.mjs";

package/lib/{list.d.ts → list.d.mts}

@@ -1,7 +1,8 @@
-import { TernaryTreeList } from "./types";
+import { TernaryTreeList } from "./types.mjs";
 export declare function getDepth<T>(tree: TernaryTreeList<T>): number;
 export declare function makeTernaryTreeList<T>(size: number, offset: number, xs: Array<TernaryTreeList<T>>): TernaryTreeList<T>;
 export declare function initTernaryTreeList<T>(xs: Array<T>): TernaryTreeList<T>;
+export declare function initTernaryTreeListFromRange<T>(xs: Array<T>, from: number, to: number): TernaryTreeList<T>;
 export declare function initEmptyTernaryTreeList<T>(): TernaryTreeList<T>;
 export declare function listToString<T>(tree: TernaryTreeList<T>): string;
 export declare function listLen<T>(tree: TernaryTreeList<T>): number;

package/lib/{list.js → list.mjs}

@@ -1,6 +1,5 @@
-import { TernaryTreeKind } from "./types";
-import "./map";
-import { dataEqual, divideTernarySizes, roughIntPow } from "./utils";
+import { TernaryTreeKind } from "./types.mjs";
+import { dataEqual, divideTernarySizes, roughIntPow } from "./utils.mjs";
 // just get, will not compute recursively
 export function getDepth(tree) {
     if (tree == null)
@@ -90,6 +89,15 @@ export function initTernaryTreeList(xs) {
     }
     return makeTernaryTreeList(xs.length, 0, ys);
 }
+// from a slice of an existed array
+export function initTernaryTreeListFromRange(xs, from, to) {
+    let ys = new Array(xs.length);
+    for (let idx = from; idx < to; idx++) {
+        let x = xs[idx];
+        ys[idx] = { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: x };
+    }
+    return makeTernaryTreeList(xs.length, 0, ys);
+}
 export function initEmptyTernaryTreeList() {
     return { kind: TernaryTreeKind.ternaryTreeBranch, size: 0, depth: 1, middle: emptyBranch, left: emptyBranch, right: emptyBranch };
 }
@@ -789,7 +797,7 @@ export function listEqual(xs, ys) {
     return true;
 }
 export function checkListStructure(tree) {
-    if (tree == null) {
+    if (tree == null || listLen(tree) === 0) {
         return true;
     }
     else {

package/lib/main.d.mts

@@ -0,0 +1,2 @@
+import "./test-list.mjs";
+import "./test-map.mjs";

package/lib/{main.js → main.mjs}

@@ -1,9 +1,9 @@
-import { deepEqual, overwriteComparator } from "./utils";
-import "./test-list";
-import "./test-map";
-import { runListTests } from "./test-list";
-import { runMapTests } from "./test-map";
-import { mergeValueHash, overwriteHashGenerator, valueHash } from "./types";
+import { deepEqual, overwriteComparator } from "./utils.mjs";
+import "./test-list.mjs";
+import "./test-map.mjs";
+import { runListTests } from "./test-list.mjs";
+import { runMapTests } from "./test-map.mjs";
+import { mergeValueHash, overwriteHashGenerator, valueHash } from "./types.mjs";
 overwriteComparator((x, y) => {
     // console.log("comparing", x, y);
     return deepEqual(x, y);

package/lib/{map.d.ts → map.d.mts}

@@ -1,7 +1,8 @@
-import { TernaryTreeMap, TernaryTreeMapHashEntry } from "./types";
+import { TernaryTreeMap, TernaryTreeMapHashEntry } from "./types.mjs";
 export declare function getMapDepth<K, V>(tree: TernaryTreeMap<K, V>): number;
 export declare function initTernaryTreeMapFromHashEntries<K, T>(xs: Array<TernaryTreeMapHashEntry<K, T>>): TernaryTreeMap<K, T>;
-export declare function initTernaryTreeMap<K, T>(t: Map<K, T> | Array<[K, T]>): TernaryTreeMap<K, T>;
+export declare function initTernaryTreeMap<K, T>(t: Map<K, T>): TernaryTreeMap<K, T>;
+export declare function initTernaryTreeMapFromArray<K, T>(t: Array<[K, T]>): TernaryTreeMap<K, T>;
 export declare function initEmptyTernaryTreeMap<K, T>(): TernaryTreeMap<K, T>;
 export declare function mapToString<K, V>(tree: TernaryTreeMap<K, V>): string;
 export declare function mapLen<K, V>(tree: TernaryTreeMap<K, V>): number;

package/lib/{map.js → map.mjs}

@@ -1,5 +1,5 @@
-import { TernaryTreeKind, hashGenerator } from "./types";
-import { divideTernarySizes, cmp, dataEqual } from "./utils";
+import { TernaryTreeKind, hashGenerator, } from "./types.mjs";
+import { divideTernarySizes, cmp, dataEqual } from "./utils.mjs";
 let emptyBranch = null;
 let nilResult = null;
 function getMax(tree) {
@@ -123,6 +123,7 @@ export function initTernaryTreeMapFromHashEntries(xs) {
 }
 export function initTernaryTreeMap(t) {
     let groupBuffers = new Map();
+    let xs = [];
     for (let [k, v] of t) {
         let h = hashGenerator(k);
         if (groupBuffers.has(h)) {
@@ -135,16 +136,16 @@ export function initTernaryTreeMap(t) {
             }
         }
         else {
-            groupBuffers.set(h, [[k, v]]);
+            let pairs = [[k, v]];
+            groupBuffers.set(h, pairs);
+            xs.push({
+                hash: h,
+                pairs,
+            });
         }
     }
-    let xs = [];
     for (let [k, v] of groupBuffers) {
         if (v != null) {
-            xs.push({
-                hash: k,
-                pairs: v,
-            });
         }
         else {
             throw new Error("Expected reference to paris");
@@ -156,6 +157,38 @@ export function initTernaryTreeMap(t) {
     // checkMapStructure(result);
     return result;
 }
+// use for..in for performance
+export function initTernaryTreeMapFromArray(t) {
+    let groupBuffers = {};
+    let xs = [];
+    for (let idx = 0; idx < t.length; idx++) {
+        let k = t[idx][0];
+        let v = t[idx][1];
+        let h = hashGenerator(k);
+        if (groupBuffers[h] != null) {
+            let branch = groupBuffers[h];
+            if (branch != null) {
+                branch.push([k, v]);
+            }
+            else {
+                throw new Error("Expected referece to pairs");
+            }
+        }
+        else {
+            let pairs = [[k, v]];
+            groupBuffers[h] = pairs;
+            xs.push({
+                hash: h,
+                pairs: pairs,
+            });
+        }
+    }
+    // MUTABLE in-place sort
+    xs.sort((a, b) => cmp(a.hash, b.hash));
+    let result = initTernaryTreeMapFromHashEntries(xs);
+    // checkMapStructure(result);
+    return result;
+}
 // for empty map
 export function initEmptyTernaryTreeMap() {
     let result = emptyBranch;
@@ -593,7 +626,7 @@ function assocExisted(tree, key, item, thisHash = null) {
             left: assocExisted(tree.left, key, item, thisHash),
             middle: tree.middle,
             right: tree.right,
-            depth: 0,
+            depth: 0, // TODO
         };
         return result;
     }
@@ -608,7 +641,7 @@ function assocExisted(tree, key, item, thisHash = null) {
             left: tree.left,
             middle: assocExisted(tree.middle, key, item, thisHash),
             right: tree.right,
-            depth: 0,
+            depth: 0, // TODO
         };
         return result;
     }
@@ -623,7 +656,7 @@ function assocExisted(tree, key, item, thisHash = null) {
             left: tree.left,
             middle: tree.middle,
             right: assocExisted(tree.right, key, item, thisHash),
-            depth: 0,
+            depth: 0, // TODO
         };
         return result;
     }
@@ -649,7 +682,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: tree,
                 middle: childBranch,
                 right: emptyBranch,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -666,7 +699,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: childBranch,
                 middle: tree,
                 right: emptyBranch,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -707,7 +740,7 @@ function assocNew(tree, key, item, thisHash = null) {
                     left: childBranch,
                     middle: tree.left,
                     right: tree.middle,
-                    depth: 0,
+                    depth: 0, // TODO
                 };
                 return result;
             }
@@ -724,7 +757,7 @@ function assocNew(tree, key, item, thisHash = null) {
                     left: childBranch,
                     middle: tree,
                     right: emptyBranch,
-                    depth: 0,
+                    depth: 0, // TODO
                 };
                 return result;
             }
@@ -744,7 +777,7 @@ function assocNew(tree, key, item, thisHash = null) {
                     left: tree.left,
                     middle: childBranch,
                     right: emptyBranch,
-                    depth: 0,
+                    depth: 0, // TODO
                 };
                 return result;
             }
@@ -761,7 +794,7 @@ function assocNew(tree, key, item, thisHash = null) {
                     left: tree.left,
                     middle: tree.middle,
                     right: childBranch,
-                    depth: 0,
+                    depth: 0, // TODO
                 };
                 return result;
             }
@@ -778,7 +811,7 @@ function assocNew(tree, key, item, thisHash = null) {
                     left: tree,
                     middle: childBranch,
                     right: emptyBranch,
-                    depth: 0,
+                    depth: 0, // TODO
                 };
                 return result;
             }
@@ -791,7 +824,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: assocNew(tree.left, key, item, thisHash),
                 middle: tree.middle,
                 right: tree.right,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -803,7 +836,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: tree.left,
                 middle: assocNew(tree.middle, key, item, thisHash),
                 right: tree.right,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -815,7 +848,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: tree.left,
                 middle: tree.middle,
                 right: assocNew(tree.right, key, item, thisHash),
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -830,7 +863,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: assocNew(tree.left, key, item, thisHash),
                 middle: tree.middle,
                 right: tree.right,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -842,7 +875,7 @@ function assocNew(tree, key, item, thisHash = null) {
                 left: tree.left,
                 middle: tree.middle,
                 right: assocNew(tree.right, key, item, thisHash),
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -905,7 +938,7 @@ function dissocExisted(tree, key) {
                 left: tree.middle,
                 middle: tree.right,
                 right: emptyBranch,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -917,7 +950,7 @@ function dissocExisted(tree, key) {
                 left: changedBranch,
                 middle: tree.middle,
                 right: tree.right,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -935,7 +968,7 @@ function dissocExisted(tree, key) {
                 left: tree.left,
                 middle: tree.right,
                 right: emptyBranch,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -947,7 +980,7 @@ function dissocExisted(tree, key) {
                 left: tree.left,
                 middle: changedBranch,
                 right: tree.right,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -962,7 +995,7 @@ function dissocExisted(tree, key) {
                 left: tree.left,
                 middle: tree.middle,
                 right: emptyBranch,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }
@@ -974,7 +1007,7 @@ function dissocExisted(tree, key) {
                 left: tree.left,
                 middle: tree.middle,
                 right: changedBranch,
-                depth: 0,
+                depth: 0, // TODO
             };
             return result;
         }

package/lib/{test-list.js → test-list.mjs}

@@ -1,5 +1,5 @@
-import { listToString, initTernaryTreeList, indexOf, findIndex, reverse, checkListStructure, slice, listToPairs, listToItems, formatListInline, sameListShape, assocBefore, concat, assocAfter, prepend, append, rest, butlast, first, assocList, dissocList, listGet, insert, initEmptyTernaryTreeList, last, listLen, forceListInplaceBalancing, listEqual, indexToItems, listMapValues, } from "./list";
-import { test, check, arrayEqual, checkEqual } from "./utils";
+import { listToString, initTernaryTreeList, initTernaryTreeListFromRange, indexOf, findIndex, reverse, checkListStructure, slice, listToPairs, listToItems, formatListInline, sameListShape, assocBefore, concat, assocAfter, prepend, append, rest, butlast, first, assocList, dissocList, listGet, insert, initEmptyTernaryTreeList, last, listLen, forceListInplaceBalancing, listEqual, indexToItems, listMapValues, } from "./list.mjs";
+import { test, check, arrayEqual, checkEqual } from "./utils.mjs";
 export let runListTests = () => {
     test("init list", () => {
         check(listToString(initTernaryTreeList([1, 2, 3, 4])) === "TernaryTreeList[4, ...]");
@@ -89,6 +89,9 @@ export let runListTests = () => {
         let data4 = initTernaryTreeList(origin4);
         let data4n = initTernaryTreeList(origin4);
         let data4Made = prepend(initTernaryTreeList([2, 3, 4]), 1);
+        checkListStructure(data4);
+        checkListStructure(data4n);
+        checkListStructure(data4Made);
         check(sameListShape(data4, data4) === true);
         check(sameListShape(data4, data4n) === true);
         check(sameListShape(data4, data4Made) === false);
@@ -101,6 +104,7 @@ export let runListTests = () => {
         var data = initTernaryTreeList([]);
         for (let idx = 0; idx < 20; idx++) {
             data = append(data, idx, true);
+            checkListStructure(data);
         }
         // echo data.formatInline
         check(formatListInline(data) === "(((0 1 2) (3 4 5) (6 7 8)) ((9 10 11) (12 13 14) (15 16 17)) (18 19 _))");
@@ -111,6 +115,7 @@ export let runListTests = () => {
     test("iterator", () => {
         let origin4 = [1, 2, 3, 4];
         let data4 = initTernaryTreeList(origin4);
+        checkListStructure(data4);
         var i = 0;
         for (let item of listToItems(data4)) {
             i = i + 1;
@@ -126,11 +131,18 @@ export let runListTests = () => {
         var data = initTernaryTreeList([]);
         for (let idx = 0; idx < 20; idx++) {
             data = append(data, idx, true);
+            checkListStructure(data);
         }
         check(checkListStructure(data));
+        for (let idx = 0; idx < 20; idx++) {
+            data = rest(data);
+            checkListStructure(data);
+        }
         let origin11 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
         let data11 = initTernaryTreeList(origin11);
         check(checkListStructure(data11));
+        checkListStructure(prepend(initEmptyTernaryTreeList(), 1));
+        checkListStructure(prepend(null, 1));
     });
     test("slices", () => {
         var data = initTernaryTreeList([]);
@@ -144,6 +156,7 @@ export let runListTests = () => {
         for (let i = 0; i < 40; i++) {
             for (let j = i; j < 40; j++) {
                 check(arrayEqual([...listToItems(slice(data, i, j))], list40.slice(i, j)));
+                checkListStructure(slice(data, i, j));
             }
         }
     });
@@ -156,6 +169,7 @@ export let runListTests = () => {
     test("list traverse", () => {
         var i = 0;
         let data = initTernaryTreeList([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+        checkListStructure(data);
         for (let x of listToItems(data)) {
             i = i + 1;
         }
@@ -174,6 +188,13 @@ export let runListTests = () => {
         let data3 = listMapValues(data, (x) => x * x);
         checkListStructure(data3);
         check(listEqual(data2, data3));
-        check(formatListInline(data2) == formatListInline(data3));
+        check(formatListInline(data2) === formatListInline(data3));
+    });
+    test("concat", () => {
+        let data1 = initTernaryTreeList([3, 4]);
+        let data2 = initTernaryTreeListFromRange([1, 2, 3, 4, 5, 6], 2, 4);
+        check(listEqual(data1, data2));
+        checkListStructure(data1);
+        checkListStructure(data2);
     });
 };

package/lib/{test-map.js → test-map.mjs}

@@ -1,6 +1,6 @@
-import { hashGenerator } from "./types";
-import { test, check, cmp, deepEqual, justDisplay } from "./utils";
-import { initTernaryTreeMap, toHashSortedPairs, merge, mergeSkip, formatMapInline, assocMap, dissocMap, contains, toPairs, initEmptyTernaryTreeMap, sameMapShape, checkMapStructure, mapLen, mapEqual, toKeys, toPairsArray, mapMapValues, mapGetDefault, } from "./map";
+import { hashGenerator } from "./types.mjs";
+import { test, check, cmp, deepEqual, justDisplay } from "./utils.mjs";
+import { initTernaryTreeMap, initTernaryTreeMapFromArray, toHashSortedPairs, merge, mergeSkip, formatMapInline, assocMap, dissocMap, contains, toPairs, initEmptyTernaryTreeMap, sameMapShape, checkMapStructure, mapLen, mapEqual, toKeys, toPairsArray, mapMapValues, mapGetDefault, } from "./map.mjs";
 export let runMapTests = () => {
     test("init map", () => {
         var dict = new Map();
@@ -16,15 +16,15 @@ export let runMapTests = () => {
             return cmp(hx, hy);
         });
         let data10 = initTernaryTreeMap(dict);
-        let data11 = initTernaryTreeMap(inList);
+        let data11 = initTernaryTreeMapFromArray(inList);
         checkMapStructure(data10);
         checkMapStructure(data11);
         // echo data10
         justDisplay(formatMapInline(data10, true), " ((0:10 1:11 2:12) (3:13 (4:14 5:15 _) 6:16) (7:17 8:18 9:19))");
         check(deepEqual(toHashSortedPairs(data10), inList));
         check(deepEqual(toHashSortedPairs(data11), inList));
-        check(contains(data10, "1") == true);
-        check(contains(data10, "11") == false);
+        check(contains(data10, "1") === true);
+        check(contains(data10, "11") === false);
         check(deepEqual(mapGetDefault(data10, "1", null), 11));
         check(deepEqual(mapGetDefault(data10, "111", 0), 0));
         // check(deepEqual(mapGetDefault(data10, "11", {} as any), null)); // should throws error
@@ -65,8 +65,8 @@ export let runMapTests = () => {
         }
         let data = initTernaryTreeMap(dict);
         // echo data.formatInline
-        check(contains(data, "1") == true);
-        check(contains(data, "12") == false);
+        check(contains(data, "1") === true);
+        check(contains(data, "12") === false);
         checkMapStructure(data);
         justDisplay(formatMapInline(assocMap(data, "1", 2222), true), "((0:10 1:2222 2:12) (3:13 (4:14 5:15 _) 6:16) (7:17 8:18 9:19))");
         justDisplay(formatMapInline(assocMap(data, "23", 2222), true), "(((0:10 1:11 2:12) (3:13 (4:14 5:15 _) 6:16) (7:17 8:18 9:19)) 23:2222 _)");
@@ -81,14 +81,14 @@ export let runMapTests = () => {
         // echo data.formatInline
         for (let idx = 0; idx < 10; idx++) {
             let v = dissocMap(data, `${idx}`);
-            check(contains(v, `${idx}`) == false);
-            check(contains(data, `${idx}`) == true);
-            check(mapLen(v) == mapLen(data) - 1);
+            check(contains(v, `${idx}`) === false);
+            check(contains(data, `${idx}`) === true);
+            check(mapLen(v) === mapLen(data) - 1);
         }
         for (let idx = 10; idx < 12; idx++) {
             let v = dissocMap(data, `${idx}`);
-            check(contains(v, `${idx}`) == false);
-            check(mapLen(v) == mapLen(data));
+            check(contains(v, `${idx}`) === false);
+            check(mapLen(v) === mapLen(data));
         }
     });
     test("to array", () => {
@@ -116,8 +116,8 @@ export let runMapTests = () => {
         check(!mapEqual(data, b));
         let c = assocMap(data, "3", 15);
         check(sameMapShape(data, data));
-        check(sameMapShape(data, b) == false);
-        check(sameMapShape(data, c) == false);
+        check(sameMapShape(data, b) === false);
+        check(sameMapShape(data, c) === false);
         let d = assocMap(c, "3", 13);
         check(mapEqual(data, d));
         check(data !== d); // not identical
@@ -173,12 +173,12 @@ export let runMapTests = () => {
         for (let [k, v] of toPairs(data)) {
             i = i + 1;
         }
-        check(i == 4);
+        check(i === 4);
         i = 0;
         for (let key of toPairs(data)) {
             i = i + 1;
         }
-        check(i == 4);
+        check(i === 4);
     });
     test("each map", () => {
         var dict = new Map();
@@ -192,7 +192,7 @@ export let runMapTests = () => {
             // echo "..{k}-{v}.."
             i = i + 1;
         }
-        check(i == 100);
+        check(i === 100);
     });
     test("map values", () => {
         var dict = new Map();

package/lib/{utils.d.ts → utils.d.mts}

@@ -15,6 +15,6 @@ export declare let check: (x: boolean) => void;
 /** compare by reference */
 export declare let checkEqual: (x: any, y: any) => void;
 export declare let justDisplay: (x: any, y: any) => void;
-export declare let cmp: (x: any, y: any) => 1 | 0 | -1;
+export declare let cmp: (x: any, y: any) => 0 | 1 | -1;
 export declare let deepEqual: (x: any, y: any) => boolean;
-export declare let arrayEqual: <T>(xs: T[], ys: T[]) => boolean;
+export declare function arrayEqual<T>(xs: Array<T>, ys: Array<T>): boolean;

package/lib/{utils.js → utils.mjs}

@@ -85,7 +85,7 @@ export let deepEqual = function (x, y) {
     if (x === y) {
         return true;
     }
-    else if (typeof x == "object" && x != null && typeof y == "object" && y != null) {
+    else if (typeof x === "object" && x != null && typeof y === "object" && y != null) {
         if (Object.keys(x).length != Object.keys(y).length)
             return false;
         for (var prop in x) {
@@ -101,7 +101,7 @@ export let deepEqual = function (x, y) {
     else
         return false;
 };
-export let arrayEqual = (xs, ys) => {
+export function arrayEqual(xs, ys) {
     if (xs.length != ys.length) {
         return false;
     }
@@ -111,4 +111,4 @@ export let arrayEqual = (xs, ys) => {
         }
     }
     return true;
-};
+}

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@calcit/ternary-tree",
-  "version": "0.0.16",
-  "main": "./lib/index.js",
+  "version": "0.0.19-a1",
+  "main": "./lib/index.mjs",
+  "scripts": {
+    "bundle": "esbuild src/main.mts --bundle --outfile=lib/bundle.js --platform=node --resolve-extensions=.mjs,.mts,.ts,.js"
+  },
   "devDependencies": {
-    "prettier": "^2.2.1",
-    "typescript": "^4.1.3",
-    "vite": "^2.0.0-beta.34",
-    "webpack": "^5.16.0",
-    "webpack-cli": "^4.4.0"
+    "esbuild": "^0.14.27",
+    "prettier": "^2.6.0",
+    "typescript": "^4.6.2",
+    "vite": "^2.8.6"
   }
 }

package/assets/index.html

@@ -1,2 +0,0 @@
-
-<script type="application/javascript" src="bundle.js" ></script>