@wxn0brp/db-core 0.1.2 → 0.1.4

package/dist/db/memory.js

@@ -1,6 +1,6 @@
 import { CustomActionsBase } from "../base/custom.js";
 import CustomFileCpu from "../customFileCpu.js";
-import { forgeValthera } from "../utils/forge.js";
+import { forgeValthera } from "../helpers/forge.js";
 import ValtheraClass from "./valthera.js";
 export class MemoryAction extends CustomActionsBase {
     memory;

package/dist/db/valthera.d.ts

@@ -1,12 +1,16 @@
-import { UniversalEventEmitter } from "../helpers/eventEmiter.js";
+import { EventEmitter } from "@wxn0brp/event-emitter";
 import ActionsBase from "../base/actions.js";
 import CollectionManager from "../helpers/CollectionManager.js";
 import executorC from "../helpers/executor.js";
 import { Arg, Search, Updater } from "../types/arg.js";
 import Data from "../types/data.js";
-import { DbOpts, DbFindOpts, FindOpts } from "../types/options.js";
+import { DbFindOpts, DbOpts, FindOpts } from "../types/options.js";
+import { VQuery } from "../types/query.js";
 import { VContext } from "../types/types.js";
 import { ValtheraCompatible } from "../types/valthera.js";
+type DbActionsFns = keyof {
+    [K in keyof ActionsBase as ActionsBase[K] extends (...args: any[]) => any ? K : never]: any;
+};
 /**
  * Represents a database management class for performing CRUD operations.
  * @class
@@ -14,11 +18,11 @@ import { ValtheraCompatible } from "../types/valthera.js";
 declare class ValtheraClass implements ValtheraCompatible {
     dbAction: ActionsBase;
     executor: executorC;
-    emiter: UniversalEventEmitter;
+    emiter: EventEmitter;
     version: string;
     constructor(options?: DbOpts);
     init(...args: any[]): Promise<unknown>;
-    private execute;
+    execute<T>(name: DbActionsFns, query: VQuery): Promise<T>;
     /**
      * Create a new instance of a CollectionManager class.
      */
@@ -38,7 +42,10 @@ declare class ValtheraClass implements ValtheraCompatible {
     /**
      * Add data to a database.
      */
-    add<T = Data>(collection: string, data: Arg<T>, id_gen?: boolean): Promise<T>;
+    add<T extends object>(collection: string, data: T, id_gen?: true): Promise<T & {
+        _id: string;
+    }>;
+    add<T extends object>(collection: string, data: T, id_gen: false): Promise<T>;
     /**
      * Find data in a database.
      */

package/dist/db/valthera.js

@@ -1,8 +1,8 @@
-import { version } from "../version.js";
-import { UniversalEventEmitter } from "../helpers/eventEmiter.js";
+import { EventEmitter } from "@wxn0brp/event-emitter";
 import ActionsBase from "../base/actions.js";
 import CollectionManager from "../helpers/CollectionManager.js";
 import executorC from "../helpers/executor.js";
+import { version } from "../version.js";
 /**
  * Represents a database management class for performing CRUD operations.
  * @class
@@ -15,7 +15,7 @@ class ValtheraClass {
     constructor(options = {}) {
         this.dbAction = options.dbAction || new ActionsBase();
         this.executor = options.executor || new executorC();
-        this.emiter = new UniversalEventEmitter();
+        this.emiter = new EventEmitter();
     }
     async init(...args) {
         if (this.dbAction._inited)
@@ -28,11 +28,12 @@ class ValtheraClass {
             self.dbAction._inited = true;
         });
     }
-    async execute(name, ...args) {
+    async execute(name, query) {
         await this.init();
-        const result = await this.executor.addOp(this.dbAction[name].bind(this.dbAction), ...args);
-        this.emiter.emit(name, args, result);
-        this.emiter.emit("*", name, args, result);
+        const result = await this.executor.addOp(this.dbAction[name].bind(this.dbAction), query);
+        const emitArgs = Array.from(arguments).slice(1);
+        this.emiter.emit(name, emitArgs, result);
+        this.emiter.emit("*", name, emitArgs, result);
         return result;
     }
     /**
@@ -45,7 +46,7 @@ class ValtheraClass {
      * Get the names of all available databases.
      */
     async getCollections() {
-        return await this.execute("getCollections");
+        return await this.execute("getCollections", {});
     }
     /**
      * Check and create the specified collection if it doesn't exist.
@@ -59,9 +60,6 @@ class ValtheraClass {
     async issetCollection(collection) {
         return await this.execute("issetCollection", { collection });
     }
-    /**
-     * Add data to a database.
-     */
     async add(collection, data, id_gen = true) {
         return await this.execute("add", { collection, data, id_gen });
     }

package/dist/{utils → helpers}/forge.d.ts

@@ -1,4 +1,4 @@
-import CollectionManager from "../helpers/CollectionManager.js";
+import CollectionManager from "./CollectionManager.js";
 import Data from "../types/data.js";
 import { ValtheraCompatible } from "../types/valthera.js";
 export declare function forgeValthera<T extends string>(target: ValtheraCompatible): ValtheraCompatible & { [K in T]: CollectionManager; };

package/dist/{utils → helpers}/forge.js

@@ -1,4 +1,4 @@
-import CollectionManager from "../helpers/CollectionManager.js";
+import CollectionManager from "./CollectionManager.js";
 export function forgeValthera(target) {
     return new Proxy(target, {
         get(target, prop, receiver) {

package/dist/index.d.ts

@@ -6,7 +6,8 @@ import Relation from "./helpers/relation.js";
 import { ValtheraTypes } from "./types/export.js";
 import { RelationTypes } from "./types/relation.js";
 import { ValtheraCompatible } from "./types/valthera.js";
-import { forgeTypedValthera, forgeValthera } from "./utils/forge.js";
-export { createMemoryValthera, CustomFileCpu, forgeTypedValthera, forgeValthera, genId, Relation, ValtheraClass, ValtheraMemory, };
+import { forgeTypedValthera, forgeValthera } from "./helpers/forge.js";
+import { sortByIds } from "./utils/sortId.js";
+export { createMemoryValthera, CustomFileCpu, forgeTypedValthera, forgeValthera, genId, Relation, ValtheraClass, ValtheraMemory, sortByIds, };
 export type { RelationTypes, ValtheraCompatible, ValtheraTypes, };
 export type Id = import("./types/Id.js").Id;

package/dist/index.js

@@ -3,5 +3,6 @@ import ValtheraMemory, { createMemoryValthera } from "./db/memory.js";
 import ValtheraClass from "./db/valthera.js";
 import genId from "./helpers/gen.js";
 import Relation from "./helpers/relation.js";
-import { forgeTypedValthera, forgeValthera } from "./utils/forge.js";
-export { createMemoryValthera, CustomFileCpu, forgeTypedValthera, forgeValthera, genId, Relation, ValtheraClass, ValtheraMemory, };
+import { forgeTypedValthera, forgeValthera } from "./helpers/forge.js";
+import { sortByIds } from "./utils/sortId.js";
+export { createMemoryValthera, CustomFileCpu, forgeTypedValthera, forgeValthera, genId, Relation, ValtheraClass, ValtheraMemory, sortByIds, };

package/dist/utils/sortId.d.ts

@@ -0,0 +1,3 @@
+export declare function sortByIds<T extends {
+    _id: string;
+}>(objects: T[]): T[];

package/dist/utils/sortId.js

@@ -0,0 +1,7 @@
+export function sortByIds(objects) {
+    return objects.slice().sort((a, b) => {
+        const [timestampA] = a._id.split("-");
+        const [timestampB] = b._id.split("-");
+        return timestampA.localeCompare(timestampB) || a._id.localeCompare(b._id);
+    });
+}

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.1.2";
+export const version = "0.1.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",
@@ -31,5 +31,8 @@
       "import": "./dist/*.js",
       "default": "./dist/*.js"
     }
+  },
+  "dependencies": {
+    "@wxn0brp/event-emitter": "^0.0.1"
   }
 }

package/dist/helpers/eventEmiter.d.ts

@@ -1,31 +0,0 @@
-export declare class UniversalEventEmitter {
-    private _events;
-    /**
-     * Registers an event listener
-     * @param {string} event - event name
-     * @param {Function} listener - function to be called when event occurs
-     */
-    on(event: string, listener: Function): void;
-    /**
-     * Registers a one-time event listener
-     * @param {string} event - event name
-     * @param {Function} listener - function to be called once
-     */
-    once(event: string, listener: Function): void;
-    /**
-     * Removes an event listener
-     * @param {string} event - event name
-     * @param {Function} [listener] - optional: specific listener to remove
-     */
-    off(event?: string, listener?: Function): void;
-    /**
-     * Emits an event
-     * @param {string} event - event name
-     * @param {...any} args - arguments to be passed to listeners
-     */
-    emit(event: string, ...args: any[]): void;
-    /**
-     * Returns the number of listeners for the given event
-     */
-    listenerCount(event: string): number;
-}

package/dist/helpers/eventEmiter.js

@@ -1,65 +0,0 @@
-export class UniversalEventEmitter {
-    _events = {};
-    /**
-     * Registers an event listener
-     * @param {string} event - event name
-     * @param {Function} listener - function to be called when event occurs
-     */
-    on(event, listener) {
-        if (!this._events[event])
-            this._events[event] = [];
-        this._events[event].push(listener);
-    }
-    /**
-     * Registers a one-time event listener
-     * @param {string} event - event name
-     * @param {Function} listener - function to be called once
-     */
-    once(event, listener) {
-        const onceListener = (...args) => {
-            this.off(event, onceListener);
-            listener(...args);
-        };
-        this.on(event, onceListener);
-    }
-    /**
-     * Removes an event listener
-     * @param {string} event - event name
-     * @param {Function} [listener] - optional: specific listener to remove
-     */
-    off(event, listener) {
-        if (!event) {
-            // Remove all events
-            this._events = {};
-            return;
-        }
-        if (!listener) {
-            // Remove all listeners for the given event
-            delete this._events[event];
-            return;
-        }
-        // Remove specific listener
-        if (this._events[event]) {
-            this._events[event] = this._events[event].filter(l => l !== listener);
-        }
-    }
-    /**
-     * Emits an event
-     * @param {string} event - event name
-     * @param {...any} args - arguments to be passed to listeners
-     */
-    emit(event, ...args) {
-        const listeners = this._events[event];
-        if (listeners && listeners.length > 0) {
-            listeners.forEach(listener => {
-                listener(...args);
-            });
-        }
-    }
-    /**
-     * Returns the number of listeners for the given event
-     */
-    listenerCount(event) {
-        return this._events[event]?.length || 0;
-    }
-}