use latest keygen and fix bug

builder/codegen.js

@@ -185,7 +185,7 @@ function generateIndexDefinition (id, index) {
   str += `  name: ${s(index.fqn)},\n`
   str += `  encodeKey: ${generateEncodeIndexKey(id, index)},\n`
   str += `  encodeKeyRange: ${generateEncodeKeyRange(id, index)},\n`
-  str += `  encodeValue: (doc) => ${id}.encodeKey(doc),\n`
+  str += `  encodeValue: (doc) => ${id}.collection.encodeKey(doc),\n`
   str += '  reconstruct: (keyBuf, valueBuf) => valueBuf,\n'
   str += '  offset: 0,\n'
   str += '  collection: null\n'

index.js

@@ -43,8 +43,8 @@ class HyperDB {
       }
     } else {
       for (const u of this.updates.values()) {
-        for (const { key, del } of u.indexes[index.offset]) {
-          if (withinRange(range, key)) overlay.push({ key, value: del ? null : [u.key, u.value] })
+        for (const { key, value } of u.indexes[index.offset]) {
+          if (withinRange(range, key)) overlay.push({ key, value: value === null ? null : [u.key, u.value] })
         }
       }
     }
@@ -113,7 +113,7 @@ class HyperDB {
 
       u.indexes.push(ups)
 
-      if (prevKey !== null) ups.push({ key: prevKey, del: true })
+      if (prevKey !== null) ups.push({ key: prevKey, value: null })
     }
 
     this.updates.set(b4a.toString(u.key, 'hex'), u)
@@ -147,8 +147,8 @@ class HyperDB {
 
       if (prevKey !== null && b4a.equals(nextKey, prevKey)) continue
 
-      if (prevKey !== null) ups.push({ key: prevKey, del: true })
-      if (nextKey !== null) ups.push({ key: nextKey, del: false })
+      if (prevKey !== null) ups.push({ key: prevKey, value: null })
+      if (nextKey !== null) ups.push({ key: nextKey, value: idx.encodeValue(doc) })
     }
 
     this.updates.set(b4a.toString(u.key, 'hex'), u)

lib/engine/rocks.js

@@ -45,9 +45,9 @@ module.exports = class RocksEngine {
       else write.delete(u.key)
 
       for (const ups of u.indexes) {
-        for (const { key, del } of ups) {
-          if (del === true) write.delete(key)
-          else write.put(key, u.key)
+        for (const { key, value } of ups) {
+          if (value !== null) write.put(key, value)
+          else write.delete(key)
         }
       }
     }

package.json

@@ -7,7 +7,8 @@
     "hyperdb": "./builder/bin.js"
   },
   "scripts": {
-    "test": "standard && brittle test/*.js"
+    "test": "standard && brittle test/*.js",
+    "generate": "node builder/bin.js test/fixtures/build.js test/fixtures/generated --force --test-fixture"
   },
   "dependencies": {
     "b4a": "^1.6.6",

test/fixtures/definition.js

@@ -68,6 +68,12 @@ const membersByAgeIndex = {
 
     return memberByAge.encodeRange(r)
   },
+  encodeValue (doc) {
+    return membersCollection.encodeKey(doc)
+  },
+  reconstruct (keyBuf, valueBuf) {
+    return valueBuf
+  },
   collection: membersCollection
 }
 

test/fixtures/generated/index.js

@@ -89,7 +89,7 @@ const index0 = {
       lte: lte ? index0_indexify(lte) : null
     })
   },
-  encodeValue: (doc) => index0.encodeKey(doc),
+  encodeValue: (doc) => index0.collection.encodeKey(doc),
   reconstruct: (keyBuf, valueBuf) => valueBuf,
   offset: 0,
   collection: null