@wxn0brp/db-core 0.2.2 → 0.2.4

package/dist/base/actions.d.ts

@@ -2,6 +2,7 @@ import Data from "../types/data.js";
 import { VQuery } from "../types/query.js";
 declare class ActionsBase {
     _inited: boolean;
+    numberId: boolean;
     init(...args: any[]): Promise<void>;
     getCollections(): Promise<string[]>;
     ensureCollection(config: VQuery): Promise<boolean>;

package/dist/base/actions.js

@@ -1,6 +1,7 @@
 import { setDataUsingUpdateOneOrAdd } from "../helpers/updateOneOrAdd.js";
 class ActionsBase {
     _inited = true;
+    numberId = false;
     async init(...args) { }
     async getCollections() {
         throw new Error("Not implemented");

package/dist/base/custom.d.ts

@@ -8,7 +8,7 @@ export declare class CustomActionsBase extends ActionsBase {
     /**
      * Add a new entry to the specified database.
      */
-    add({ collection, data, id_gen }: VQuery): Promise<import("../types/arg.js").Arg>;
+    add(query: VQuery): Promise<import("../types/arg.js").Arg>;
     /**
      * Find entries in the specified database based on search criteria.
      */

package/dist/base/custom.js

@@ -1,4 +1,4 @@
-import genId from "../helpers/gen.js";
+import { addId } from "../helpers/addId.js";
 import { findUtil } from "../utils/action.js";
 import ActionsBase from "./actions.js";
 export class CustomActionsBase extends ActionsBase {
@@ -9,10 +9,10 @@ export class CustomActionsBase extends ActionsBase {
     /**
      * Add a new entry to the specified database.
      */
-    async add({ collection, data, id_gen = true }) {
-        await this.ensureCollection(arguments[0]);
-        if (id_gen)
-            data._id = data._id || genId();
+    async add(query) {
+        await this.ensureCollection(query);
+        await addId(query, this);
+        const { collection, data } = query;
         await this.fileCpu.add(collection, data);
         return data;
     }

package/dist/customFileCpu.d.ts

@@ -11,9 +11,9 @@ declare class CustomFileCpu implements FileCpu {
     _writeFile: WriteFile;
     constructor(readFile: ReadFile, writeFile: WriteFile);
     add(file: string, data: Data): Promise<void>;
-    find(file: string, arg: Search, context?: VContext, findOpts?: FindOpts): Promise<any[] | false>;
-    findOne(file: string, arg: Search, context?: VContext, findOpts?: FindOpts): Promise<any | false>;
-    remove(file: string, one: boolean, arg: Search, context?: VContext): Promise<boolean>;
-    update(file: string, one: boolean, arg: Search, updater: Updater, context?: VContext): Promise<boolean>;
+    find(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<any[] | false>;
+    findOne(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<any | false>;
+    remove(file: string, one: boolean, search: Search, context?: VContext): Promise<boolean>;
+    update(file: string, one: boolean, search: Search, updater: Updater, context?: VContext): Promise<boolean>;
 }
 export default CustomFileCpu;

package/dist/customFileCpu.js

@@ -1,5 +1,6 @@
 import hasFieldsAdvanced from "./utils/hasFieldsAdvanced.js";
 import updateFindObject from "./utils/updateFindObject.js";
+import updateObjectAdvanced from "./utils/updateObject.js";
 export function pathRepair(path) {
     return path.replaceAll("//", "/");
 }
@@ -16,26 +17,26 @@ class CustomFileCpu {
         entries.push(data);
         await this._writeFile(file, entries);
     }
-    async find(file, arg, context = {}, findOpts = {}) {
+    async find(file, search, context = {}, findOpts = {}) {
         file = pathRepair(file);
         const entries = await this._readFile(file);
-        const results = entries.filter(entry => typeof arg === "function" ? arg(entry, context) : hasFieldsAdvanced(entry, arg));
+        const results = entries.filter(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
         return results.length ? results.map(res => updateFindObject(res, findOpts)) : [];
     }
-    async findOne(file, arg, context = {}, findOpts = {}) {
+    async findOne(file, search, context = {}, findOpts = {}) {
         file = pathRepair(file);
         const entries = await this._readFile(file);
-        const result = entries.find(entry => typeof arg === "function" ? arg(entry, context) : hasFieldsAdvanced(entry, arg));
+        const result = entries.find(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
         return result ? updateFindObject(result, findOpts) : false;
     }
-    async remove(file, one, arg, context = {}) {
+    async remove(file, one, search, context = {}) {
         file = pathRepair(file);
         let entries = await this._readFile(file);
         let removed = false;
         entries = entries.filter(entry => {
             if (removed && one)
                 return true;
-            let match = typeof arg === "function" ? arg(entry, context) : hasFieldsAdvanced(entry, arg);
+            let match = typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search);
             if (match) {
                 removed = true;
                 return false;
@@ -47,17 +48,17 @@ class CustomFileCpu {
         await this._writeFile(file, entries);
         return true;
     }
-    async update(file, one, arg, updater, context = {}) {
+    async update(file, one, search, updater, context = {}) {
         file = pathRepair(file);
         let entries = await this._readFile(file);
         let updated = false;
         entries = entries.map(entry => {
             if (updated && one)
                 return entry;
-            let match = typeof arg === "function" ? arg(entry, context) : hasFieldsAdvanced(entry, arg);
+            let match = typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search);
             if (match) {
                 updated = true;
-                return typeof updater === "function" ? updater(entry, context) : { ...entry, ...updater };
+                return typeof updater === "function" ? updater(entry, context) : updateObjectAdvanced(entry, updater);
             }
             return entry;
         });

package/dist/db/multiStorage.d.ts

@@ -0,0 +1,19 @@
+import ActionsBase from "../base/actions.js";
+import { VQuery } from "../types/query.js";
+export declare class MultiBackend extends ActionsBase {
+    backends: ActionsBase[];
+    primaryBackend: ActionsBase;
+    constructor(backends: ActionsBase[], primaryIndex?: number);
+    init(...args: any[]): Promise<void>;
+    add(config: VQuery): Promise<import("../types/data.js").Data>;
+    find(config: VQuery): Promise<import("../types/data.js").Data[]>;
+    findOne(config: VQuery): Promise<import("../types/data.js").Data>;
+    update(config: VQuery): Promise<boolean>;
+    updateOne(config: VQuery): Promise<boolean>;
+    remove(config: VQuery): Promise<boolean>;
+    removeOne(config: VQuery): Promise<boolean>;
+    ensureCollection(config: VQuery): Promise<boolean>;
+    issetCollection(config: VQuery): Promise<boolean>;
+    removeCollection(config: VQuery): Promise<boolean>;
+    getCollections(): Promise<string[]>;
+}

package/dist/db/multiStorage.js

@@ -0,0 +1,94 @@
+import ActionsBase from "../base/actions.js";
+export class MultiBackend extends ActionsBase {
+    backends;
+    primaryBackend;
+    constructor(backends, primaryIndex = 0) {
+        super();
+        this.backends = backends;
+        this.primaryBackend = backends[primaryIndex] || backends[0];
+    }
+    async init(...args) {
+        await Promise.all(this.backends.map(b => b.init?.(...args)));
+    }
+    async add(config) {
+        return await this.primaryBackend.add({ ...config });
+    }
+    async find(config) {
+        const results = await Promise.all(this.backends.map(b => b.find({ ...config })));
+        return results.flat();
+    }
+    async findOne(config) {
+        for (const backend of this.backends) {
+            try {
+                const result = await backend.findOne({ ...config });
+                if (result !== null && result !== undefined) {
+                    return result;
+                }
+            }
+            catch {
+                continue;
+            }
+        }
+        return null;
+    }
+    async update(config) {
+        const results = await Promise.all(this.backends.map(b => b.update({ ...config })));
+        return results.some(Boolean);
+    }
+    async updateOne(config) {
+        for (const backend of this.backends) {
+            try {
+                const result = await backend.updateOne({ ...config });
+                if (result === true) {
+                    return true;
+                }
+            }
+            catch (error) {
+                continue;
+            }
+        }
+        return false;
+    }
+    async remove(config) {
+        const results = await Promise.all(this.backends.map(b => b.remove({ ...config })));
+        return results.some(Boolean);
+    }
+    async removeOne(config) {
+        for (const backend of this.backends) {
+            try {
+                const result = await backend.removeOne({ ...config });
+                if (result === true) {
+                    return true;
+                }
+            }
+            catch (error) {
+                continue;
+            }
+        }
+        return false;
+    }
+    async ensureCollection(config) {
+        const results = await Promise.all(this.backends.map(b => b.ensureCollection({ ...config })));
+        return results.some(Boolean);
+    }
+    async issetCollection(config) {
+        for (const backend of this.backends) {
+            if (await backend.issetCollection({ ...config })) {
+                return true;
+            }
+        }
+        return false;
+    }
+    async removeCollection(config) {
+        const results = await Promise.all(this.backends.map(b => b.removeCollection({ ...config })));
+        return results.some(Boolean);
+    }
+    async getCollections() {
+        const allCollections = await Promise.all(this.backends.map(b => b.getCollections()));
+        const uniqueCollections = new Set();
+        allCollections.forEach(collections => {
+            collections.forEach(collection => uniqueCollections.add(collection));
+        });
+        return Array.from(uniqueCollections);
+    }
+}

package/dist/db/valthera.js

@@ -16,6 +16,8 @@ class ValtheraClass {
         this.dbAction = options.dbAction || new ActionsBase();
         this.executor = options.executor || new executorC();
         this.emiter = new VEE();
+        if (options.numberId)
+            this.dbAction.numberId = true;
     }
     async init(...args) {
         if (this.dbAction._inited)

package/dist/helpers/addId.d.ts

@@ -0,0 +1,3 @@
+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>;

package/dist/helpers/addId.js

@@ -0,0 +1,24 @@
+import genId from "./gen.js";
+export async function addId(query, actions, defaultGen = true) {
+    const { collection, data } = query;
+    const id_gen = query.id_gen ?? defaultGen;
+    if (!id_gen)
+        return data;
+    if (data._id)
+        return data;
+    const { numberId } = actions;
+    if (!numberId) {
+        data._id = genId();
+        return;
+    }
+    const find = await actions.findOne({ collection: "__vdb_id", search: { c: collection } });
+    data._id = find ? find.i + 1 : 1;
+    await actions.updateOneOrAdd({
+        collection: "__vdb_id",
+        search: { c: collection },
+        updater: {
+            $inc: { i: 1 }
+        },
+        id_gen: false,
+    });
+}

package/dist/helpers/executor.d.ts

@@ -8,7 +8,7 @@ interface Task {
  * A simple executor for queuing and executing asynchronous operations sequentially.
  * @class
  */
-declare class executorC {
+declare class ExecutorC {
     quote: Task[];
     isExecuting: boolean;
     /**
@@ -25,4 +25,5 @@ declare class executorC {
      */
     execute(): Promise<void>;
 }
-export default executorC;
+export default ExecutorC;
+export { ExecutorC as executorC };

package/dist/helpers/executor.js

@@ -2,7 +2,7 @@
  * A simple executor for queuing and executing asynchronous operations sequentially.
  * @class
  */
-class executorC {
+class ExecutorC {
     quote;
     isExecuting;
     /**
@@ -42,4 +42,5 @@ class executorC {
         this.isExecuting = false;
     }
 }
-export default executorC;
+export default ExecutorC;
+export { ExecutorC as executorC };

package/dist/types/fileCpu.d.ts

@@ -13,39 +13,39 @@ interface FileCpu {
     /**
      * Asynchronously finds multiple entries in a file based on search criteria.
      * @param file The path to the file.
-     * @param arg The search criteria.
+     * @param search The search criteria.
      * @param context Additional context for the search.
      * @param findOpts Additional options for searching.
      * @returns A promise resolving to an array of found entries, or `false` if the file does not exist.
      */
-    find(file: string, arg: Search, context?: VContext, findOpts?: FindOpts): Promise<any[] | false>;
+    find(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<any[] | false>;
     /**
      * Asynchronously finds one entry in a file based on search criteria.
      * @param file The path to the file.
-     * @param arg The search criteria.
+     * @param search The search criteria.
      * @param context Additional context for the search.
      * @param findOpts Additional options for searching.
      * @returns A promise resolving to the found entry or `false` if not found.
      */
-    findOne(file: string, arg: Search, context?: VContext, findOpts?: FindOpts): Promise<any | false>;
+    findOne(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<any | false>;
     /**
    * Asynchronously removes entries from a file based on search criteria.
    * @param file The path to the file.
-   * @param arg The search criteria.
+   * @param search The search criteria.
    * @param context Additional context for the operation.
    * @param one If `true`, removes only the first matching entry.
    * @returns A promise resolving to `true` if at least one entry was removed, otherwise `false`.
    */
-    remove(file: string, one: boolean, arg: Search, context?: VContext): Promise<boolean>;
+    remove(file: string, one: boolean, search: Search, context?: VContext): Promise<boolean>;
     /**
      * Asynchronously updates entries in a file based on search criteria and an updater function or object.
      * @param file The path to the file.
-     * @param arg The search criteria.
+     * @param search The search criteria.
      * @param updater The updater function or object.
      * @param context Additional context for the operation.
      * @param one If `true`, updates only the first matching entry.
      * @returns A promise resolving to `true` if at least one entry was updated, otherwise `false`.
      */
-    update(file: string, one: boolean, arg: Search, updater: Updater, context?: VContext): Promise<boolean>;
+    update(file: string, one: boolean, search: Search, updater: Updater, context?: VContext): Promise<boolean>;
 }
 export default FileCpu;

package/dist/types/options.d.ts

@@ -5,6 +5,7 @@ export interface DbOpts {
     maxFileSize?: number;
     dbAction?: ActionsBase;
     executor?: executorC;
+    numberId?: boolean;
 }
 export interface DbFindOpts<T = any> {
     reverse?: boolean;

package/dist/types/query.d.ts

@@ -9,7 +9,6 @@ export interface VQuery {
     findOpts?: FindOpts;
     data?: Arg;
     id_gen?: boolean;
-    limit?: number;
     add_arg?: Arg;
     updater?: Updater;
 }

package/dist/types/searchOpts.d.ts

@@ -47,7 +47,7 @@ export type ArrayOperators<T = any> = {
 };
 /** String Operators */
 export type StringOperators<T = any> = {
-    $regex?: PartialOfType<T, RegExp, string>;
+    $regex?: PartialOfType<T, RegExp | string, string>;
     $startsWith?: PartialOfType<T, string>;
     $endsWith?: PartialOfType<T, string>;
 };

package/dist/utils/hasFieldsAdvanced.js

@@ -104,7 +104,8 @@ function checkType(obj, fields) {
 }
 function checkRegex(obj, fields) {
     if ("$regex" in fields) {
-        for (const [key, regex] of Object.entries(fields["$regex"])) {
+        for (const [key, regexData] of Object.entries(fields["$regex"])) {
+            const regex = typeof regexData === "string" ? new RegExp(regexData) : regexData;
             if (!regex.test(obj[key]))
                 return false;
         }

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.2.2";
+export const version = "0.2.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",
@@ -35,4 +35,4 @@
       "default": "./dist/*.js"
     }
   }
-}
+}