@bbn/bbn 2.0.239 → 2.0.242

package/dist/db/classes/Center.js

@@ -25,7 +25,7 @@ export default class bbnDbCenter {
                 this.postSuccess(port, command.id, result);
             }
             catch (error) {
-                this.postError(port, command.id, this.serializeError(error));
+                this.postError(port, command.id, this.serializeError(error) + ` - DATA: ${JSON.stringify(command)}`);
             }
         });
         return true;

package/dist/db/classes/Object.js

@@ -230,6 +230,74 @@ class DbObject {
             .map(row => row[field])
             .filter(v => v !== undefined);
     }
+    async count(table, where = null) {
+        const [tx, store] = await this.getStore(table, 'readonly');
+        const structure = this.structure[table];
+        const primary = getPrimaryKey(structure);
+        const searchField = isObject(where)
+            ? Object.keys(where)[0]
+            : (!where || isArray(where) ? null : primary);
+        if (!where) {
+            const total = await requestToPromise(store.count());
+            await transactionDone(tx);
+            return total;
+        }
+        if (!Array.isArray(primary) && searchField === primary) {
+            if (Array.isArray(where?.[primary])) {
+                const ids = where[primary];
+                let total = 0;
+                for (const id of ids) {
+                    const exists = await requestToPromise(store.getKey(id));
+                    if (exists !== undefined) {
+                        total++;
+                    }
+                }
+                await transactionDone(tx);
+                return total;
+            }
+            const key = isObject(where)
+                ? where[primary]
+                : where;
+            const total = await requestToPromise(store.count(key));
+            await transactionDone(tx);
+            return total;
+        }
+        if (typeof searchField === 'string' &&
+            isObject(where) &&
+            !Array.isArray(where[searchField]) &&
+            store.indexNames.contains(searchField)) {
+            const index = store.index(searchField);
+            const value = where[searchField];
+            const total = await requestToPromise(index.count(IDBKeyRange.only(value)));
+            await transactionDone(tx);
+            return total;
+        }
+        let total = 0;
+        await new Promise((resolve, reject) => {
+            const req = store.openCursor();
+            req.onsuccess = (e) => {
+                const cursor = e.target.result;
+                if (!cursor) {
+                    resolve();
+                    return;
+                }
+                const matches = !where || !globalThis.bbn?.fn?.search
+                    ? true
+                    : 0 === globalThis.bbn.fn.search([cursor.value], where);
+                if (matches) {
+                    total++;
+                }
+                cursor.continue();
+            };
+            req.onerror = () => {
+                this.lastErr = req.error;
+                log(req.error);
+                reject(req.error);
+            };
+        });
+        await transactionDone(tx);
+        return total;
+    }
     async copyTable(target, table, fields = [], where = null, order = null, start = 0, limit = null) {
         if (!this.structure[table]) {
             throw new Error(_('Source table %s does not exist in structure', table));

package/dist/db/classes/ObjectProxy.d.ts

@@ -11,6 +11,7 @@ export default class bbnDbObjectProxy implements DbApi {
     select(table: string, fields?: string[], where?: unknown, order?: OrderClause, start?: number): Promise<unknown>;
     selectAll(table: string, fields?: string[], where?: unknown, order?: OrderClause, start?: number, limit?: number | null): Promise<unknown>;
     getColumnValues(table: string, field: string, where?: unknown, order?: OrderClause, start?: number, limit?: number | null): Promise<unknown>;
+    count(table: string, where?: unknown): Promise<number>;
     copyTable(target: string, table: string, fields?: string[], where?: unknown, order?: OrderClause, start?: number, limit?: number | null): Promise<number>;
     deleteTable(table: string): Promise<boolean>;
     close(): void;

package/dist/db/classes/ObjectProxy.js

@@ -64,6 +64,9 @@ export default class bbnDbObjectProxy {
     getColumnValues(table, field, where, order, start, limit) {
         return callServiceWorker(this, 'object.getColumnValues', [table, field, where, order, start, limit]);
     }
+    count(table, where) {
+        return callServiceWorker(this, 'object.count', [table, where]);
+    }
     copyTable(target, table, fields, where, order, start, limit) {
         return callServiceWorker(this, 'object.copyTable', [target, table, fields, where, order, start, limit]);
     }

package/dist/db/types.d.ts

@@ -34,6 +34,7 @@ export interface DbApi {
     select(table: string, fields?: string[], where?: unknown, order?: OrderClause, start?: number): Promise<unknown>;
     selectAll(table: string, fields?: string[], where?: unknown, order?: OrderClause, start?: number, limit?: number | null): Promise<unknown>;
     getColumnValues(table: string, field: string, where?: unknown, order?: OrderClause, start?: number, limit?: number | null): Promise<unknown>;
+    count(table: string, where?: unknown): Promise<number>;
     copyTable(target: string, table: string, fields?: string[], where?: unknown, order?: OrderClause, start?: number, limit?: number | null): Promise<number>;
     deleteTable(table: string): Promise<boolean>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.239",
+  "version": "2.0.242",
   "description": "Javascript toolkit",
   "main": "./dist/index.js",
   "module": "./dist/index.js",