@wxn0brp/db-core 0.5.0-alpha.1 → 0.6.0

package/dist/base/actions.d.ts

@@ -1,20 +1,21 @@
-import { Data } from "../types/data.js";
+import { ActionsBaseInterface } from "../types/action.js";
+import { DataInternal } from "../types/data.js";
 import { VQuery } from "../types/query.js";
-export declare class ActionsBase {
+export declare abstract class ActionsBase implements ActionsBaseInterface {
     _inited: boolean;
     numberId: boolean;
     init(...args: any[]): Promise<void>;
-    getCollections(): Promise<string[]>;
-    ensureCollection(config: VQuery): Promise<boolean>;
-    issetCollection(config: VQuery): Promise<boolean>;
-    add(config: VQuery): Promise<Data>;
-    find(config: VQuery): Promise<Data[]>;
-    findOne(config: VQuery): Promise<Data | null>;
-    update(config: VQuery): Promise<Data>;
-    updateOne(config: VQuery): Promise<Data>;
-    remove(config: VQuery): Promise<Data>;
-    removeOne(config: VQuery): Promise<Data>;
-    removeCollection(config: VQuery): Promise<boolean>;
-    updateOneOrAdd(config: VQuery): Promise<boolean>;
-    toggleOne(config: VQuery): Promise<boolean>;
+    abstract getCollections(): Promise<string[]>;
+    abstract ensureCollection(config: VQuery): Promise<boolean>;
+    abstract issetCollection(config: VQuery): Promise<boolean>;
+    abstract add(config: VQuery): Promise<DataInternal>;
+    abstract find(config: VQuery): Promise<DataInternal[]>;
+    abstract findOne(config: VQuery): Promise<DataInternal | null>;
+    abstract update(config: VQuery): Promise<DataInternal[] | null>;
+    abstract updateOne(config: VQuery): Promise<DataInternal | null>;
+    abstract remove(config: VQuery): Promise<DataInternal[] | null>;
+    abstract removeOne(config: VQuery): Promise<DataInternal | null>;
+    abstract removeCollection(config: VQuery): Promise<boolean>;
+    updateOneOrAdd(config: VQuery): Promise<DataInternal>;
+    toggleOne(config: VQuery): Promise<DataInternal | null>;
 }

package/dist/base/actions.js

@@ -3,64 +3,26 @@ export class ActionsBase {
     _inited = true;
     numberId = false;
     async init(...args) { }
-    async getCollections() {
-        throw new Error("Not implemented");
-        return [];
-    }
-    async ensureCollection(config) {
-        throw new Error("Not implemented");
-        return false;
-    }
-    async issetCollection(config) {
-        throw new Error("Not implemented");
-        return false;
-    }
-    async add(config) {
-        throw new Error("Not implemented");
-        return {};
-    }
-    async find(config) {
-        throw new Error("Not implemented");
-        return [];
-    }
-    async findOne(config) {
-        throw new Error("Not implemented");
-        return {};
-    }
-    async update(config) {
-        throw new Error("Not implemented");
-        return [];
-    }
-    async updateOne(config) {
-        throw new Error("Not implemented");
-        return {};
-    }
-    async remove(config) {
-        throw new Error("Not implemented");
-        return [];
-    }
-    async removeOne(config) {
-        throw new Error("Not implemented");
-        return {};
-    }
-    async removeCollection(config) {
-        throw new Error("Not implemented");
-        return false;
-    }
     async updateOneOrAdd(config) {
         const res = await this.updateOne(config);
+        const controlData = { updated: true };
+        config.control ||= {};
+        config.control.updateOneOrAdd = controlData;
         if (res)
-            return true;
+            return res;
         setDataForUpdateOneOrAdd(config);
-        await this.add(config);
-        return false;
+        config.control.updateOneOrAdd.updated = false;
+        return await this.add(config);
     }
     async toggleOne(config) {
         const res = await this.removeOne(config);
+        const controlData = { created: false };
+        config.control ||= {};
+        config.control.toggleOne = controlData;
         if (res)
-            return true;
+            return res;
         setDataForToggleOne(config);
-        await this.add(config);
-        return false;
+        config.control.toggleOne.created = true;
+        return await this.add(config);
     }
 }

package/dist/base/custom.d.ts

@@ -2,7 +2,7 @@ import { CustomFileCpu } from "../customFileCpu.js";
 import { Data } from "../types/data.js";
 import { VQuery } from "../types/query.js";
 import { ActionsBase } from "./actions.js";
-export declare class CustomActionsBase extends ActionsBase {
+export declare abstract class CustomActionsBase extends ActionsBase {
     fileCpu: CustomFileCpu;
     constructor();
     /**

package/dist/customFileCpu.js

@@ -21,13 +21,17 @@ export class CustomFileCpu {
         file = pathRepair(file);
         const entries = await this._readFile(file);
         const results = entries.filter(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
-        return results.length ? results.map(res => updateFindObject(res, findOpts)) : [];
+        return results.length ?
+            results.map(res => updateFindObject(res, findOpts)) :
+            [];
     }
     async findOne(file, search, context = {}, findOpts = {}) {
         file = pathRepair(file);
         const entries = await this._readFile(file);
         const result = entries.find(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
-        return result ? updateFindObject(result, findOpts) : false;
+        return result ?
+            updateFindObject(result, findOpts) :
+            false;
     }
     async remove(file, one, search, context = {}) {
         file = pathRepair(file);

package/dist/db/multiStorage.d.ts

@@ -5,13 +5,13 @@ export declare class MultiBackend extends 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<import("../types/data.js").Data[]>;
-    updateOne(config: VQuery): Promise<import("../types/data.js").Data>;
-    remove(config: VQuery): Promise<import("../types/data.js").Data[]>;
-    removeOne(config: VQuery): Promise<import("../types/data.js").Data>;
+    add(config: VQuery): Promise<import("../types/data.js").DataInternal>;
+    find(config: VQuery): Promise<import("../types/data.js").DataInternal[]>;
+    findOne(config: VQuery): Promise<import("../types/data.js").DataInternal>;
+    update(config: VQuery): Promise<import("../types/data.js").DataInternal[]>;
+    updateOne(config: VQuery): Promise<import("../types/data.js").DataInternal>;
+    remove(config: VQuery): Promise<import("../types/data.js").DataInternal[]>;
+    removeOne(config: VQuery): Promise<import("../types/data.js").DataInternal>;
     ensureCollection(config: VQuery): Promise<boolean>;
     issetCollection(config: VQuery): Promise<boolean>;
     removeCollection(config: VQuery): Promise<boolean>;

package/dist/db/routedStorage.d.ts

@@ -13,13 +13,13 @@ export declare class RoutedStorage extends ActionsBase {
     _withAll<T>(config: VQuery, fn: (b: ActionsBase) => Promise<T>, gather?: boolean): Promise<T>;
     _withFirst<T>(config: VQuery, fn: (b: ActionsBase) => Promise<T>): Promise<T>;
     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<import("../types/data.js").Data>;
-    updateOne(config: VQuery): Promise<import("../types/data.js").Data>;
-    remove(config: VQuery): Promise<import("../types/data.js").Data>;
-    removeOne(config: VQuery): Promise<import("../types/data.js").Data>;
+    add(config: VQuery): Promise<import("../types/data.js").DataInternal>;
+    find(config: VQuery): Promise<import("../types/data.js").DataInternal[]>;
+    findOne(config: VQuery): Promise<import("../types/data.js").DataInternal>;
+    update(config: VQuery): Promise<import("../types/data.js").DataInternal[]>;
+    updateOne(config: VQuery): Promise<import("../types/data.js").DataInternal>;
+    remove(config: VQuery): Promise<import("../types/data.js").DataInternal[]>;
+    removeOne(config: VQuery): Promise<import("../types/data.js").DataInternal>;
     ensureCollection(config: VQuery): Promise<boolean>;
     issetCollection(config: VQuery): Promise<boolean>;
     removeCollection(config: VQuery): Promise<boolean>;

package/dist/db/valthera.d.ts

@@ -6,9 +6,6 @@ import { Data } from "../types/data.js";
 import { DbOpts } from "../types/options.js";
 import { VQuery } from "../types/query.js";
 import { AddQuery, FindOneQuery, FindQuery, RemoveQuery, ToggleOneQuery, UpdateOneOrAddQuery, UpdateQuery, 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
@@ -17,14 +14,14 @@ export declare class ValtheraClass implements ValtheraCompatible {
     dbAction: ActionsBase;
     executor: Executor;
     emiter: VEE<{
-        [K in Exclude<DbActionsFns, "init">]: (query: VQuery, result: Awaited<ReturnType<ValtheraCompatible[K]>>) => void;
+        [K in keyof ValtheraCompatible]: (query: VQuery, result: Awaited<ReturnType<ValtheraCompatible[K]>>) => void;
     } & {
-        "*": (name: DbActionsFns, query: VQuery, result: any) => void;
+        "*": (name: keyof ValtheraCompatible, query: VQuery, result: any) => void;
     }>;
     version: string;
-    constructor(options?: DbOpts);
+    constructor(options: DbOpts);
     init(...args: any[]): Promise<unknown>;
-    execute<T>(name: DbActionsFns, query: VQuery): Promise<T>;
+    execute<T>(name: keyof ValtheraCompatible, query: VQuery): Promise<T>;
     /**
      * Create a new instance of a CollectionManager class.
      */
@@ -82,4 +79,3 @@ export declare class ValtheraClass implements ValtheraCompatible {
      */
     removeCollection(collection: string): Promise<boolean>;
 }
-export {};

package/dist/db/valthera.js

@@ -1,5 +1,4 @@
 import { VEE } from "@wxn0brp/event-emitter";
-import { ActionsBase } from "../base/actions.js";
 import { Collection } from "../helpers/collection.js";
 import { Executor } from "../helpers/executor.js";
 import { version } from "../version.js";
@@ -10,12 +9,11 @@ import { version } from "../version.js";
 export class ValtheraClass {
     dbAction;
     executor;
-    emiter;
+    emiter = new VEE();
     version = version;
-    constructor(options = {}) {
-        this.dbAction = options.dbAction || new ActionsBase();
+    constructor(options) {
+        this.dbAction = options.dbAction;
         this.executor = options.executor || new Executor();
-        this.emiter = new VEE();
         if (options.numberId)
             this.dbAction.numberId = true;
     }
@@ -34,7 +32,6 @@ export class ValtheraClass {
         await this.init();
         const result = await this.executor.addOp(this.dbAction[name].bind(this.dbAction), query);
         this.emiter.emit(name, query, result);
-        this.emiter.emit("*", name, query, result);
         return result;
     }
     /**

package/dist/helpers/addId.js

@@ -12,7 +12,7 @@ export async function addId(query, actions, defaultGen = true) {
         return;
     }
     const find = await actions.findOne({ collection: "__vdb_id", search: { c: collection } });
-    data._id = find ? find.i + 1 : 1;
+    data._id = find?.i ? find.i + 1 : 1;
     await actions.updateOneOrAdd({
         collection: "__vdb_id",
         search: { c: collection },

package/dist/types/action.d.ts

@@ -0,0 +1,20 @@
+import { DataInternal } from "./data.js";
+import { VQuery } from "./query.js";
+export interface ActionsBaseInterface {
+    _inited: boolean;
+    numberId: boolean;
+    init(...args: any[]): Promise<void>;
+    getCollections(): Promise<string[]>;
+    ensureCollection(config: VQuery): Promise<boolean>;
+    issetCollection(config: VQuery): Promise<boolean>;
+    add(config: VQuery): Promise<DataInternal>;
+    find(config: VQuery): Promise<DataInternal[]>;
+    findOne(config: VQuery): Promise<DataInternal | null>;
+    update(config: VQuery): Promise<DataInternal[] | null>;
+    updateOne(config: VQuery): Promise<DataInternal | null>;
+    remove(config: VQuery): Promise<DataInternal[] | null>;
+    removeOne(config: VQuery): Promise<DataInternal | null>;
+    removeCollection(config: VQuery): Promise<boolean>;
+    updateOneOrAdd(config: VQuery): Promise<DataInternal>;
+    toggleOne(config: VQuery): Promise<DataInternal | null>;
+}

package/dist/types/action.js

@@ -0,0 +1 @@
+export {};

package/dist/types/data.d.ts

@@ -1,3 +1,4 @@
 export interface Data {
     [key: string]: any;
 }
+export type DataInternal = Record<string, unknown>;

package/dist/types/fileCpu.d.ts

@@ -1,5 +1,5 @@
 import { Search, Updater } from "./arg.js";
-import { Data } from "./data.js";
+import { Data, DataInternal } from "./data.js";
 import { FindOpts } from "./options.js";
 import { VContext } from "./types.js";
 export interface FileCpu {
@@ -18,7 +18,7 @@ export interface FileCpu {
      * @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, search: Search, context?: VContext, findOpts?: FindOpts): Promise<Data[]>;
+    find(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<DataInternal[]>;
     /**
      * Asynchronously finds one entry in a file based on search criteria.
      * @param file The path to the file.
@@ -27,7 +27,7 @@ export interface FileCpu {
      * @param findOpts Additional options for searching.
      * @returns A promise resolving to the found entry or `false` if not found.
      */
-    findOne(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<Data | false>;
+    findOne(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<DataInternal | false>;
     /**
    * Asynchronously removes entries from a file based on search criteria.
    * @param file The path to the file.
@@ -36,7 +36,7 @@ export interface FileCpu {
    * @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, search: Search, context?: VContext): Promise<Data[]>;
+    remove(file: string, one: boolean, search: Search, context?: VContext): Promise<DataInternal[]>;
     /**
      * Asynchronously updates entries in a file based on search criteria and an updater function or object.
      * @param file The path to the file.
@@ -46,5 +46,5 @@ export interface FileCpu {
      * @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, search: Search, updater: Updater, context?: VContext): Promise<Data[]>;
+    update(file: string, one: boolean, search: Search, updater: Updater, context?: VContext): Promise<DataInternal[]>;
 }

package/dist/types/options.d.ts

@@ -2,8 +2,7 @@ import { ActionsBase } from "../base/actions.js";
 import { Executor } from "../helpers/executor.js";
 import { KeysMatching } from "./utils.js";
 export interface DbOpts {
-    maxFileSize?: number;
-    dbAction?: ActionsBase;
+    dbAction: ActionsBase;
     executor?: Executor;
     numberId?: boolean;
 }

package/dist/types/query.d.ts

@@ -4,13 +4,19 @@ import { DbFindOpts, FindOpts } from "./options.js";
 /**
  * To extend via adapters
  * @example
- * declare module "@wxn0brp/db-core" {
+ * declare module "@wxn0brp/db-core/types/query" {
  *   export interface VQuery_Control {
  *     key?: "value";
  *   }
  * }
  */
 export interface VQuery_Control {
+    updateOneOrAdd?: {
+        updated?: boolean;
+    };
+    toggleOne?: {
+        created?: boolean;
+    };
 }
 export interface VQuery {
     collection?: string;

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.5.0-alpha.1";
+export const version = "0.6.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.5.0-alpha.1",
+  "version": "0.6.0",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",
@@ -13,7 +13,7 @@
   },
   "homepage": "https://github.com/wxn0brP/ValtheraDB",
   "dependencies": {
-    "@wxn0brp/event-emitter": "^0.0.4"
+    "@wxn0brp/event-emitter": "0.0.5"
   },
   "devDependencies": {
     "@types/bun": "*",