@ocap/indexdb-memory 1.29.15 → 1.29.17

package/esm/db/base.mjs

@@ -455,18 +455,21 @@ var LocalBaseIndexDB = class extends BaseIndexDB {
 			account: 1,
 			factory: 2,
 			asset: 3,
-			tokenFactory: 4
+			tokenFactory: 4,
+			stake: 5
 		};
 		const results = [];
 		const tokenMatches = getCollection(this.token).chain().where((x) => {
 			const name$1 = x.name;
 			const symbol = x.symbol;
-			return (name$1 ? name$1.toLowerCase().includes(lowerKw) : false) || (symbol ? symbol.toLowerCase().includes(lowerKw) : false);
+			const description = x.description;
+			return (name$1 ? name$1.toLowerCase().includes(lowerKw) : false) || (symbol ? symbol.toLowerCase().includes(lowerKw) : false) || (description ? description.toLowerCase().includes(lowerKw) : false);
 		}).limit(SEARCH_LIMIT_PER_TABLE).data();
 		for (const row of tokenMatches) {
 			const nameScore = row.name ? scoreMatch(row.name, lowerKw) : 0;
 			const symbolScore = row.symbol ? scoreMatch(row.symbol, lowerKw) : 0;
-			const score = Math.max(nameScore, symbolScore);
+			const descScore = row.description ? scoreMatch(row.description, lowerKw) : 0;
+			const score = Math.max(nameScore, symbolScore, descScore);
 			const title = nameScore >= symbolScore ? row.name || row.symbol || "" : row.symbol || row.name || "";
 			results.push({
 				type: "token",
@@ -509,10 +512,14 @@ var LocalBaseIndexDB = class extends BaseIndexDB {
 		}
 		const assetMatches = getCollection(this.asset).chain().where((x) => {
 			const moniker = x.moniker;
-			return moniker ? moniker.toLowerCase().includes(lowerKw) : false;
+			const tags = x.tags;
+			return (moniker ? moniker.toLowerCase().includes(lowerKw) : false) || Array.isArray(tags) && tags.some((t) => t.toLowerCase().includes(lowerKw));
 		}).limit(SEARCH_LIMIT_PER_TABLE).data();
 		for (const row of assetMatches) {
-			const score = scoreMatch(row.moniker, lowerKw);
+			const monikerScore = row.moniker ? scoreMatch(row.moniker, lowerKw) : 0;
+			const tags = row.tags;
+			const tagScore = Array.isArray(tags) ? Math.max(0, ...tags.map((t) => scoreMatch(t, lowerKw))) : 0;
+			const score = Math.max(monikerScore, tagScore);
 			results.push({
 				type: "asset",
 				id: row.address,
@@ -539,6 +546,81 @@ var LocalBaseIndexDB = class extends BaseIndexDB {
 				priority: typePriority.tokenFactory
 			});
 		}
+		const stakeMatches = getCollection(this.stake).chain().where((x) => {
+			const message = x.message;
+			return message ? message.toLowerCase().includes(lowerKw) : false;
+		}).limit(SEARCH_LIMIT_PER_TABLE).data();
+		for (const row of stakeMatches) {
+			const score = scoreMatch(row.message, lowerKw);
+			results.push({
+				type: "stake",
+				id: row.address,
+				title: row.message || "",
+				score,
+				priority: typePriority.stake
+			});
+		}
+		if (/^(did:abt:)?(z[1-9A-HJ-NP-Za-km-z]|0x[0-9a-fA-F])/.test(trimmed)) {
+			const didPrefix = trimmed.replace(/^did:abt:/i, "");
+			if (didPrefix.length >= 4) {
+				const seen = new Set(results.map((r) => `${r.type}:${r.id}`));
+				const titleField = {
+					account: "moniker",
+					token: "name",
+					asset: "moniker",
+					factory: "name",
+					tokenFactory: "name",
+					stake: "message"
+				};
+				const collections = [
+					{
+						collection: this.account,
+						type: "account"
+					},
+					{
+						collection: this.token,
+						type: "token"
+					},
+					{
+						collection: this.asset,
+						type: "asset"
+					},
+					{
+						collection: this.factory,
+						type: "factory"
+					},
+					{
+						collection: this.tokenFactory,
+						type: "tokenFactory"
+					},
+					{
+						collection: this.stake,
+						type: "stake"
+					}
+				];
+				for (const { collection, type } of collections) {
+					const matches = getCollection(collection).chain().where((x) => {
+						const addr = x.address;
+						return addr ? addr.startsWith(didPrefix) : false;
+					}).limit(SEARCH_LIMIT_PER_TABLE).data();
+					for (const row of matches) {
+						const addr = row.address;
+						const key = `${type}:${addr}`;
+						if (!seen.has(key)) {
+							seen.add(key);
+							const title = row[titleField[type]] || addr;
+							results.push({
+								type,
+								id: addr,
+								title,
+								score: 2,
+								priority: typePriority[type] ?? 99
+							});
+						}
+					}
+				}
+			}
+		}
 		results.sort((a, b) => b.score - a.score || a.priority - b.priority);
 		return results.map(({ type, id, title }) => ({
 			type,

package/lib/db/base.cjs

@@ -459,18 +459,21 @@ var LocalBaseIndexDB = class extends _ocap_indexdb.BaseIndexDB {
 			account: 1,
 			factory: 2,
 			asset: 3,
-			tokenFactory: 4
+			tokenFactory: 4,
+			stake: 5
 		};
 		const results = [];
 		const tokenMatches = getCollection(this.token).chain().where((x) => {
 			const name$1 = x.name;
 			const symbol = x.symbol;
-			return (name$1 ? name$1.toLowerCase().includes(lowerKw) : false) || (symbol ? symbol.toLowerCase().includes(lowerKw) : false);
+			const description = x.description;
+			return (name$1 ? name$1.toLowerCase().includes(lowerKw) : false) || (symbol ? symbol.toLowerCase().includes(lowerKw) : false) || (description ? description.toLowerCase().includes(lowerKw) : false);
 		}).limit(SEARCH_LIMIT_PER_TABLE).data();
 		for (const row of tokenMatches) {
 			const nameScore = row.name ? scoreMatch(row.name, lowerKw) : 0;
 			const symbolScore = row.symbol ? scoreMatch(row.symbol, lowerKw) : 0;
-			const score = Math.max(nameScore, symbolScore);
+			const descScore = row.description ? scoreMatch(row.description, lowerKw) : 0;
+			const score = Math.max(nameScore, symbolScore, descScore);
 			const title = nameScore >= symbolScore ? row.name || row.symbol || "" : row.symbol || row.name || "";
 			results.push({
 				type: "token",
@@ -513,10 +516,14 @@ var LocalBaseIndexDB = class extends _ocap_indexdb.BaseIndexDB {
 		}
 		const assetMatches = getCollection(this.asset).chain().where((x) => {
 			const moniker = x.moniker;
-			return moniker ? moniker.toLowerCase().includes(lowerKw) : false;
+			const tags = x.tags;
+			return (moniker ? moniker.toLowerCase().includes(lowerKw) : false) || Array.isArray(tags) && tags.some((t) => t.toLowerCase().includes(lowerKw));
 		}).limit(SEARCH_LIMIT_PER_TABLE).data();
 		for (const row of assetMatches) {
-			const score = scoreMatch(row.moniker, lowerKw);
+			const monikerScore = row.moniker ? scoreMatch(row.moniker, lowerKw) : 0;
+			const tags = row.tags;
+			const tagScore = Array.isArray(tags) ? Math.max(0, ...tags.map((t) => scoreMatch(t, lowerKw))) : 0;
+			const score = Math.max(monikerScore, tagScore);
 			results.push({
 				type: "asset",
 				id: row.address,
@@ -543,6 +550,81 @@ var LocalBaseIndexDB = class extends _ocap_indexdb.BaseIndexDB {
 				priority: typePriority.tokenFactory
 			});
 		}
+		const stakeMatches = getCollection(this.stake).chain().where((x) => {
+			const message = x.message;
+			return message ? message.toLowerCase().includes(lowerKw) : false;
+		}).limit(SEARCH_LIMIT_PER_TABLE).data();
+		for (const row of stakeMatches) {
+			const score = scoreMatch(row.message, lowerKw);
+			results.push({
+				type: "stake",
+				id: row.address,
+				title: row.message || "",
+				score,
+				priority: typePriority.stake
+			});
+		}
+		if (/^(did:abt:)?(z[1-9A-HJ-NP-Za-km-z]|0x[0-9a-fA-F])/.test(trimmed)) {
+			const didPrefix = trimmed.replace(/^did:abt:/i, "");
+			if (didPrefix.length >= 4) {
+				const seen = new Set(results.map((r) => `${r.type}:${r.id}`));
+				const titleField = {
+					account: "moniker",
+					token: "name",
+					asset: "moniker",
+					factory: "name",
+					tokenFactory: "name",
+					stake: "message"
+				};
+				const collections = [
+					{
+						collection: this.account,
+						type: "account"
+					},
+					{
+						collection: this.token,
+						type: "token"
+					},
+					{
+						collection: this.asset,
+						type: "asset"
+					},
+					{
+						collection: this.factory,
+						type: "factory"
+					},
+					{
+						collection: this.tokenFactory,
+						type: "tokenFactory"
+					},
+					{
+						collection: this.stake,
+						type: "stake"
+					}
+				];
+				for (const { collection, type } of collections) {
+					const matches = getCollection(collection).chain().where((x) => {
+						const addr = x.address;
+						return addr ? addr.startsWith(didPrefix) : false;
+					}).limit(SEARCH_LIMIT_PER_TABLE).data();
+					for (const row of matches) {
+						const addr = row.address;
+						const key = `${type}:${addr}`;
+						if (!seen.has(key)) {
+							seen.add(key);
+							const title = row[titleField[type]] || addr;
+							results.push({
+								type,
+								id: addr,
+								title,
+								score: 2,
+								priority: typePriority[type] ?? 99
+							});
+						}
+					}
+				}
+			}
+		}
 		results.sort((a, b) => b.score - a.score || a.priority - b.priority);
 		return results.map(({ type, id, title }) => ({
 			type,

package/lib/db/index.d.cts

@@ -1,14 +1,14 @@
 import LocalBaseIndexDB from "./base.cjs";
 import { IIndexDB, IIndexTable, IndexTableTypeMap } from "@ocap/types";
 import { md5 } from "@ocap/util/lib/md5";
-import Lokijs from "lokijs";
+import Loki from "lokijs";
 
 //#region src/db/index.d.ts
 declare class MemoryIndexDB extends LocalBaseIndexDB implements IIndexDB {
   name: string;
   version: string;
   md5: typeof md5;
-  db: Lokijs;
+  db: Loki;
   tx: IIndexTable<IndexTableTypeMap['tx']>;
   account: IIndexTable<IndexTableTypeMap['account']>;
   asset: IIndexTable<IndexTableTypeMap['asset']>;

package/lib/table/base.d.cts

@@ -1,18 +1,18 @@
 import { BaseIndex } from "@ocap/indexdb";
 import { IIndexTable } from "@ocap/types";
-import Lokijs from "lokijs";
+import Loki from "lokijs";
 
 //#region src/table/base.d.ts
 type UniqueIndex = string | string[];
 declare class MemoryIndex<T = unknown> extends BaseIndex<T> implements IIndexTable<T> {
-  collection: Lokijs.Collection<T & Record<string, unknown>>;
+  collection: Loki.Collection<T & Record<string, unknown>>;
   /**
    * @param name table name
    * @param uniqIndex primary key(s)
    * @param db LokiJS database instance
    */
-  constructor(name: string, uniqIndex: UniqueIndex, db: Lokijs);
-  count(...args: Parameters<Lokijs.Collection['count']>): number;
+  constructor(name: string, uniqIndex: UniqueIndex, db: Loki);
+  count(...args: Parameters<Loki.Collection['count']>): number;
   _insert(row: Record<string, unknown>): T & Record<string, unknown>;
   _get(key: string | Record<string, unknown>): (T & Record<string, unknown>) | null;
   _update(key: string | Record<string, unknown>, updates: Record<string, unknown>): T & Record<string, unknown>;

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.29.15",
+  "version": "1.29.17",
   "type": "module",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
@@ -15,7 +15,7 @@
     "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"
   ],
   "devDependencies": {
-    "@ocap/indexdb-test": "1.29.15",
+    "@ocap/indexdb-test": "1.29.17",
     "@types/debug": "^4.1.12",
     "@types/lodash": "^4.17.10",
     "@types/lokijs": "^1.5.14",
@@ -79,10 +79,10 @@
   },
   "gitHead": "87990c8b5e215107fc587c1ced0d6b3e2cd2483e",
   "dependencies": {
-    "@arcblock/did": "1.29.15",
-    "@ocap/indexdb": "1.29.15",
-    "@ocap/types": "1.29.15",
-    "@ocap/util": "1.29.15",
+    "@arcblock/did": "1.29.17",
+    "@ocap/indexdb": "1.29.17",
+    "@ocap/types": "1.29.17",
+    "@ocap/util": "1.29.17",
     "debug": "^4.4.3",
     "lodash": "^4.17.23",
     "lokijs": "^1.5.12"