@wxn0brp/db-core 0.12.6 → 0.12.8-alpha.0

package/dist/base/actions.d.ts

@@ -28,4 +28,6 @@ export declare abstract class ActionsBase implements ActionsBaseInterface {
     createIndex(config: VQueryT.CreateIndex): Promise<void>;
     updateOneOrAdd(config: VQueryT.UpdateOneOrAdd): Promise<VQueryT.UpdateOneOrAddResult<DataInternal>>;
     toggleOne(config: VQueryT.ToggleOne): Promise<VQueryT.ToggleOneResult<DataInternal>>;
+    count(config: VQueryT.Count): Promise<number>;
+    bulkAdd(config: VQueryT.BulkAdd): Promise<DataInternal[]>;
 }

package/dist/base/actions.js

@@ -50,4 +50,21 @@ export class ActionsBase {
             type: "added",
         };
     }
+    async count(config) {
+        return await this.find(config).then(res => res.length);
+    }
+    async bulkAdd(config) {
+        const results = [];
+        for (const item of config.datas) {
+            const result = await this.add({
+                collection: config.collection,
+                data: item,
+                id_gen: config.id_gen,
+                control: config.control,
+                transaction: config.transaction,
+            });
+            results.push(result);
+        }
+        return results;
+    }
 }

package/dist/base/custom.d.ts

@@ -23,7 +23,7 @@ export declare abstract class CustomActionsBase extends ActionsBase {
     /**
      * Update the first matching entry in the specified database based on search criteria and an updater function or object.
      */
-    updateOne(query: VQueryT.Update): Promise<import("../types/data.js").DataInternal>;
+    updateOne(query: VQueryT.Update): Promise<import("../types/data.js").DataInternal | null>;
     /**
      * Remove entries from the specified database based on search criteria.
      */
@@ -31,5 +31,5 @@ export declare abstract class CustomActionsBase extends ActionsBase {
     /**
      * Remove the first matching entry from the specified database based on search criteria.
      */
-    removeOne(query: VQueryT.Remove): Promise<import("../types/data.js").DataInternal>;
+    removeOne(query: VQueryT.Remove): Promise<import("../types/data.js").DataInternal | null>;
 }

package/dist/db/memory.d.ts

@@ -1,6 +1,7 @@
 import { CustomActionsBase } from "../base/custom.js";
 import { Collection } from "../helpers/collection.js";
 import { Data } from "../types/data.js";
+import { VQueryT } from "../types/query.js";
 import { ValtheraClass } from "./valthera.js";
 export declare class MemoryAction extends CustomActionsBase {
     memory: Map<string, any[]>;
@@ -12,6 +13,7 @@ export declare class MemoryAction extends CustomActionsBase {
     ensureCollection(collection: string): Promise<boolean>;
     issetCollection(collection: string): Promise<boolean>;
     removeCollection(collection: string): Promise<boolean>;
+    count(config: VQueryT.Count): Promise<number>;
 }
 export declare class ValtheraMemory extends ValtheraClass {
     constructor(...args: any[]);

package/dist/db/memory.js

@@ -1,6 +1,7 @@
 import { CustomActionsBase } from "../base/custom.js";
 import { CustomFileCpu } from "../customFileCpu.js";
 import { forgeTypedValthera } from "../helpers/forge.js";
+import { hasFieldsAdvanced } from "../utils/hasFieldsAdvanced.js";
 import { ValtheraClass } from "./valthera.js";
 export class MemoryAction extends CustomActionsBase {
     memory;
@@ -19,8 +20,7 @@ export class MemoryAction extends CustomActionsBase {
         this.memory.set(key, data);
     }
     async getCollections() {
-        const collections = Array.from(this.memory.keys());
-        return collections;
+        return Array.from(this.memory.keys());
     }
     async ensureCollection(collection) {
         if (this.memory.has(collection))
@@ -37,6 +37,14 @@ export class MemoryAction extends CustomActionsBase {
         this.memory.delete(collection);
         return true;
     }
+    async count(config) {
+        const collection = this._readMemory(config.collection);
+        let count = 0;
+        for (const item of collection)
+            if (hasFieldsAdvanced(item, config.search))
+                count++;
+        return count;
+    }
 }
 export class ValtheraMemory extends ValtheraClass {
     constructor(...args) {

package/dist/db/multiStorage.d.ts

@@ -9,11 +9,11 @@ export declare class MultiBackend extends ActionsBase {
     close(...args: any[]): Promise<void>;
     add(config: VQueryT.Add): Promise<import("../types/data.js").DataInternal>;
     find(config: VQueryT.Find): Promise<import("../types/data.js").DataInternal[]>;
-    findOne(config: VQueryT.FindOne): Promise<import("../types/data.js").DataInternal>;
+    findOne(config: VQueryT.FindOne): Promise<import("../types/data.js").DataInternal | null>;
     update(config: VQueryT.Update): Promise<import("../types/data.js").DataInternal[]>;
-    updateOne(config: VQueryT.Update): Promise<import("../types/data.js").DataInternal>;
+    updateOne(config: VQueryT.Update): Promise<import("../types/data.js").DataInternal | null>;
     remove(config: VQueryT.Remove): Promise<import("../types/data.js").DataInternal[]>;
-    removeOne(config: VQueryT.Remove): Promise<import("../types/data.js").DataInternal>;
+    removeOne(config: VQueryT.Remove): Promise<import("../types/data.js").DataInternal | null>;
     ensureCollection(collection: string): Promise<boolean>;
     issetCollection(collection: string): Promise<boolean>;
     removeCollection(collection: string): Promise<boolean>;

package/dist/db/routedStorage.d.ts

@@ -17,11 +17,11 @@ export declare class RoutedStorage extends ActionsBase {
     close(...args: any[]): Promise<void>;
     add(config: VQueryT.Add): Promise<import("../types/data.js").DataInternal>;
     find(config: VQueryT.Find): Promise<import("../types/data.js").DataInternal[]>;
-    findOne(config: VQueryT.FindOne): Promise<import("../types/data.js").DataInternal>;
+    findOne(config: VQueryT.FindOne): Promise<import("../types/data.js").DataInternal | null>;
     update(config: VQueryT.Update): Promise<import("../types/data.js").DataInternal[]>;
-    updateOne(config: VQueryT.Update): Promise<import("../types/data.js").DataInternal>;
+    updateOne(config: VQueryT.Update): Promise<import("../types/data.js").DataInternal | null>;
     remove(config: VQueryT.Remove): Promise<import("../types/data.js").DataInternal[]>;
-    removeOne(config: VQueryT.Remove): Promise<import("../types/data.js").DataInternal>;
+    removeOne(config: VQueryT.Remove): Promise<import("../types/data.js").DataInternal | null>;
     ensureCollection(collection: string): Promise<boolean>;
     issetCollection(collection: string): Promise<boolean>;
     removeCollection(collection: string): Promise<boolean>;

package/dist/db/transaction.d.ts

@@ -13,14 +13,16 @@ export declare class Transaction {
     constructor(handle: TransactionHandle, _parent: ValtheraClass);
     c<T = Data>(name: string): Collection<T>;
     add<T = Data>(q: VQueryT.Add<T>): Promise<T>;
+    bulkAdd<T = Data>(q: VQueryT.BulkAdd<T>): Promise<import("../types/data.js").DataInternal[]>;
     find<T = Data>(q: VQueryT.Find<T, true>): Promise<T[]>;
-    findOne<T = Data>(q: VQueryT.FindOne<T>): Promise<T>;
+    findOne<T = Data>(q: VQueryT.FindOne<T>): Promise<T | null>;
     update<T = Data>(q: VQueryT.Update<T>): Promise<T[]>;
-    updateOne<T = Data>(q: VQueryT.Update<T>): Promise<T>;
+    updateOne<T = Data>(q: VQueryT.Update<T>): Promise<T | null>;
     remove<T = Data>(q: VQueryT.Remove<T>): Promise<T[]>;
-    removeOne<T = Data>(q: VQueryT.Remove<T>): Promise<T>;
+    removeOne<T = Data>(q: VQueryT.Remove<T>): Promise<T | null>;
     updateOneOrAdd<T = Data>(q: VQueryT.UpdateOneOrAdd<T>): Promise<VQueryT.UpdateOneOrAddResult<T>>;
     toggleOne<T = Data>(q: VQueryT.ToggleOne<T>): Promise<VQueryT.ToggleOneResult<T>>;
+    count<T = Data>(q: VQueryT.Count<T>): Promise<number>;
     ensureCollection(collection: string): Promise<boolean>;
     issetCollection(collection: string): Promise<boolean>;
     getCollections(): Promise<string[]>;

package/dist/db/transaction.js

@@ -1,5 +1,5 @@
 import { Collection } from "../helpers/collection.js";
-import { applyAddDefaults, applyFindDefaults, applyFindOneDefaults, applyRemoveDefaults, applyToggleOneDefaults, applyUpdateDefaults, applyUpdateOneOrAddDefaults, } from "../helpers/queryDefaults.js";
+import { applyAddDefaults, applyBulkAddDefaults, applyCountDefaults, applyFindDefaults, applyFindOneDefaults, applyRemoveDefaults, applyToggleOneDefaults, applyUpdateDefaults, applyUpdateOneOrAddDefaults, } from "../helpers/queryDefaults.js";
 /**
  * Transaction context. Operations are executed directly through the parent
  * database with the transaction handle passed to the executor.
@@ -18,6 +18,10 @@ export class Transaction {
         applyAddDefaults(q);
         return this._parent.execute("add", q, this.handle);
     }
+    bulkAdd(q) {
+        applyBulkAddDefaults(q);
+        return this._parent.adapter.bulkAdd(q);
+    }
     find(q) {
         applyFindDefaults(q);
         return this._parent.execute("find", q, this.handle);
@@ -50,6 +54,10 @@ export class Transaction {
         applyToggleOneDefaults(q);
         return this._parent.execute("toggleOne", q, this.handle);
     }
+    count(q) {
+        applyCountDefaults(q);
+        return this._parent.adapter.count(q);
+    }
     ensureCollection(collection) {
         return this._parent.adapter.ensureCollection(collection);
     }

package/dist/db/valthera.d.ts

@@ -51,6 +51,7 @@ export declare class ValtheraClass implements ValtheraCompatible {
      * Add data to a database.
      */
     add<T = Data>(query: VQueryT.Add<T>): Promise<T>;
+    bulkAdd<T = Data>(query: VQueryT.BulkAdd<T>): Promise<T[]>;
     /**
      * Find data in a database.
      */
@@ -58,7 +59,7 @@ export declare class ValtheraClass implements ValtheraCompatible {
     /**
      * Find one data entry in a database.
      */
-    findOne<T = Data>(query: VQueryT.FindOne<T>): Promise<T>;
+    findOne<T = Data>(query: VQueryT.FindOne<T>): Promise<T | null>;
     /**
      * Update data in a database.
      */
@@ -66,7 +67,7 @@ export declare class ValtheraClass implements ValtheraCompatible {
     /**
      * Update one data entry in a database.
      */
-    updateOne<T = Data>(query: VQueryT.Update<T>): Promise<T>;
+    updateOne<T = Data>(query: VQueryT.Update<T>): Promise<T | null>;
     /**
      * Remove data from a database.
      */
@@ -74,7 +75,7 @@ export declare class ValtheraClass implements ValtheraCompatible {
     /**
      * Remove one data entry from a database.
      */
-    removeOne<T = Data>(query: VQueryT.Remove<T>): Promise<T>;
+    removeOne<T = Data>(query: VQueryT.Remove<T>): Promise<T | null>;
     /**
      * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
      */
@@ -91,6 +92,7 @@ export declare class ValtheraClass implements ValtheraCompatible {
      * Create an index on a collection.
      */
     createIndex(collection: string, fields: string[], opts?: IndexOpts): Promise<void>;
+    count(query: VQueryT.Count): Promise<number>;
     /**
      * @experimental
      *

package/dist/db/valthera.js

@@ -2,7 +2,7 @@ import { VEE } from "@wxn0brp/event-emitter";
 import { Collection } from "../helpers/collection.js";
 import { SmartExecutor } from "../helpers/executor.js";
 import { genId } from "../helpers/gen.js";
-import { applyAddDefaults, applyFindDefaults, applyFindOneDefaults, applyRemoveDefaults, applyToggleOneDefaults, applyUpdateDefaults, applyUpdateOneOrAddDefaults, } from "../helpers/queryDefaults.js";
+import { applyAddDefaults, applyCountDefaults, applyBulkAddDefaults, applyFindDefaults, applyFindOneDefaults, applyRemoveDefaults, applyToggleOneDefaults, applyUpdateDefaults, applyUpdateOneOrAddDefaults, } from "../helpers/queryDefaults.js";
 import { version } from "../version.js";
 import { Transaction } from "./transaction.js";
 /**
@@ -138,6 +138,10 @@ export class ValtheraClass {
         applyAddDefaults(query);
         return this.execute("add", query);
     }
+    bulkAdd(query) {
+        applyBulkAddDefaults(query);
+        return this.execute("bulkAdd", query);
+    }
     /**
      * Find data in a database.
      */
@@ -215,6 +219,10 @@ export class ValtheraClass {
             index,
         });
     }
+    count(query) {
+        applyCountDefaults(query);
+        return this.execute("count", query);
+    }
     /**
      * @experimental
      *

package/dist/helpers/addId.d.ts

@@ -1,3 +1,4 @@
 import { ActionsBase } from "../base/actions.js";
-import { VQuery } from "../types/query.js";
-export declare function addId(query: VQuery, actions: ActionsBase, defaultGen?: boolean): Promise<import("../types/arg.js").Arg<import("../types/data.js").Data>>;
+import { VQuery, VQueryT } from "../types/query.js";
+export declare function addId(query: VQuery, actions: ActionsBase, defaultGen?: boolean): Promise<import("../types/arg.js").Arg<import("../types/data.js").Data> | undefined>;
+export declare function addIdBulk(query: VQueryT.BulkAdd, actions: ActionsBase, defaultGen?: boolean): Promise<void>;

package/dist/helpers/addId.js

@@ -1,6 +1,7 @@
 import { genId } from "./gen.js";
 export async function addId(query, actions, defaultGen = true) {
-    const { collection, data } = query;
+    const collection = query.collection;
+    const data = query.data;
     const id_gen = query.id_gen ?? defaultGen;
     const { idKey = "_id", numberId } = actions.adapterOpts;
     if (!id_gen)
@@ -38,3 +39,49 @@ export async function addId(query, actions, defaultGen = true) {
         ...txOpts,
     });
 }
+export async function addIdBulk(query, actions, defaultGen = true) {
+    const collection = query.collection;
+    const id_gen = query.id_gen ?? defaultGen;
+    const { idKey = "_id", numberId } = actions.adapterOpts;
+    if (!id_gen)
+        return;
+    if (!numberId) {
+        for (const data of query.datas) {
+            if (!data[idKey])
+                data[idKey] = genId();
+        }
+        return;
+    }
+    const txOpts = query.transaction
+        ? {
+            transaction: query.transaction,
+        }
+        : {};
+    const find = (await actions.findOne({
+        collection: "__vdb_id",
+        search: {
+            c: collection,
+        },
+        ...txOpts,
+    }));
+    const start = find?.i ?? 0;
+    for (let i = 0; i < query.datas.length; i++) {
+        const data = query.datas[i];
+        if (!data[idKey]) {
+            data[idKey] = start + i + 1;
+        }
+    }
+    await actions.updateOneOrAdd({
+        collection: "__vdb_id",
+        search: {
+            c: collection,
+        },
+        updater: {
+            $inc: {
+                i: query.datas.length,
+            },
+        },
+        id_gen: false,
+        ...txOpts,
+    });
+}

package/dist/helpers/collection.d.ts

@@ -17,6 +17,10 @@ export declare class Collection<D = Data> {
     add(data: Arg<D>, id_gen?: true): Promise<D & {
         _id: string;
     }>;
+    bulkAdd(data: Arg<D>[], id_gen: false): Promise<D[]>;
+    bulkAdd(data: Arg<D>[], id_gen?: true): Promise<(D & {
+        _id: string;
+    })[]>;
     /**
      * Find data in a database.
      */
@@ -24,7 +28,11 @@ export declare class Collection<D = Data> {
     /**
      * Find one data entry in a database.
      */
-    findOne(search?: Search<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D>;
+    findOne(search?: Search<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D | null>;
+    /**
+     * Count data entries in a database.
+     */
+    count(search?: Search<D, false>): Promise<number>;
     /**
      * Update data in a database.
      */

package/dist/helpers/collection.js

@@ -12,6 +12,13 @@ export class Collection {
             id_gen,
         });
     }
+    bulkAdd(data, id_gen) {
+        return this.db.bulkAdd({
+            collection: this.collection,
+            datas: data,
+            id_gen,
+        });
+    }
     /**
      * Find data in a database.
      */
@@ -35,6 +42,15 @@ export class Collection {
             context,
         });
     }
+    /**
+     * Count data entries in a database.
+     */
+    count(search = {}) {
+        return this.db.count({
+            collection: this.collection,
+            search,
+        });
+    }
     /**
      * Update data in a database.
      */

package/dist/helpers/gen.d.ts

@@ -1,7 +1,7 @@
 import { Id } from "../types/Id.js";
 export declare function getIdData(): {
     usedIds: Map<any, any>;
-    lastId: Id;
+    lastId: Id | undefined;
     lastTimeStr: string;
     lastCounter: number;
     recentIdsTimestamps: number[];
@@ -16,9 +16,9 @@ export type IdData = ReturnType<typeof getIdData>;
  * @param {number[]} [parts] - an array of lengths of parts of the identifier
  * @returns {Id} - a new unique identifier
  */
-export declare function genId(parts?: number[], idData?: {
+export declare function genId(parts?: number[] | null, idData?: {
     usedIds: Map<any, any>;
-    lastId: Id;
+    lastId: Id | undefined;
     lastTimeStr: string;
     lastCounter: number;
     recentIdsTimestamps: number[];

package/dist/helpers/queryDefaults.d.ts

@@ -6,3 +6,5 @@ export declare function applyUpdateDefaults<T>(q: VQueryT.Update<T>): void;
 export declare function applyRemoveDefaults<T>(q: VQueryT.Remove<T>): void;
 export declare function applyUpdateOneOrAddDefaults<T>(q: VQueryT.UpdateOneOrAdd<T>): void;
 export declare function applyToggleOneDefaults<T>(q: VQueryT.ToggleOne<T>): void;
+export declare function applyCountDefaults<T>(q: VQueryT.Count<T>): void;
+export declare function applyBulkAddDefaults<T>(q: VQueryT.BulkAdd<T>): void;

package/dist/helpers/queryDefaults.js

@@ -33,3 +33,12 @@ export function applyToggleOneDefaults(q) {
     q.context ||= {};
     q.control ||= {};
 }
+export function applyCountDefaults(q) {
+    q.search ||= {};
+    q.control ||= {};
+}
+export function applyBulkAddDefaults(q) {
+    q.datas ??= [];
+    q.control ||= {};
+    q.id_gen ??= true;
+}

package/dist/types/action.d.ts

@@ -22,6 +22,8 @@ export interface ActionsBaseInterface {
     removeOne(query: VQueryT.Remove): Promise<DataInternal | null>;
     updateOneOrAdd(query: VQueryT.UpdateOneOrAdd): Promise<VQueryT.UpdateOneOrAddResult<DataInternal>>;
     toggleOne(query: VQueryT.ToggleOne): Promise<VQueryT.ToggleOneResult<DataInternal>>;
+    count(query: VQueryT.Count): Promise<number>;
+    bulkAdd(query: VQueryT.BulkAdd): Promise<DataInternal[]>;
     beginTransaction(id: Id): Promise<TransactionHandle>;
     commitTransaction(handle: TransactionHandle): Promise<void>;
     rollbackTransaction(handle: TransactionHandle): Promise<void>;

package/dist/types/query.d.ts

@@ -23,6 +23,7 @@ export interface VQuery<T = Data, AllowFn extends boolean = true> {
     dbFindOpts?: DbFindOpts<T>;
     findOpts?: FindOpts<T>;
     data?: Arg<T>;
+    datas?: Arg<T>[];
     id_gen?: boolean;
     add_arg?: Arg<T>;
     updater?: Updater<T, AllowFn>;
@@ -40,6 +41,10 @@ export declare namespace VQueryT {
         data: Arg<T>;
         id_gen?: boolean;
     };
+    type BulkAdd<T = Data> = QueryBase<T> & {
+        datas: Arg<T>[];
+        id_gen?: boolean;
+    };
     type Find<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
         search?: Search<T, AllowFn>;
         findOpts?: FindOpts<T>;
@@ -83,4 +88,7 @@ export declare namespace VQueryT {
     type CreateIndex<T = Data> = QueryBase<T> & {
         index: IndexDefinition;
     };
+    type Count<T = Data> = QueryBase<T> & {
+        search: Search<T, false>;
+    };
 }

package/dist/types/valthera.d.ts

@@ -18,4 +18,6 @@ export interface ValtheraCompatible {
     updateOneOrAdd<T = Data>(query: VQueryT.UpdateOneOrAdd<T>): Promise<VQueryT.UpdateOneOrAddResult<T>>;
     toggleOne<T = Data>(query: VQueryT.ToggleOne<T>): Promise<VQueryT.ToggleOneResult<T>>;
     createIndex(collection: string, fields: string[], opts?: IndexOpts): Promise<void>;
+    count(query: VQueryT.Count): Promise<number>;
+    bulkAdd<T = Data>(query: VQueryT.BulkAdd<T>): Promise<T[]>;
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.12.6";
+export declare const version = "0.12.8-alpha.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.12.6";
+export const version = "0.12.8-alpha.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.12.6",
+  "version": "0.12.8-alpha.0",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",