prefix-hash-tree 0.0.6 → 0.0.8

package/index.js

@@ -1,17 +1,6 @@
 const sodium = require('sodium-universal')
 const b4a = require('b4a')
-const {
-  createPHTNode,
-  isLeaf,
-  get,
-  getAll,
-  set,
-  label,
-  size,
-  setPointers,
-  pointerLeft,
-  pointerRight
-} = require('./lib/pht-node.js')
+const { createPHTNode, isLeaf, get, getAll, set, label, size } = require('./lib/pht-node.js')
 
 class PrefixHashTree {
   constructor(opts = {}) {
@@ -132,13 +121,9 @@ class PrefixHashTree {
     const child0 = createPHTNode({ label: `${label(leaf)}0` })
     const child1 = createPHTNode({ label: `${label(leaf)}1` })
 
-    setPointers(child0, pointerLeft(leaf), label(child1))
-    setPointers(child1, label(child0), pointerRight(leaf))
-
     const parent = createPHTNode({
       label: label(leaf),
-      child0: label(child0),
-      child1: label(child1)
+      isLeaf: false
     })
 
     if (depth === lcp.length) {

package/lib/pht-node.d.ts

@@ -1,10 +1,7 @@
 declare module 'prefix-hash-tree' {
   export interface PHTNode {
     label: string
-    child0: string | null
-    child1: string | null
-    lPtr: string | null
-    rPtr: string | null
+    isLeaf: boolean
     keys: Record<string, any>
   }
 
@@ -21,10 +18,4 @@ declare module 'prefix-hash-tree' {
   export function label(node: PHTNode): string
 
   export function size(node: PHTNode): number
-
-  export function setPointers(node: PHTNode, left: string | null, right: string | null): void
-
-  export function pointerLeft(node: PHTNode): string | null
-
-  export function pointerRight(node: PHTNode): string | null
 }

package/lib/pht-node.js

@@ -1,10 +1,7 @@
-function createPHTNode({ label, child0, child1, lPtr, rPtr, keys } = {}) {
+function createPHTNode({ label, isLeaf, keys } = {}) {
   return {
     label: label || '',
-    child0: child0 || null,
-    child1: child1 || null,
-    lPtr: lPtr || null,
-    rPtr: rPtr || null,
+    isLeaf: isLeaf !== undefined ? isLeaf : true,
     keys: keys || {}
   }
 }
@@ -12,7 +9,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', 'keys'])
 
   const keys = Object.keys(obj)
 
@@ -21,10 +18,7 @@ function isNode(obj) {
 
   return (
     isBinaryString(obj.label) &&
-    isBinaryStringOrNull(obj.child0) &&
-    isBinaryStringOrNull(obj.child1) &&
-    isBinaryStringOrNull(obj.lPtr) &&
-    isBinaryStringOrNull(obj.rPtr) &&
+    typeof obj.isLeaf === 'boolean' &&
     typeof obj.keys === 'object' &&
     obj.keys !== null &&
     !Array.isArray(obj.keys)
@@ -41,12 +35,8 @@ function isBinaryString(s) {
   return true
 }
 
-function isBinaryStringOrNull(v) {
-  return v === null || isBinaryString(v)
-}
-
 function isLeaf(node) {
-  return node.child0 === null && node.child1 === null
+  return node.isLeaf
 }
 
 function get(node, key) {
@@ -69,19 +59,6 @@ function size(node) {
   return Object.keys(node.keys).length
 }
 
-function setPointers(node, left, right) {
-  node.lPtr = left
-  node.rPtr = right
-}
-
-function pointerLeft(node) {
-  return node.lPtr
-}
-
-function pointerRight(node) {
-  return node.rPtr
-}
-
 module.exports = {
   createPHTNode,
   isNode,
@@ -90,8 +67,5 @@ module.exports = {
   getAll,
   set,
   label,
-  size,
-  setPointers,
-  pointerLeft,
-  pointerRight
+  size
 }

package/package.json

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