@ocap/indexdb-memory 1.20.15 → 1.21.0

package/lib/db/index.js

@@ -26,6 +26,7 @@ class MemoryIndexDB extends BaseIndexDB {
     this.rollupBlock = new Table('rollupBlock', 'hash');
     this.rollupValidator = new Table('rollupValidator', 'address');
     this.tokenDistribution = new Table('tokenDistribution', 'tokenAddress');
+    this.balance = new Table('balance', ['address', 'tokenAddress']);
 
     this.attachReadyListeners();
   }

package/lib/table/base.js

@@ -8,9 +8,11 @@ const db = new Lokijs('ocap-memory-indexdb.db');
 
 class MemoryIndex extends BaseIndex {
   constructor(name, uniqIndex) {
-    super(name);
+    super(name, uniqIndex);
+
     this.uniqIndex = uniqIndex;
-    this.collection = db.addCollection(name, { unique: [uniqIndex], clone: true });
+
+    this.collection = db.addCollection(name, { unique: [this.primaryKey], clone: true });
     this.markReady();
   }
 
@@ -20,16 +22,24 @@ class MemoryIndex extends BaseIndex {
 
   _insert(row) {
     debug(`insert ${this.name}`, row);
-    return this.collection.insert(row);
+
+    const id = this.generatePrimaryKey(row);
+    return this.collection.insert({ [this.primaryKey]: id, ...row });
   }
 
   _get(key) {
-    return this.collection.by(this.uniqIndex, key);
+    const id = this.generatePrimaryKey(key);
+    return key ? this.collection.by(this.primaryKey, id) : null;
   }
 
   _update(key, updates) {
-    debug(`update ${this.name}`, { key, updates });
-    const doc = this.collection.by(this.uniqIndex, key);
+    const id = this.generatePrimaryKey(key);
+    // Don't call this._get here cause _get may be overwritten
+    const doc = MemoryIndex.prototype._get.call(this, id);
+    if (!doc) {
+      throw new Error(`${this.name} does not exists: ${key}`);
+    }
+
     Object.assign(doc, updates);
     this.collection.update(doc);
     return doc;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-memory",
   "description": "OCAP indexdb adapter that uses memory as backend, just for test purpose",
-  "version": "1.20.15",
+  "version": "1.21.0",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/blockchain/issues",
@@ -15,7 +15,7 @@
   ],
   "devDependencies": {
     "jest": "^29.7.0",
-    "@ocap/indexdb-test": "1.20.15"
+    "@ocap/indexdb-test": "1.21.0"
   },
   "homepage": "https://github.com/ArcBlock/blockchain/tree/master/indexdb/memory",
   "keywords": [
@@ -38,9 +38,9 @@
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
     "lokijs": "^1.5.12",
-    "@arcblock/did": "1.20.15",
-    "@ocap/indexdb": "1.20.15",
-    "@ocap/util": "1.20.15"
+    "@arcblock/did": "1.21.0",
+    "@ocap/indexdb": "1.21.0",
+    "@ocap/util": "1.21.0"
   },
   "scripts": {
     "lint": "eslint tests lib",