@ocap/indexdb-fs 1.6.5 → 1.6.10

package/README.md

@@ -1,4 +1,4 @@
-# [**@ocap/indexdb-fs**](https://github.com/arcblock/ocap-js)
+# [**@ocap/indexdb-fs**](https://github.com/arcblock/asset-chain)
 
 [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 

package/lib/db.js

@@ -1,6 +1,5 @@
-const { BaseIndexDB } = require('@ocap/indexdb');
+const BaseIndexDB = require('@ocap/indexdb-memory/lib/db/base');
 const md5 = require('@ocap/util/lib/md5');
-const formatPagination = require('@ocap/util/lib/format-pagination');
 
 const Table = require('./table/base');
 const Transaction = require('./table/transaction');
@@ -17,142 +16,16 @@ class FsIndexDB extends BaseIndexDB {
 
     this.account = new Table('account', dataDir, 'address');
     this.asset = new Table('asset', dataDir, 'address');
+    this.factory = new Table('factory', dataDir, 'address');
     this.delegation = new Table('delegation', dataDir, 'address');
     this.tx = new Transaction('tx', dataDir, 'hash');
+    this.token = new Table('token', dataDir, 'address');
+    this.stake = new Table('stake', dataDir, 'address');
+    this.rollup = new Table('rollup', dataDir, 'address');
+    this.rollupBlock = new Table('rollupBlock', dataDir, 'hash');
+    this.rollupValidator = new Table('rollupValidator', dataDir, 'address');
 
-    this.account.onReady(() => this.markReady('account'));
-    this.asset.onReady(() => this.markReady('asset'));
-    this.delegation.onReady(() => this.markReady('delegation'));
-    this.tx.onReady(() => this.markReady('tx'));
-  }
-
-  listTransactions({ addressFilter = {}, paging = {}, timeFilter = {}, typeFilter = {} } = {}) {
-    const query = this.tx.collection.chain();
-
-    const { sender, receiver, direction = 'UNION' } = addressFilter;
-    const { types = [] } = typeFilter;
-    const { startDateTime, endDateTime } = timeFilter;
-    const params = formatPagination({ paging, defaultSortField: 'time' });
-
-    if (sender && receiver) {
-      if (direction === 'MUTUAL') {
-        // 两人之间的所有往来
-        query.where((x) => {
-          if (x.sender === sender && x.receiver === receiver) {
-            return true;
-          }
-          if (x.sender === receiver && x.receiver === sender) {
-            return true;
-          }
-
-          return false;
-        });
-      } else if (direction === 'ONE_WAY') {
-        // 两人之间的单向交易
-        query.where((x) => x.sender === sender && x.receiver === receiver);
-      } else if (direction === 'UNION') {
-        // 查询某个人收发的交易
-        query.where((x) => x.sender === sender || x.receiver === receiver);
-      }
-    } else if (sender) {
-      // 某个人发的交易
-      query.where((x) => x.sender === sender);
-    } else if (receiver) {
-      // 某个人收的交易
-      query.where((x) => x.receiver === receiver);
-    }
-
-    if (types.length) {
-      query.where((x) => typeFilter.types.includes(x.type));
-    }
-
-    if (startDateTime && endDateTime) {
-      query.where((x) => x.time > startDateTime && x.time <= endDateTime);
-    } else if (startDateTime) {
-      query.where((x) => x.time > startDateTime);
-    } else if (endDateTime) {
-      query.where((x) => x.time <= endDateTime);
-    }
-
-    const result = query
-      .simplesort(paging.order.field, paging.order.type === 'desc')
-      .offset(params.cursor)
-      .limit(params.size)
-      .data();
-    const total = query.count();
-
-    result.paging = { cursor: params.cursor + result.length, next: result.length >= params.size, total };
-    return result;
-  }
-
-  async listAssets({ ownerAddress, paging } = {}) {
-    if (!ownerAddress) {
-      return {};
-    }
-
-    const pagination = formatPagination({ paging, defaultSortField: 'renaissanceTime' });
-
-    const condition = { owner: ownerAddress };
-    const assets = await this.asset.collection
-      .chain()
-      .find(condition)
-      .simplesort(pagination.order.field, pagination.order.type === 'desc')
-      .offset(pagination.cursor)
-      .limit(pagination.size)
-      .data();
-
-    const total = await this.asset.count(condition);
-
-    const account = await this.account.get(ownerAddress);
-    return {
-      assets,
-      account,
-      paging: { cursor: pagination.cursor + assets.length, next: assets.length >= pagination.size, total },
-    };
-  }
-
-  async listAssetTransactions({ address, paging } = {}) {
-    if (!address) {
-      return [];
-    }
-
-    const pagination = formatPagination({ paging, defaultSortField: 'time' });
-
-    const queryCondition = { assets: { $contains: address } };
-    const txs = await this.tx.collection
-      .chain()
-      .find(queryCondition)
-      .simplesort(pagination.order.field, pagination.order.type === 'desc')
-      .offset(pagination.cursor)
-      .limit(pagination.size)
-      .data();
-
-    const total = await this.tx.collection.count(queryCondition);
-
-    txs.paging = { cursor: pagination.cursor + txs.length, next: txs.length >= pagination.size, total };
-
-    return txs;
-  }
-
-  listTopAccounts({ paging } = {}) {
-    const params = formatPagination({ paging, defaultSortField: 'balance' });
-
-    const accounts = this.account.collection
-      .chain()
-      .find()
-      .simplesort(params.order.field, params.order.type === 'desc')
-      .offset(params.cursor)
-      .limit(params.size)
-      .data();
-
-    const total = this.account.count();
-
-    accounts.paging = { cursor: params.cursor + accounts.length, next: accounts.length >= params.size, total };
-    return accounts;
-  }
-
-  listBlocks() {
-    return [];
+    this.attachReadyListeners();
   }
 }
 

package/lib/table/transaction.js

@@ -1,10 +1,10 @@
 /* eslint-disable no-underscore-dangle */
-const { formatRowBeforeInsert } = require('@ocap/util/lib/transaction');
+const { formatTxBeforeInsert } = require('@ocap/indexdb/lib/util');
 const Base = require('./base');
 
 class Transaction extends Base {
   _insert(row) {
-    return super._insert(formatRowBeforeInsert(row));
+    return super._insert(formatTxBeforeInsert(row));
   }
 }
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@ocap/indexdb-fs",
   "description": "OCAP indexdb adapter that uses file system as backend",
-  "version": "1.6.5",
+  "version": "1.6.10",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
-    "url": "https://github.com/ArcBlock/ocap-js/issues",
+    "url": "https://github.com/ArcBlock/asset-chain/issues",
     "email": "shijun@arcblock.io"
   },
   "publishConfig": {
@@ -14,9 +14,9 @@
     "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"
   ],
   "devDependencies": {
-    "jest": "^26.6.3"
+    "jest": "^27.3.1"
   },
-  "homepage": "https://github.com/ArcBlock/ocap-js/tree/master/indexdb/fs",
+  "homepage": "https://github.com/ArcBlock/asset-chain/tree/master/indexdb/fs",
   "keywords": [
     "ocap",
     "indexdb",
@@ -29,19 +29,20 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/ArcBlock/ocap-js/tree/master/indexdb/fs"
+    "url": "https://github.com/ArcBlock/asset-chain/tree/master/indexdb/fs"
   },
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
+    "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage"
   },
-  "gitHead": "5779448f13824de38978df3c84c9da0c1e1ad989",
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1",
   "dependencies": {
-    "@ocap/indexdb": "^1.6.5",
-    "@ocap/util": "^1.6.5",
-    "debug": "^4.3.1",
+    "@ocap/indexdb": "1.6.10",
+    "@ocap/indexdb-memory": "1.6.10",
+    "@ocap/util": "1.6.10",
+    "debug": "^4.3.3",
     "lodash": "^4.17.21",
     "lokijs": "^1.5.11"
   }