@calcit/ternary-tree 0.0.19 → 0.0.21

package/lib/hash.d.mts

@@ -1,3 +1,3 @@
-export declare type Hash = number;
+export type Hash = number;
 export declare let startHash: (h: Hash, val: number) => Hash;
 export declare let finishHash: (h: Hash) => number;

package/lib/list.mjs

@@ -47,6 +47,7 @@ export function makeTernaryTreeList(size, offset, xs) {
                 right: emptyBranch,
                 depth: decideParentDepth(left, middle),
             };
+            checkListStructure(result);
             return result;
         }
         case 3: {
@@ -61,6 +62,7 @@ export function makeTernaryTreeList(size, offset, xs) {
                 right: right,
                 depth: decideParentDepth(left, middle, right),
             };
+            checkListStructure(result);
             return result;
         }
         default: {
@@ -76,6 +78,7 @@ export function makeTernaryTreeList(size, offset, xs) {
                 middle: middle,
                 right: right,
             };
+            checkListStructure(result);
             return result;
         }
     }
@@ -91,10 +94,10 @@ export function initTernaryTreeList(xs) {
 }
 // from a slice of an existed array
 export function initTernaryTreeListFromRange(xs, from, to) {
-    let ys = new Array(xs.length);
+    let ys = new Array(to - from);
     for (let idx = from; idx < to; idx++) {
         let x = xs[idx];
-        ys[idx] = { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: x };
+        ys[idx - from] = { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: x };
     }
     return makeTernaryTreeList(xs.length, 0, ys);
 }
@@ -348,6 +351,7 @@ export function assocList(tree, idx, item) {
             middle: tree.middle,
             right: tree.right,
         };
+        checkListStructure(result);
         return result;
     }
     else if (idx <= leftSize + middleSize - 1) {
@@ -360,6 +364,7 @@ export function assocList(tree, idx, item) {
             middle: changedBranch,
             right: tree.right,
         };
+        checkListStructure(result);
         return result;
     }
     else {
@@ -372,6 +377,7 @@ export function assocList(tree, idx, item) {
             middle: tree.middle,
             right: changedBranch,
         };
+        checkListStructure(result);
         return result;
     }
 }
@@ -464,6 +470,7 @@ export function dissocList(tree, idx) {
     if (result.middle == null) {
         return result.left;
     }
+    checkListStructure(result);
     return result;
 }
 export function rest(tree) {
@@ -501,6 +508,7 @@ export function insert(tree, idx, item, after = false) {
                 middle: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
                 right: emptyBranch,
             };
+            checkListStructure(result);
             return result;
         }
         else {
@@ -512,9 +520,11 @@ export function insert(tree, idx, item, after = false) {
                 middle: tree,
                 right: emptyBranch,
             };
+            checkListStructure(result);
             return result;
         }
     }
+    checkListStructure(tree);
     if (listLen(tree) === 1) {
         if (after) {
             // in compact mode, values placed at left
@@ -526,6 +536,7 @@ export function insert(tree, idx, item, after = false) {
                 middle: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
                 right: emptyBranch,
             };
+            checkListStructure(result);
             return result;
         }
         else {
@@ -537,6 +548,7 @@ export function insert(tree, idx, item, after = false) {
                 middle: tree.left,
                 right: emptyBranch,
             };
+            checkListStructure(result);
             return result;
         }
     }
@@ -551,6 +563,7 @@ export function insert(tree, idx, item, after = false) {
                     middle: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
                     right: tree.middle,
                 };
+                checkListStructure(result);
                 return result;
             }
             if (idx === 1) {
@@ -562,6 +575,7 @@ export function insert(tree, idx, item, after = false) {
                     middle: tree.middle,
                     right: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
                 };
+                checkListStructure(result);
                 return result;
             }
             else {
@@ -578,6 +592,7 @@ export function insert(tree, idx, item, after = false) {
                     middle: tree.left,
                     right: tree.middle,
                 };
+                checkListStructure(result);
                 return result;
             }
             else if (idx === 1) {
@@ -589,6 +604,7 @@ export function insert(tree, idx, item, after = false) {
                     middle: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
                     right: tree.middle,
                 };
+                checkListStructure(result);
                 return result;
             }
             else {
@@ -613,6 +629,7 @@ export function insert(tree, idx, item, after = false) {
                 middle: tree,
                 right: emptyBranch,
             };
+            checkListStructure(result);
             return result;
         }
     }
@@ -626,6 +643,7 @@ export function insert(tree, idx, item, after = false) {
                 middle: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
                 right: emptyBranch,
             };
+            checkListStructure(result);
             return result;
         }
     }
@@ -638,6 +656,7 @@ export function insert(tree, idx, item, after = false) {
             middle: tree.middle,
             right: { kind: TernaryTreeKind.ternaryTreeLeaf, size: 1, value: item },
         };
+        checkListStructure(result);
         return result;
     }
     if (!after && idx === 0 && rightSize === 0 && middleSize >= rightSize) {
@@ -649,6 +668,7 @@ export function insert(tree, idx, item, after = false) {
             middle: tree.left,
             right: tree.middle,
         };
+        checkListStructure(result);
         return result;
     }
     if (idx <= leftSize - 1) {
@@ -661,6 +681,7 @@ export function insert(tree, idx, item, after = false) {
             middle: tree.middle,
             right: tree.right,
         };
+        checkListStructure(result);
         return result;
     }
     else if (idx <= leftSize + middleSize - 1) {
@@ -673,6 +694,7 @@ export function insert(tree, idx, item, after = false) {
             middle: changedBranch,
             right: tree.right,
         };
+        checkListStructure(result);
         return result;
     }
     else {
@@ -685,6 +707,7 @@ export function insert(tree, idx, item, after = false) {
             middle: tree.middle,
             right: changedBranch,
         };
+        checkListStructure(result);
         return result;
     }
 }
@@ -743,6 +766,7 @@ export function concat(...xsGroups) {
     xsGroups = xsGroups.filter((xs) => listLen(xs) > 0);
     let result = makeTernaryTreeList(xsGroups.length, 0, xsGroups);
     maybeReblance(result);
+    checkListStructure(result);
     return result;
 }
 export function sameListShape(xs, ys) {
@@ -808,9 +832,18 @@ export function checkListStructure(tree) {
                 }
                 break;
             case TernaryTreeKind.ternaryTreeBranch: {
+                if (tree.size >= 6 && tree.depth >= tree.size) {
+                    throw new Error(`Bad depth at branch ${formatListInline(tree)}`);
+                }
                 if (tree.size !== listLen(tree.left) + listLen(tree.middle) + listLen(tree.right)) {
                     throw new Error(`Bad size at branch ${formatListInline(tree)}`);
                 }
+                if (tree.left == null && tree.middle != null) {
+                    throw new Error("morformed tree");
+                }
+                if (tree.middle == null && tree.right != null) {
+                    throw new Error("morformed tree");
+                }
                 if (tree.depth !== decideParentDepth(tree.left, tree.middle, tree.right)) {
                     let x = decideParentDepth(tree.left, tree.middle, tree.right);
                     throw new Error(`Bad depth at branch ${formatListInline(tree)}`);
@@ -896,6 +929,11 @@ export function reverse(tree) {
                 middle: reverse(tree.middle),
                 right: reverse(tree.left),
             };
+            if (result.left == null) {
+                result.left = result.middle;
+                result.middle = result.right;
+                result.right = undefined;
+            }
             return result;
         }
     }

package/lib/types.d.mts

@@ -2,7 +2,7 @@ export declare enum TernaryTreeKind {
     ternaryTreeBranch = 0,
     ternaryTreeLeaf = 1
 }
-export declare type TernaryTreeListTheBranch<T> = {
+export type TernaryTreeListTheBranch<T> = {
     size: number;
     kind: TernaryTreeKind.ternaryTreeBranch;
     depth: number;
@@ -10,17 +10,17 @@ export declare type TernaryTreeListTheBranch<T> = {
     middle: TernaryTreeList<T>;
     right: TernaryTreeList<T>;
 };
-export declare type TernaryTreeListTheLeaf<T> = {
+export type TernaryTreeListTheLeaf<T> = {
     size: number;
     kind: TernaryTreeKind.ternaryTreeLeaf;
     value: T;
 };
-export declare type TernaryTreeList<T> = TernaryTreeListTheBranch<T> | TernaryTreeListTheLeaf<T>;
-export declare type TernaryTreeMapHashEntry<K, V> = {
+export type TernaryTreeList<T> = TernaryTreeListTheBranch<T> | TernaryTreeListTheLeaf<T>;
+export type TernaryTreeMapHashEntry<K, V> = {
     hash: Hash;
     pairs: Array<[K, V]>;
 };
-export declare type TernaryTreeMapTheBranch<K, T> = {
+export type TernaryTreeMapTheBranch<K, T> = {
     kind: TernaryTreeKind.ternaryTreeBranch;
     depth: number;
     maxHash: number;
@@ -29,16 +29,16 @@ export declare type TernaryTreeMapTheBranch<K, T> = {
     middle: TernaryTreeMap<K, T>;
     right: TernaryTreeMap<K, T>;
 };
-export declare type TernaryTreeMapTheLeaf<K, T> = {
+export type TernaryTreeMapTheLeaf<K, T> = {
     kind: TernaryTreeKind.ternaryTreeLeaf;
     hash: number;
     elements: Array<[K, T]>;
 };
-export declare type TernaryTreeMap<K, T> = TernaryTreeMapTheBranch<K, T> | TernaryTreeMapTheLeaf<K, T>;
-export declare type RefInt = {
+export type TernaryTreeMap<K, T> = TernaryTreeMapTheBranch<K, T> | TernaryTreeMapTheLeaf<K, T>;
+export type RefInt = {
     value: number;
 };
-export declare type Hash = number;
+export type Hash = number;
 export declare let valueHash: (x: any) => Hash;
 /** default hash function only handles number and string, need customization */
 export declare let hashGenerator: typeof valueHash;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@calcit/ternary-tree",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "main": "./lib/index.mjs",
   "scripts": {},
   "devDependencies": {
-    "prettier": "^2.6.0",
-    "typescript": "^4.6.2"
+    "prettier": "^3.0.0",
+    "typescript": "^5.1.6"
   }
 }

package/lib/index.html

@@ -1,2 +0,0 @@
-
-<script type="module" src="main.mjs" ></script>