@ocap/indexdb-memory 1.28.6 → 1.28.7

package/README.md

@@ -9,7 +9,7 @@
 ```sh
 npm install @ocap/indexdb-memory
 // or
-pnpm install @ocap/indexdb-memory
+bun install @ocap/indexdb-memory
 ```
 
 ## Usage

package/lib/db/base.js

@@ -1,5 +1,3 @@
-/* eslint-disable require-await */
-/* eslint-disable newline-per-chained-call */
 const { BN } = require('@ocap/util');
 const { BaseIndexDB } = require('@ocap/indexdb');
 const { formatPagination, formatNextPagination, formatDelegationAfterRead } = require('@ocap/indexdb/lib/util');
@@ -156,7 +154,7 @@ class LocalBaseIndexDB extends BaseIndexDB {
     // Filter out data field if includeItxData is false (default behavior for performance)
     if (!includeItxData) {
       transactions = transactions.map((tx) => {
-        if (tx.tx && tx.tx.itxJson) {
+        if (tx.tx?.itxJson) {
           return {
             ...tx,
             tx: {
@@ -186,9 +184,8 @@ class LocalBaseIndexDB extends BaseIndexDB {
     }
 
     const related = [address];
-    while (account && account.migratedFrom && related.length <= 8) {
+    while (account?.migratedFrom && related.length <= 8) {
       related.push(account.migratedFrom);
-      // eslint-disable-next-line no-await-in-loop
       account = await this.account.get(account.migratedFrom);
     }
 
@@ -202,7 +199,6 @@ class LocalBaseIndexDB extends BaseIndexDB {
 
     const pagination = formatPagination({ paging, defaultSortField: 'renaissanceTime' });
 
-    // eslint-disable-next-line prefer-const
     let { startDateTime, endDateTime, field = 'renaissanceTime' } = timeFilter;
     startDateTime = parseDateTime(startDateTime);
     endDateTime = parseDateTime(endDateTime);
@@ -494,7 +490,7 @@ class LocalBaseIndexDB extends BaseIndexDB {
 
     const { txs = [] } = txFilter;
     const { validators = [] } = validatorFilter;
-    let { startDateTime, endDateTime, field = 'genesisTime' } = timeFilter; // eslint-disable-line
+    let { startDateTime, endDateTime, field = 'genesisTime' } = timeFilter;
     startDateTime = parseDateTime(startDateTime);
     endDateTime = parseDateTime(endDateTime);
 

package/lib/db/index.js

@@ -1,11 +1,13 @@
-/* eslint-disable newline-per-chained-call */
 const { md5 } = require('@ocap/util/lib/md5');
+const Lokijs = require('lokijs');
 const BaseIndexDB = require('./base');
 
 const Table = require('../table/base');
 const Transaction = require('../table/transaction');
 const { name, version } = require('../../package.json');
 
+let instanceCounter = 0;
+
 class MemoryIndexDB extends BaseIndexDB {
   constructor() {
     super();
@@ -15,19 +17,23 @@ class MemoryIndexDB extends BaseIndexDB {
 
     this.md5 = md5;
 
-    this.account = new Table('account', 'address');
-    this.asset = new Table('asset', 'address');
-    this.delegation = new Table('delegation', 'address');
-    this.tx = new Transaction('tx', 'hash');
-    this.factory = new Table('factory', 'address');
-    this.token = new Table('token', 'address');
-    this.stake = new Table('stake', 'address');
-    this.rollup = new Table('rollup', 'address');
-    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.tokenFactory = new Table('tokenFactory', 'address');
+    // Each instance has its own LokiJS database to ensure test isolation
+    instanceCounter += 1;
+    this.db = new Lokijs(`ocap-memory-indexdb-${instanceCounter}.db`);
+
+    this.account = new Table('account', 'address', this.db);
+    this.asset = new Table('asset', 'address', this.db);
+    this.delegation = new Table('delegation', 'address', this.db);
+    this.tx = new Transaction('tx', 'hash', this.db);
+    this.factory = new Table('factory', 'address', this.db);
+    this.token = new Table('token', 'address', this.db);
+    this.stake = new Table('stake', 'address', this.db);
+    this.rollup = new Table('rollup', 'address', this.db);
+    this.rollupBlock = new Table('rollupBlock', 'hash', this.db);
+    this.rollupValidator = new Table('rollupValidator', 'address', this.db);
+    this.tokenDistribution = new Table('tokenDistribution', 'tokenAddress', this.db);
+    this.balance = new Table('balance', ['address', 'tokenAddress'], this.db);
+    this.tokenFactory = new Table('tokenFactory', 'address', this.db);
 
     this.attachReadyListeners();
   }

package/lib/table/base.js

@@ -1,17 +1,22 @@
-/* eslint-disable no-underscore-dangle */
 const { BaseIndex } = require('@ocap/indexdb');
-const Lokijs = require('lokijs');
 
 const debug = require('debug')(require('../../package.json').name);
 
-const db = new Lokijs('ocap-memory-indexdb.db');
-
 class MemoryIndex extends BaseIndex {
-  constructor(name, uniqIndex) {
+  /**
+   * @param {string} name table name
+   * @param {string|string[]} uniqIndex primary key(s)
+   * @param {import('lokijs')} db LokiJS database instance
+   */
+  constructor(name, uniqIndex, db) {
     super(name, uniqIndex);
 
     this.uniqIndex = uniqIndex;
 
+    if (!db) {
+      throw new Error('db is required for MemoryIndex');
+    }
+
     this.collection = db.addCollection(name, { unique: [this.primaryKey], clone: true });
     this.markReady();
   }

package/lib/table/transaction.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 const { formatTxBeforeInsert } = require('@ocap/indexdb/lib/util');
 const Base = require('./base');
 

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.28.6",
+  "version": "1.28.7",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/blockchain/issues",
@@ -14,8 +14,7 @@
     "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"
   ],
   "devDependencies": {
-    "jest": "^29.7.0",
-    "@ocap/indexdb-test": "1.28.6"
+    "@ocap/indexdb-test": "1.28.7"
   },
   "homepage": "https://github.com/ArcBlock/blockchain/tree/master/indexdb/memory",
   "keywords": [
@@ -32,20 +31,20 @@
     "type": "git",
     "url": "https://github.com/ArcBlock/blockchain/tree/master/indexdb/memory"
   },
+  "scripts": {
+    "lint": "biome check",
+    "lint:fix": "biome check --write",
+    "test": "bun test",
+    "coverage": "npm run test -- --coverage"
+  },
   "gitHead": "87990c8b5e215107fc587c1ced0d6b3e2cd2483e",
   "dependencies": {
+    "@arcblock/did": "1.28.7",
+    "@ocap/indexdb": "1.28.7",
+    "@ocap/util": "1.28.7",
     "debug": "^4.3.6",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
-    "lokijs": "^1.5.12",
-    "@ocap/indexdb": "1.28.6",
-    "@ocap/util": "1.28.6",
-    "@arcblock/did": "1.28.6"
-  },
-  "scripts": {
-    "lint": "eslint tests lib",
-    "lint:fix": "eslint --fix tests lib",
-    "test": "jest --forceExit --detectOpenHandles",
-    "coverage": "npm run test -- --coverage"
+    "lokijs": "^1.5.12"
   }
-}
+}