@wxn0brp/db 0.1.2 → 0.3.0

package/dist/{esm/action.d.ts → action.d.ts}

@@ -23,15 +23,15 @@ declare class dbActionC {
     /**
      * Get a list of available databases in the specified folder.
      */
-    getCollections(): string[];
+    getCollections(): Promise<string[]>;
     /**
      * Check and create the specified collection if it doesn't exist.
      */
-    checkCollection(collection: string): void;
+    checkCollection(collection: string): Promise<void>;
     /**
      * Check if a collection exists.
      */
-    issetCollection(collection: string): boolean;
+    issetCollection(collection: string): Promise<boolean>;
     /**
      * Add a new entry to the specified database.
      */
@@ -63,6 +63,6 @@ declare class dbActionC {
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection(collection: string): void;
+    removeCollection(collection: string): Promise<void>;
 }
 export default dbActionC;

package/dist/{esm/action.js → action.js}

@@ -1,5 +1,5 @@
 import gen from "./gen.js";
-import { existsSync, mkdirSync, readdirSync, rmSync, writeFileSync, statSync } from "fs";
+import { existsSync, mkdirSync, statSync, promises } from "fs";
 /**
  * A class representing database actions on files.
  * @class
@@ -30,8 +30,9 @@ class dbActionC {
     /**
      * Get a list of available databases in the specified folder.
      */
-    getCollections() {
-        const collections = readdirSync(this.folder, { recursive: true, withFileTypes: true })
+    async getCollections() {
+        const allCollections = await promises.readdir(this.folder, { recursive: true, withFileTypes: true });
+        const collections = allCollections
             .filter(dirent => dirent.isDirectory())
             .map(dirent => {
             if (dirent.parentPath === this.folder)
@@ -43,17 +44,24 @@ class dbActionC {
     /**
      * Check and create the specified collection if it doesn't exist.
      */
-    checkCollection(collection) {
+    async checkCollection(collection) {
+        if (await this.issetCollection(collection))
+            return;
         const cpath = this._getCollectionPath(collection);
-        if (!existsSync(cpath))
-            mkdirSync(cpath, { recursive: true });
+        await promises.mkdir(cpath, { recursive: true });
     }
     /**
      * Check if a collection exists.
      */
-    issetCollection(collection) {
-        const path = this.folder + "/" + collection;
-        return existsSync(path);
+    async issetCollection(collection) {
+        const path = this._getCollectionPath(collection);
+        try {
+            await promises.access(path);
+            return true;
+        }
+        catch {
+            return false;
+        }
     }
     /**
      * Add a new entry to the specified database.
@@ -61,7 +69,7 @@ class dbActionC {
     async add(collection, arg, id_gen = true) {
         this.checkCollection(collection);
         const cpath = this._getCollectionPath(collection);
-        const file = cpath + getLastFile(cpath, this.options.maxFileSize);
+        const file = cpath + await getLastFile(cpath, this.options.maxFileSize);
         if (id_gen)
             arg._id = arg._id || gen();
         await this.fileCpu.add(file, arg);
@@ -75,7 +83,7 @@ class dbActionC {
         options.max = options.max || -1;
         this.checkCollection(collection);
         const cpath = this._getCollectionPath(collection);
-        const files = getSortedFiles(cpath).map(f => f.f);
+        const files = await getSortedFiles(cpath);
         if (options.reverse)
             files.reverse();
         let datas = [];
@@ -106,7 +114,7 @@ class dbActionC {
     async findOne(collection, arg, context = {}, findOpts = {}) {
         this.checkCollection(collection);
         const cpath = this._getCollectionPath(collection);
-        const files = getSortedFiles(cpath).map(f => f.f);
+        const files = await getSortedFiles(cpath);
         for (let f of files) {
             let data = await this.fileCpu.findOne(cpath + f, arg, context, findOpts);
             if (data)
@@ -119,69 +127,79 @@ class dbActionC {
      */
     async update(collection, arg, updater, context = {}) {
         this.checkCollection(collection);
-        return await this.fileCpu.update(this._getCollectionPath(collection), arg, updater, context);
+        return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), false, arg, updater, context);
     }
     /**
      * Update the first matching entry in the specified database based on search criteria and an updater function or object.
      */
     async updateOne(collection, arg, updater, context = {}) {
         this.checkCollection(collection);
-        return await this.fileCpu.update(this._getCollectionPath(collection), arg, updater, context, true);
+        return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), true, arg, updater, context);
     }
     /**
      * Remove entries from the specified database based on search criteria.
      */
     async remove(collection, arg, context = {}) {
         this.checkCollection(collection);
-        return await this.fileCpu.remove(this._getCollectionPath(collection), arg, context);
+        return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), false, arg, context);
     }
     /**
      * Remove the first matching entry from the specified database based on search criteria.
      */
     async removeOne(collection, arg, context = {}) {
         this.checkCollection(collection);
-        return await this.fileCpu.remove(this._getCollectionPath(collection), arg, context, true);
+        return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), true, arg, context);
     }
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection(collection) {
-        rmSync(this.folder + "/" + collection, { recursive: true, force: true });
+    async removeCollection(collection) {
+        await promises.rm(this.folder + "/" + collection, { recursive: true, force: true });
     }
 }
 /**
  * Get the last file in the specified directory.
  */
-function getLastFile(path, maxFileSize = 1024 * 1024) {
+async function getLastFile(path, maxFileSize = 1024 * 1024) {
     if (!existsSync(path))
         mkdirSync(path, { recursive: true });
-    const files = getSortedFiles(path);
+    const files = await getSortedFiles(path);
     if (files.length == 0) {
-        writeFileSync(path + "/1.db", "");
+        await promises.writeFile(path + "/1.db", "");
         return "1.db";
     }
     const last = files[files.length - 1];
-    const info = path + "/" + last.f;
+    const info = path + "/" + last;
     if (statSync(info).size < maxFileSize)
-        return last.f;
-    const num = last.i + 1;
-    writeFileSync(path + "/" + num + ".db", "");
+        return last;
+    const num = parseInt(last.replace(".db", ""), 10) + 1;
+    await promises.writeFile(path + "/" + num + ".db", "");
     return num + ".db";
 }
 /**
  * Get all files in a directory sorted by name.
  */
-function getSortedFiles(path) {
-    const files = readdirSync(path).filter(file => file.endsWith(".db"));
-    if (files.length == 0)
-        return [];
-    const filesWithoutExt = files.map(file => parseInt(file.replace(".db", "")));
-    filesWithoutExt.sort();
-    return filesWithoutExt.map(file => {
-        return {
-            i: file,
-            f: file + ".db"
-        };
+async function getSortedFiles(folder) {
+    const files = await promises.readdir(folder, { withFileTypes: true });
+    return files
+        .filter(file => file.isFile() && !file.name.endsWith(".tmp"))
+        .map(file => file.name)
+        .filter(name => /^\d+\.db$/.test(name))
+        .sort((a, b) => {
+        const numA = parseInt(a, 10);
+        const numB = parseInt(b, 10);
+        return numA - numB;
     });
 }
+async function operationUpdater(cpath, worker, one, ...args) {
+    const files = await getSortedFiles(cpath);
+    let update = false;
+    for (const file of files) {
+        const updated = await worker(cpath + file, one, ...args);
+        if (one && updated)
+            break;
+        update = update || updated;
+    }
+    return update;
+}
 export default dbActionC;

package/dist/{esm/client → client}/database.js

@@ -102,7 +102,7 @@ class DataBaseRemote {
      * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
      */
     async updateOneOrAdd(collection, search, arg, add_arg = {}, context = {}, id_gen = true) {
-        return await this._request("updateOneOrAdd", [collection, search, arg, add_arg, id_gen, context]);
+        return await this._request("updateOneOrAdd", [collection, search, arg, add_arg, context, id_gen]);
     }
     /**
      * Removes a database collection from the file system.

package/dist/{esm/database.js → database.js}

@@ -25,19 +25,19 @@ class DataBase {
      * Get the names of all available databases.
      */
     async getCollections() {
-        return this.dbAction.getCollections();
+        return await this.dbAction.getCollections();
     }
     /**
      * Check and create the specified collection if it doesn't exist.
      */
     async checkCollection(collection) {
-        this.dbAction.checkCollection(collection);
+        await this.dbAction.checkCollection(collection);
     }
     /**
      * Check if a collection exists.
      */
     async issetCollection(collection) {
-        return this.dbAction.issetCollection(collection);
+        return await this.dbAction.issetCollection(collection);
     }
     /**
      * Add data to a database.
@@ -102,7 +102,7 @@ class DataBase {
      * Removes a database collection from the file system.
      */
     async removeCollection(collection) {
-        this.dbAction.removeCollection(collection);
+        await this.dbAction.removeCollection(collection);
     }
 }
 export default DataBase;

package/dist/{esm/file → file}/customFileCpu.d.ts

@@ -13,9 +13,7 @@ declare class CustomFileCpu implements FileCpu {
     addMany(file: string, data: Data[]): Promise<void>;
     find(file: string, arg: Search, context?: Context, findOpts?: FindOpts): Promise<any[] | false>;
     findOne(file: string, arg: Search, context?: Context, findOpts?: FindOpts): Promise<any | false>;
-    removeWorker(file: string, arg: Search, context?: Context, one?: boolean): Promise<boolean>;
-    remove(cpath: string, arg: Search, context?: Context, one?: boolean): Promise<boolean>;
-    updateWorker(file: string, arg: Search, updater: Updater, context?: Context, one?: boolean): Promise<boolean>;
-    update(cpath: string, arg: Search, updater: Updater, context?: Context, one?: boolean): Promise<boolean>;
+    remove(file: string, one: boolean, arg: Search, context?: Context): Promise<boolean>;
+    update(file: string, one: boolean, arg: Search, updater: Updater, context?: Context): Promise<boolean>;
 }
 export default CustomFileCpu;

package/dist/{esm/file → file}/customFileCpu.js

@@ -1,7 +1,6 @@
 import hasFieldsAdvanced from "../utils/hasFieldsAdvanced.js";
 import updateFindObject from "../utils/updateFindObject.js";
 import { pathRepair } from "./utils.js";
-import { readdirSync } from "fs";
 class CustomFileCpu {
     _readFile;
     _writeFile;
@@ -33,7 +32,7 @@ class CustomFileCpu {
         const result = entries.find(entry => typeof arg === "function" ? arg(entry, context) : hasFieldsAdvanced(entry, arg));
         return result ? updateFindObject(result, findOpts) : false;
     }
-    async removeWorker(file, arg, context = {}, one = false) {
+    async remove(file, one, arg, context = {}) {
         file = pathRepair(file);
         let entries = await this._readFile(file);
         let removed = false;
@@ -52,19 +51,7 @@ class CustomFileCpu {
         await this._writeFile(file, entries);
         return true;
     }
-    async remove(cpath, arg, context = {}, one = false) {
-        let files = readdirSync(cpath).filter(file => !/\.tmp$/.test(file));
-        files.reverse();
-        let remove = false;
-        for (const file of files) {
-            const removed = await this.removeWorker(cpath + file, arg, context, one);
-            if (one && removed)
-                break;
-            remove = remove || removed;
-        }
-        return remove;
-    }
-    async updateWorker(file, arg, updater, context = {}, one = false) {
+    async update(file, one, arg, updater, context = {}) {
         file = pathRepair(file);
         let entries = await this._readFile(file);
         let updated = false;
@@ -83,17 +70,5 @@ class CustomFileCpu {
         await this._writeFile(file, entries);
         return true;
     }
-    async update(cpath, arg, updater, context = {}, one = false) {
-        let files = readdirSync(cpath).filter(file => !/\.tmp$/.test(file));
-        files.reverse();
-        let update = false;
-        for (const file of files) {
-            const updated = await this.updateWorker(cpath + file, arg, updater, context, one);
-            if (one && updated)
-                return true;
-            update = update || updated;
-        }
-        return update;
-    }
 }
 export default CustomFileCpu;

package/dist/file/remove.d.ts

@@ -0,0 +1,7 @@
+import { Search } from "../types/arg.js";
+import { Context } from "../types/types.js";
+/**
+ * Removes entries from a file based on search criteria.
+ */
+declare function removeWorker(file: string, one: boolean, search: Search, context?: Context): Promise<boolean>;
+export default removeWorker;

package/dist/{esm/file → file}/remove.js

@@ -1,11 +1,11 @@
-import { existsSync, promises, appendFileSync, readdirSync } from "fs";
+import { existsSync, promises, appendFileSync } from "fs";
 import { pathRepair, createRL } from "./utils.js";
 import { parse } from "../format.js";
 import hasFieldsAdvanced from "../utils/hasFieldsAdvanced.js";
 /**
  * Removes entries from a file based on search criteria.
  */
-async function removeWorker(file, search, context = {}, one = false) {
+async function removeWorker(file, one, search, context = {}) {
     file = pathRepair(file);
     if (!existsSync(file)) {
         await promises.writeFile(file, "");
@@ -38,19 +38,4 @@ async function removeWorker(file, search, context = {}, one = false) {
     await promises.writeFile(file + ".tmp", "");
     return removed;
 }
-/**
- * Asynchronously removes entries from a file based on search criteria.
- */
-async function remove(cpath, arg, context = {}, one = false) {
-    let files = readdirSync(cpath).filter(file => !/\.tmp$/.test(file));
-    files.reverse();
-    let remove = false;
-    for (const file of files) {
-        const removed = await removeWorker(cpath + file, arg, context, one);
-        if (one && removed)
-            break;
-        remove = remove || removed;
-    }
-    return remove;
-}
-export default remove;
+export default removeWorker;

package/dist/file/update.d.ts

@@ -0,0 +1,7 @@
+import { Context } from "../types/types.js";
+import { Search, Updater } from "../types/arg.js";
+/**
+ * Updates a file based on search criteria and an updater function or object.
+ */
+declare function updateWorker(file: string, one: boolean, search: Search, updater: Updater, context?: Context): Promise<boolean>;
+export default updateWorker;

package/dist/{esm/file → file}/update.js

@@ -1,4 +1,4 @@
-import { existsSync, promises, readdirSync } from "fs";
+import { existsSync, promises } from "fs";
 import { pathRepair, createRL } from "./utils.js";
 import { parse, stringify } from "../format.js";
 import hasFieldsAdvanced from "../utils/hasFieldsAdvanced.js";
@@ -6,7 +6,7 @@ import updateObjectAdvanced from "../utils/updateObject.js";
 /**
  * Updates a file based on search criteria and an updater function or object.
  */
-async function updateWorker(file, search, updater, context = {}, one = false) {
+async function updateWorker(file, one, search, updater, context = {}) {
     file = pathRepair(file);
     if (!existsSync(file)) {
         await promises.writeFile(file, "");
@@ -47,19 +47,4 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
     await promises.writeFile(file + ".tmp", "");
     return updated;
 }
-/**
- * Asynchronously updates entries in a file based on search criteria and an updater function or object.
- */
-async function update(cpath, arg, updater, context = {}, one = false) {
-    let files = readdirSync(cpath).filter(file => !/\.tmp$/.test(file));
-    files.reverse();
-    let update = false;
-    for (const file of files) {
-        const updated = await updateWorker(cpath + file, arg, updater, context, one);
-        if (one && updated)
-            return true;
-        update = update || updated;
-    }
-    return update;
-}
-export default update;
+export default updateWorker;

package/dist/{esm/types → types}/fileCpu.d.ts

@@ -30,22 +30,22 @@ interface FileCpu {
     findOne(file: string, arg: Search, context?: Context, findOpts?: FindOpts): Promise<any | false>;
     /**
    * Asynchronously removes entries from a file based on search criteria.
-   * @param cpath The path to the directory containing the files.
+   * @param file The path to the file.
    * @param arg 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(cpath: string, arg: Search, context?: Context, one?: boolean): Promise<boolean>;
+    remove(file: string, one: boolean, arg: Search, context?: Context): Promise<boolean>;
     /**
      * Asynchronously updates entries in a file based on search criteria and an updater function or object.
-     * @param cpath The path to the directory containing the files.
+     * @param file The path to the file.
      * @param arg 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(cpath: string, arg: Search, updater: Updater, context?: Context, one?: boolean): Promise<boolean>;
+    update(file: string, one: boolean, arg: Search, updater: Updater, context?: Context): Promise<boolean>;
 }
 export default FileCpu;

package/dist/types/types.d.ts

@@ -0,0 +1,3 @@
+export interface Context {
+    [key: string]: any;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wxn0brp/db",
-	"version": "0.1.2",
+	"version": "0.3.0",
 	"main": "dist/esm/index.js",
 	"types": "dist/esm/index.d.ts",
 	"description": "A simple file-based database management system with support for CRUD operations, custom queries, and graph structures.",
@@ -30,25 +30,22 @@
 		"typescript": "^5.7.2"
 	},
 	"scripts": {
-		"build:esm": "tsc && tsc-alias -p tsconfig.json",
-		"build:cjs": "tsc -p tsconfig.cjs.json && tsc-alias -p tsconfig.cjs.json",
-		"build": "npm run build:esm && npm run build:cjs",
+		"build": "tsc && tsc-alias",
 		"prepare": "npm run build",
-		"postversion": "git push && git push --tags"
+		"postversion": "git push && git push --tags",
+		"build:cdn": "npm run build && cd cdn && node index.js"
 	},
 	"files": [
 		"dist"
 	],
 	"exports": {
 		".": {
-			"types": "./dist/esm/index.d.ts",
-			"import": "./dist/esm/index.js",
-			"require": "./dist/cjs/index.js"
+			"types": "./dist/index.d.ts",
+			"import": "./dist/index.js"
 		},
 		"./*": {
-			"types": "./dist/esm/*",
-			"import": "./dist/esm/*",
-			"require": "./dist/cjs/*"
+			"types": "./dist/*",
+			"import": "./dist/*"
 		}
 	}
 }

package/dist/cjs/CollectionManager.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class CollectionManager {
-    db;
-    collection;
-    constructor(db, collection) {
-        this.db = db;
-        this.collection = collection;
-    }
-    /**
-     * Add data to a database.
-     */
-    async add(data, id_gen = true) {
-        return await this.db.add(this.collection, data, id_gen);
-    }
-    /**
-     * Find data in a database.
-     */
-    async find(search, context = {}, options = {}, findOpts = {}) {
-        return await this.db.find(this.collection, search, context, options, findOpts);
-    }
-    /**
-     * Find one data entry in a database.
-     */
-    async findOne(search, context = {}, findOpts = {}) {
-        return await this.db.findOne(this.collection, search, context, findOpts);
-    }
-    /**
-     * Update data in a database.
-     */
-    async update(search, updater, context = {}) {
-        return await this.db.update(this.collection, search, updater, context);
-    }
-    /**
-     * Update one data entry in a database.
-     */
-    async updateOne(search, updater, context = {}) {
-        return await this.db.updateOne(this.collection, search, updater, context);
-    }
-    /**
-     * Remove data from a database.
-     */
-    async remove(search, context = {}) {
-        return await this.db.remove(this.collection, search, context);
-    }
-    /**
-     * Remove one data entry from a database.
-     */
-    async removeOne(search, context = {}) {
-        return await this.db.removeOne(this.collection, search, context);
-    }
-    /**
-     * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
-     */
-    async updateOneOrAdd(search, updater, add_arg = {}, context = {}, id_gen = true) {
-        return await this.db.updateOneOrAdd(this.collection, search, updater, add_arg, context, id_gen);
-    }
-}
-exports.default = CollectionManager;

package/dist/cjs/action.d.ts

@@ -1,68 +0,0 @@
-import { Arg, Search, Updater } from "./types/arg.js";
-import { DbFindOpts, DbOpts, FindOpts } from "./types/options.js";
-import { Context } from "./types/types.js";
-import { SearchOptions } from "./types/searchOpts.js";
-import Data from "./types/data.js";
-import FileCpu from "./types/fileCpu.js";
-/**
- * A class representing database actions on files.
- * @class
- */
-declare class dbActionC {
-    folder: string;
-    options: DbOpts;
-    fileCpu: FileCpu;
-    /**
-     * Creates a new instance of dbActionC.
-     * @constructor
-     * @param folder - The folder where database files are stored.
-     * @param options - The options object.
-     */
-    constructor(folder: string, options: DbOpts, fileCpu: FileCpu);
-    _getCollectionPath(collection: string): string;
-    /**
-     * Get a list of available databases in the specified folder.
-     */
-    getCollections(): string[];
-    /**
-     * Check and create the specified collection if it doesn't exist.
-     */
-    checkCollection(collection: string): void;
-    /**
-     * Check if a collection exists.
-     */
-    issetCollection(collection: string): boolean;
-    /**
-     * Add a new entry to the specified database.
-     */
-    add(collection: string, arg: Arg, id_gen?: boolean): Promise<Arg>;
-    /**
-     * Find entries in the specified database based on search criteria.
-     */
-    find(collection: string, arg: Search, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<any[]>;
-    /**
-     * Find the first matching entry in the specified database based on search criteria.
-     */
-    findOne(collection: string, arg: SearchOptions, context?: Context, findOpts?: FindOpts): Promise<Data>;
-    /**
-     * Update entries in the specified database based on search criteria and an updater function or object.
-     */
-    update(collection: string, arg: Search, updater: Updater, context?: {}): Promise<boolean>;
-    /**
-     * Update the first matching entry in the specified database based on search criteria and an updater function or object.
-     */
-    updateOne(collection: string, arg: Search, updater: Updater, context?: Context): Promise<boolean>;
-    /**
-     * Remove entries from the specified database based on search criteria.
-     */
-    remove(collection: string, arg: Search, context?: Context): Promise<boolean>;
-    /**
-     * Remove the first matching entry from the specified database based on search criteria.
-     */
-    removeOne(collection: string, arg: Search, context?: Context): Promise<boolean>;
-    /**
-     * Removes a database collection from the file system.
-     */
-    removeCollection(collection: string): void;
-}
-export default dbActionC;