@wxn0brp/db 0.0.6 → 0.0.8

package/dist/esm/database.js

@@ -50,14 +50,6 @@ class DataBase {
     }
     /**
      * Find one data entry in a database.
-     *
-     * @async
-     * @function
-     * @param {string} collection - Name of the database collection.
-     * @param {function|Object} search - The query. It can be an object or a function.
-     * @param {Object} context - The context object (for functions).
-     * @param {Object} findOpts - Update result object with findOpts options.
-     * @returns {Promise<Object|null>} A Promise that resolves with the first matching data entry.
      */
     async findOne(collection, search, context = {}, findOpts = {}) {
         return await this.executor.addOp(this.dbAction.findOne.bind(this.dbAction), collection, search, context, findOpts);
@@ -65,14 +57,14 @@ class DataBase {
     /**
      * Update data in a database.
      */
-    async update(collection, search, arg, context = {}) {
-        return await this.executor.addOp(this.dbAction.update.bind(this.dbAction), collection, search, arg, context);
+    async update(collection, search, updater, context = {}) {
+        return await this.executor.addOp(this.dbAction.update.bind(this.dbAction), collection, search, updater, context);
     }
     /**
      * Update one data entry in a database.
      */
-    async updateOne(collection, search, arg, context = {}) {
-        return await this.executor.addOp(this.dbAction.updateOne.bind(this.dbAction), collection, search, arg, context);
+    async updateOne(collection, search, updater, context = {}) {
+        return await this.executor.addOp(this.dbAction.updateOne.bind(this.dbAction), collection, search, updater, context);
     }
     /**
      * Remove data from a database.
@@ -89,14 +81,14 @@ class DataBase {
     /**
      * 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) {
-        const res = await this.updateOne(collection, search, arg, context);
+    async updateOneOrAdd(collection, search, updater, add_arg = {}, context = {}, id_gen = true) {
+        const res = await this.updateOne(collection, search, updater, context);
         if (!res) {
             const assignData = [];
             if (typeof search === "object" && !Array.isArray(search))
                 assignData.push(search);
-            if (typeof arg === "object" && !Array.isArray(arg))
-                assignData.push(arg);
+            if (typeof updater === "object" && !Array.isArray(updater))
+                assignData.push(updater);
             if (typeof add_arg === "object" && !Array.isArray(add_arg))
                 assignData.push(add_arg);
             await this.add(collection, Object.assign({}, ...assignData), id_gen);
@@ -106,7 +98,7 @@ class DataBase {
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection(collection) {
+    async removeCollection(collection) {
         this.dbAction.removeCollection(collection);
     }
 }

package/dist/esm/file/find.d.ts

@@ -1,11 +1,11 @@
-import { ArgOrFunc } from "../types/arg.js";
+import { Search } from "../types/arg.js";
 import { Context } from "../types/types.js";
 import { FindOpts } from "../types/options.js";
 /**
  * Asynchronously finds entries in a file based on search criteria.
  */
-export declare function find(file: string, arg: ArgOrFunc, context?: Context, findOpts?: FindOpts): Promise<unknown>;
+export declare function find(file: string, arg: Search, context?: Context, findOpts?: FindOpts): Promise<unknown>;
 /**
  * Asynchronously finds one entry in a file based on search criteria.
  */
-export declare function findOne(file: string, arg: ArgOrFunc, context?: Context, findOpts?: FindOpts): Promise<unknown>;
+export declare function findOne(file: string, arg: Search, context?: Context, findOpts?: FindOpts): Promise<unknown>;

package/dist/esm/file/remove.d.ts

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

package/dist/esm/file/update.d.ts

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

package/dist/esm/file/update.js

@@ -1,8 +1,8 @@
-import { existsSync, promises, appendFileSync, readdirSync } from "fs";
+import { existsSync, promises, readdirSync } from "fs";
 import { pathRepair, createRL } from "./utils.js";
 import { parse, stringify } from "../format.js";
 import hasFieldsAdvanced from "../utils/hasFieldsAdvanced.js";
-import updateObject from "../utils/updateObject.js";
+import updateObjectAdvanced from "../utils/updateObject.js";
 /**
  * Updates a file based on search criteria and an updater function or object.
  */
@@ -18,7 +18,7 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
     let updated = false;
     for await (let line of rl) {
         if (one && updated) {
-            appendFileSync(file, line + "\n");
+            await promises.appendFile(file, line + "\n");
             continue;
         }
         const data = parse(line);
@@ -30,17 +30,19 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
             ob = hasFieldsAdvanced(data, search);
         }
         if (ob) {
-            let updateObj;
+            let updateObj = data;
             if (typeof updater === "function") {
-                updateObj = updater(data, context);
+                const updateObjValue = updater(data, context);
+                if (updateObjValue)
+                    updateObj = updateObjValue;
             }
             else if (typeof updater === "object" && !Array.isArray(updater)) {
-                updateObj = updateObject(data, updater);
+                updateObj = updateObjectAdvanced(data, updater);
             }
             line = await stringify(updateObj);
             updated = true;
         }
-        appendFileSync(file, line + "\n");
+        await promises.appendFile(file, line + "\n");
     }
     await promises.writeFile(file + ".tmp", "");
     return updated;
@@ -48,12 +50,12 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
 /**
  * Asynchronously updates entries in a file based on search criteria and an updater function or object.
  */
-async function update(cpath, arg, obj, context = {}, one = false) {
+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, obj, context, one);
+        const updated = await updateWorker(cpath + file, arg, updater, context, one);
         if (one && updated)
             return true;
         update = update || updated;

package/dist/esm/index.d.ts

@@ -1,7 +1,13 @@
 import DataBase from "./database.js";
 import Graph from "./graph.js";
-import DataBaseRemote from "./remote/client/database.js";
-import GraphRemote from "./remote/client/graph.js";
+import DataBaseRemote from "./client/database.js";
+import GraphRemote from "./client/graph.js";
 import genId from "./gen.js";
 import Relation from "./relation.js";
 export { DataBase, Graph, DataBaseRemote, GraphRemote, Relation, genId };
+import type Id from "./types/Id.js";
+import type { Arg, Search, Updater } from "./types/arg.js";
+import type { DbFindOpts, FindOpts, DbOpts } from "./types/options.js";
+import type Data from "./types/data.js";
+import type { SearchOptions } from "./types/searchOpts.js";
+export type { Id, Arg, Search, Updater, DbFindOpts, FindOpts, DbOpts, Data, SearchOptions };

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 import DataBase from "./database.js";
 import Graph from "./graph.js";
-import DataBaseRemote from "./remote/client/database.js";
-import GraphRemote from "./remote/client/graph.js";
+import DataBaseRemote from "./client/database.js";
+import GraphRemote from "./client/graph.js";
 import genId from "./gen.js";
 import Relation from "./relation.js";
 export { DataBase, Graph, DataBaseRemote, GraphRemote, Relation, genId };

package/dist/esm/relation.d.ts

@@ -1,5 +1,5 @@
 import DataBase from "./database.js";
-import { ArgOrFunc } from "./types/arg.js";
+import { Search } from "./types/arg.js";
 import { DbFindOpts } from "./types/options.js";
 export interface Databases {
     [key: string]: DataBase;
@@ -36,7 +36,7 @@ declare class Relation {
      * @param relations - Relations configuration
      * @param options - Search options
      */
-    find(path: string, search: ArgOrFunc, relations?: {}, options?: DbFindOpts): Promise<{
+    find(path: string, search: Search, relations?: {}, options?: DbFindOpts): Promise<{
         constructor: Function;
         toString(): string;
         toLocaleString(): string;
@@ -51,7 +51,7 @@ declare class Relation {
      * @param search - Search query or function
      * @param relations - Relations configuration
      */
-    findOne(path: string, search: ArgOrFunc, relations?: Object): Promise<{
+    findOne(path: string, search: Search, relations?: Object): Promise<{
         constructor: Function;
         toString(): string;
         toLocaleString(): string;

package/dist/esm/types/arg.d.ts

@@ -1,6 +1,12 @@
 import Id from "./Id";
+import { SearchOptions } from "./searchOpts";
+import { Context } from "./types";
+import { UpdaterArg } from "./updater";
 export interface Arg {
     _id?: Id;
     [key: string]: any;
 }
-export type ArgOrFunc = Arg | Function;
+export type SearchFunc<T = any> = (data: T, context: Context) => boolean;
+export type UpdaterFunc<T = any> = (data: T, context: Context) => boolean;
+export type Search<T = any> = SearchOptions | SearchFunc<T>;
+export type Updater<T = any> = UpdaterArg | UpdaterArg[] | UpdaterFunc<T>;

package/dist/esm/types/searchOpts.d.ts

@@ -4,23 +4,24 @@
  * This module defines the types and structures for search operators used
  * to validate and query data objects.
  */
+import { Arg } from "./arg";
 /** Logical Operators */
 export type LogicalOperators = {
     /**
      * Recursively applies multiple conditions, all of which must evaluate to true.
      * Can include other operators such as $gt, $exists, or nested $and/$or conditions.
      */
-    $and?: Array<PredefinedSearchOperators>;
+    $and?: Array<SearchOptions>;
     /**
      * Recursively applies multiple conditions, at least one of which must evaluate to true.
      * Can include other operators such as $lt, $type, or nested $and/$or conditions.
      */
-    $or?: Array<PredefinedSearchOperators>;
+    $or?: Array<SearchOptions>;
     /**
      * Negates a single condition.
      * Can include any other operator as its value.
      */
-    $not?: PredefinedSearchOperators;
+    $not?: SearchOptions;
 };
 /** Comparison Operators */
 export type ComparisonOperators = {
@@ -58,4 +59,4 @@ export type PredefinedSearchOperators = LogicalOperators & ComparisonOperators &
 /**
  * SearchOptions can be either a function or an object with predefined operators.
  */
-export type SearchOptions = PredefinedSearchOperators | ((doc: Record<string, any>) => boolean);
+export type SearchOptions = PredefinedSearchOperators & Arg;

package/dist/esm/types/types.d.ts

@@ -1,4 +1,5 @@
 export interface Context {
+    [key: string]: any;
 }
 export interface SortedFiles {
     i: number;

package/dist/esm/types/updater.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Predefined type for updating data.
+ */
+/** Arrays */
+export type ArrayUpdater = {
+    $push?: any;
+    /** Pushes items into an array and removes duplicates */
+    $pushset?: any;
+    $pull?: any;
+    $pullall?: any;
+};
+/** Objects */
+export type ObjectUpdater = {
+    $merge?: any;
+};
+/** Values */
+export type ValueUpdater = {
+    $set?: any;
+    $inc?: any;
+    $dec?: any;
+    $unset?: any;
+    $rename?: any;
+};
+export type UpdaterArg = ArrayUpdater & ObjectUpdater & ValueUpdater & {
+    [key: string]: any;
+};

package/dist/esm/types/updater.js

@@ -0,0 +1,4 @@
+/**
+ * Predefined type for updating data.
+ */
+export {};

package/dist/esm/utils/updateObject.d.ts

@@ -1,8 +1,7 @@
+import { UpdaterArg } from "../types/updater.js";
 /**
  * Updates an object with new values.
- * @function
- * @param {Object} obj - The object to update.
- * @param {Object} newVal - An object containing new values to update in the target object.
- * @returns {Object} The updated object.
+ * @param obj - The object to update.
+ * @param fields - An object containing new values to update in the target object.
  */
-export default function updateObject(obj: any, newVal: any): any;
+export default function updateObjectAdvanced(obj: any, fields: UpdaterArg | UpdaterArg[]): any;

package/dist/esm/utils/updateObject.js

@@ -1,11 +1,141 @@
 /**
  * Updates an object with new values.
- * @function
- * @param {Object} obj - The object to update.
- * @param {Object} newVal - An object containing new values to update in the target object.
- * @returns {Object} The updated object.
+ * @param obj - The object to update.
+ * @param fields - An object containing new values to update in the target object.
  */
-export default function updateObject(obj, newVal) {
+export default function updateObjectAdvanced(obj, fields) {
+    if (typeof fields !== "object" || fields === null) {
+        throw new Error("Fields must be an object or object array");
+    }
+    const fieldsArray = Array.isArray(fields) ? fields : [fields];
+    for (const field of fieldsArray) {
+        if (typeof field !== "object" || field === null) {
+            throw new Error("Fields must be an object or object array");
+        }
+        updateAdvanced(obj, field);
+        const fieldsSubset = removeAdvancedOperators({ ...field });
+        updateObject(obj, fieldsSubset);
+    }
+    return obj;
+}
+function updateAdvanced(obj, fields) {
+    updateArray(obj, fields);
+    updateNested(obj, fields);
+    updateIncrement(obj, fields);
+    updateUnset(obj, fields);
+    updateRename(obj, fields);
+}
+function removeAdvancedOperators(fields) {
+    const advancedOperators = [
+        "push", "pushset", "pull", "pullall",
+        "inc", "dec",
+        "unset",
+        "merge",
+        "rename"
+    ].map(operator => "$" + operator);
+    advancedOperators.forEach(operator => delete fields[operator]);
+    return fields;
+}
+function updateArray(obj, fields) {
+    if ("$push" in fields) {
+        for (const [key, value] of Object.entries(fields["$push"])) {
+            if (Array.isArray(obj[key])) {
+                obj[key].push(value);
+            }
+            else {
+                obj[key] = [value];
+            }
+        }
+    }
+    if ("$pushset" in fields) {
+        for (const [key, value] of Object.entries(fields["$pushset"])) {
+            if (Array.isArray(obj[key])) {
+                obj[key].push(value);
+            }
+            else {
+                obj[key] = [value];
+            }
+            obj[key] = [...new Set(obj[key])];
+        }
+    }
+    if ("$pull" in fields) {
+        for (const [key, value] of Object.entries(fields["$pull"])) {
+            if (Array.isArray(obj[key])) {
+                obj[key] = obj[key].filter(item => item !== value);
+            }
+        }
+    }
+    if ("$pullall" in fields) {
+        for (const [key, values] of Object.entries(fields["$pullall"])) {
+            if (Array.isArray(obj[key])) {
+                obj[key] = obj[key].filter(item => !values.includes(item));
+            }
+        }
+    }
+}
+function updateNested(obj, fields) {
+    if ("$merge" in fields) {
+        for (const [key, value] of Object.entries(fields["$merge"])) {
+            if (typeof obj[key] === "object" && typeof value === "object") {
+                obj[key] = { ...obj[key], ...value };
+            }
+            else {
+                obj[key] = value;
+            }
+        }
+    }
+}
+function updateIncrement(obj, fields) {
+    if ("$inc" in fields) {
+        for (const [key, value] of Object.entries(fields["$inc"])) {
+            if (typeof obj[key] === "number" && typeof value === "number") {
+                obj[key] += value;
+            }
+            else if (!(key in obj)) {
+                obj[key] = value;
+            }
+            else {
+                throw new Error(`Cannot increment non-numeric value at key: ${key}`);
+            }
+        }
+    }
+    if ("$dec" in fields) {
+        for (const [key, value] of Object.entries(fields["$dec"])) {
+            if (typeof obj[key] === "number" && typeof value === "number") {
+                obj[key] -= value;
+            }
+            else if (!(key in obj)) {
+                obj[key] = value;
+            }
+            else {
+                throw new Error(`Cannot decrement non-numeric value at key: ${key}`);
+            }
+        }
+    }
+}
+function updateUnset(obj, fields) {
+    if ("$unset" in fields) {
+        for (const key of Object.keys(fields["$unset"])) {
+            delete obj[key];
+        }
+    }
+}
+function updateRename(obj, fields) {
+    if ("$rename" in fields) {
+        for (const [oldKey, newKey] of Object.entries(fields["$rename"])) {
+            if (oldKey in obj) {
+                obj[newKey] = obj[oldKey];
+                delete obj[oldKey];
+            }
+        }
+    }
+}
+/**
+ * Updates an object with new values.
+ * @param obj - The object to update.
+ * @param newVal - An object containing new values to update in the target object.
+ */
+function updateObject(obj, newVal) {
     for (let key in newVal) {
         if (newVal.hasOwnProperty(key)) {
             obj[key] = newVal[key];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wxn0brp/db",
-	"version": "0.0.6",
+	"version": "0.0.8",
 	"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.",
@@ -25,23 +25,14 @@
 		"readline": "^1.3.0"
 	},
 	"devDependencies": {
-		"@types/body-parser": "^1.19.5",
 		"@types/got": "^9.6.12",
 		"@types/node": "^22.10.2",
-		"ava": "^6.2.0",
-		"body-parser": "^1.20.3",
-		"cors": "^2.8.5",
-		"dotenv": "^16.4.5",
-		"express": "^4.21.1",
-		"jwt-simple": "^0.5.6",
-		"node-cache": "^5.1.2",
 		"typescript": "^5.7.2"
 	},
 	"scripts": {
 		"build:esm": "tsc",
 		"build:cjs": "tsc --module CommonJS --outDir ./dist/cjs --declarationDir ./dist/cjs",
 		"build": "npm run build:esm && npm run build:cjs",
-		"postbuild": "node scripts/postbuild.js",
 		"prepare": "npm run build",
 		"postversion": "git push && git push --tags"
 	},
@@ -51,7 +42,13 @@
 	"exports": {
 		".": {
 			"import": "./dist/esm/index.js",
-			"require": "./dist/cjs/index.js"
+			"require": "./dist/cjs/index.js",
+			"types": "./dist/esm/index.d.ts"
+		},
+		"./*": {
+			"import": "./dist/esm/*",
+			"require": "./dist/cjs/*",
+			"types": "./dist/esm/*"
 		}
 	}
 }

package/dist/cjs/remote/client/database.d.ts

@@ -1,71 +0,0 @@
-import CollectionManager from "../../CollectionManager.js";
-import { Remote, RequestData } from "./remote.js";
-import { Arg, ArgOrFunc } from "../../types/arg";
-import { DbFindOpts, FindOpts } from "../../types/options.js";
-import { Context } from "../../types/types";
-/**
- * Represents a database management class for performing CRUD operations.
- * Uses a remote database.
- * @class
- */
-declare class DataBaseRemote {
-    remote: Remote;
-    constructor(remote: Remote);
-    /**
-     * Make a request to the remote database.
-     */
-    _request(type: string, data: RequestData): Promise<any>;
-    /**
-     * Create a new instance of a CollectionManager class.
-     */
-    c(collection: string): CollectionManager;
-    /**
-     * Get the names of all available databases.
-     */
-    getCollections(): Promise<any>;
-    /**
-     * Check and create the specified collection if it doesn't exist.
-     */
-    checkCollection(collection: string): Promise<any>;
-    /**
-     * Check if a collection exists.
-     */
-    issetCollection(collection: any): Promise<any>;
-    /**
-     * Add data to a database.
-     */
-    add(collection: any, data: any, id_gen?: boolean): Promise<any>;
-    /**
-     * Find data in a database.
-     */
-    find(collection: string, search: ArgOrFunc, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<any>;
-    /**
-     * Find one data entry in a database.
-     */
-    findOne(collection: string, search: ArgOrFunc, context?: Context, findOpts?: FindOpts): Promise<any>;
-    /**
-     * Update data in a database.
-     */
-    update(collection: string, search: ArgOrFunc, arg: ArgOrFunc, context?: Context): Promise<any>;
-    /**
-     * Update one data entry in a database.
-     */
-    updateOne(collection: string, search: ArgOrFunc, arg: ArgOrFunc, context?: Context): Promise<any>;
-    /**
-     * Remove data from a database.
-     */
-    remove(collection: string, search: ArgOrFunc, context?: Context): Promise<any>;
-    /**
-     * Remove one data entry from a database.
-     */
-    removeOne(collection: string, search: ArgOrFunc, context?: Context): Promise<any>;
-    /**
-     * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
-     */
-    updateOneOrAdd(collection: string, search: ArgOrFunc, arg: ArgOrFunc, add_arg?: Arg, context?: Context, id_gen?: boolean): Promise<any>;
-    /**
-     * Removes a database collection from the file system.
-     */
-    removeCollection(name: string): Promise<any>;
-}
-export default DataBaseRemote;

package/dist/cjs/remote/server/auth.d.ts

@@ -1,31 +0,0 @@
-export declare function authMiddleware(req: any, res: any, next: any): Promise<any>;
-export declare function loginFunction(login: any, password: any): Promise<{
-    err: boolean;
-    msg: string;
-    token?: undefined;
-} | {
-    err: boolean;
-    token: string;
-    msg?: undefined;
-}>;
-export declare function generateToken(payload: any): Promise<string>;
-export declare function removeToken(token: any): Promise<any>;
-export declare function addUserAccess(login: any, password: any): Promise<{
-    err: boolean;
-    msg: string;
-    user?: undefined;
-} | {
-    err: boolean;
-    user: any;
-    msg?: undefined;
-}>;
-export declare function checkUserAccess(login: any, password: any): Promise<{
-    err: boolean;
-    msg: string;
-    user?: undefined;
-} | {
-    err: boolean;
-    user: any;
-    msg?: undefined;
-}>;
-export declare function removeUser(idOrLogin: any): Promise<any>;