prefix-hash-tree 0.0.5 → 0.0.7

package/index.js

@@ -77,9 +77,13 @@ class PrefixHashTree {
   }
 
   unhashedKeyFrom(string) {
-    const phtKey = b4a.alloc(this.bitDomain / 8)
-    phtKey.write(string, 0, this.keyEncoding)
-    return phtKey
+    const key = b4a.alloc(this.bitDomain / 8)
+    const length = key.write(string, 0, this.keyEncoding)
+    return { key, length }
+  }
+
+  _keyToCompactString(key) {
+    return key.key.toString(this.keyEncoding, 0, key.length)
   }
 
   prefixFrom(string) {
@@ -97,7 +101,7 @@ class PrefixHashTree {
   }
 
   async insert(key, val) {
-    const nodeLabel = PrefixHashTree._bufferToBase2String(key)
+    const nodeLabel = PrefixHashTree._bufferToBase2String(key.key)
     const { phtNode: leaf } = await this._fullSearch(nodeLabel)
 
     // TODO: alert the caller upon replication failure
@@ -105,7 +109,7 @@ class PrefixHashTree {
       return
     }
 
-    const serializedKey = key.toString(this.keyEncoding)
+    const serializedKey = this._keyToCompactString(key)
     const oldState = get(leaf, serializedKey)
     const newState = this.transform(oldState, val)
 
@@ -117,7 +121,7 @@ class PrefixHashTree {
         .map(([oldKey, oldVal]) => [this.unhashedKeyFrom(oldKey), oldVal])
         .concat([[key, newState]])
 
-      const keysAsBase2Strings = pairs.map(([key, _]) => PrefixHashTree._bufferToBase2String(key))
+      const keysAsBase2Strings = pairs.map(([key]) => PrefixHashTree._bufferToBase2String(key.key))
 
       const lcp = PrefixHashTree._lcp(keysAsBase2Strings)
       await this._split({ pairs, lcp, depth: label(leaf).length, leaf })
@@ -133,15 +137,15 @@ class PrefixHashTree {
 
     const parent = createPHTNode({
       label: label(leaf),
-      child0: label(child0),
-      child1: label(child1)
+      isLeaf: false
     })
 
     if (depth === lcp.length) {
       // Base case: we've reached our final depth, so distribute the keys to the children
       pairs.forEach(([key, val]) => {
-        const dest = PrefixHashTree._bufferToBase2String(key)[lcp.length] === '0' ? child0 : child1
-        const serializedKey = key.toString(this.keyEncoding)
+        const dest =
+          PrefixHashTree._bufferToBase2String(key.key)[lcp.length] === '0' ? child0 : child1
+        const serializedKey = this._keyToCompactString(key)
         set(dest, serializedKey, val)
       })
 
@@ -168,7 +172,7 @@ class PrefixHashTree {
   }
 
   async searchLeaf(key) {
-    const keyLabel = PrefixHashTree._bufferToBase2String(key)
+    const keyLabel = PrefixHashTree._bufferToBase2String(key.key)
     return this._fullSearch(keyLabel)
   }
 
@@ -179,7 +183,7 @@ class PrefixHashTree {
       return null
     }
 
-    const val = get(leaf, key.toString(this.keyEncoding))
+    const val = get(leaf, this._keyToCompactString(key))
     return val !== undefined ? val : null
   }
 

package/lib/pht-node.d.ts

@@ -1,8 +1,7 @@
 declare module 'prefix-hash-tree' {
   export interface PHTNode {
     label: string
-    child0: string | null
-    child1: string | null
+    isLeaf: boolean
     lPtr: string | null
     rPtr: string | null
     keys: Record<string, any>

package/lib/pht-node.js

@@ -1,8 +1,7 @@
-function createPHTNode({ label, child0, child1, lPtr, rPtr, keys } = {}) {
+function createPHTNode({ label, isLeaf, lPtr, rPtr, keys } = {}) {
   return {
     label: label || '',
-    child0: child0 || null,
-    child1: child1 || null,
+    isLeaf: isLeaf !== undefined ? isLeaf : true,
     lPtr: lPtr || null,
     rPtr: rPtr || null,
     keys: keys || {}
@@ -12,7 +11,7 @@ function createPHTNode({ label, child0, child1, lPtr, rPtr, keys } = {}) {
 function isNode(obj) {
   if (typeof obj !== 'object' || obj === null) return false
 
-  const validKeys = new Set(['label', 'child0', 'child1', 'lPtr', 'rPtr', 'keys'])
+  const validKeys = new Set(['label', 'isLeaf', 'lPtr', 'rPtr', 'keys'])
 
   const keys = Object.keys(obj)
 
@@ -21,8 +20,7 @@ function isNode(obj) {
 
   return (
     isBinaryString(obj.label) &&
-    isBinaryStringOrNull(obj.child0) &&
-    isBinaryStringOrNull(obj.child1) &&
+    typeof obj.isLeaf === 'boolean' &&
     isBinaryStringOrNull(obj.lPtr) &&
     isBinaryStringOrNull(obj.rPtr) &&
     typeof obj.keys === 'object' &&
@@ -46,7 +44,7 @@ function isBinaryStringOrNull(v) {
 }
 
 function isLeaf(node) {
-  return node.child0 === null && node.child1 === null
+  return node.isLeaf
 }
 
 function get(node, key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prefix-hash-tree",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "An extensible prefix hash tree for indexing over distributed hash tables",
   "main": "index.js",
   "exports": {