@wxn0brp/db 0.0.6 → 0.0.8

package/README.md

@@ -27,7 +27,7 @@ For detailed information, refer to the following resources:
 - [DataBase Documentation](./docs/database.md)
 - [Graph Documentation](./docs/graph.md)
 - [Remote Database and Graph Client Documentation](./docs/remote.md)
-- [Remote Server Documentation](./docs/remote_server.md)
 - [Search Options Documentation](./docs/search_opts.md)
 - [Find Options Documentation](./docs/find_opts.md)
+- [Updater Options Documentation](./docs/updater.md)
 - [Relation Documentation](./docs/relation.md)

package/dist/cjs/CollectionManager.d.ts

@@ -1,8 +1,9 @@
 import DataBase from "./database.js";
-import DataBaseRemote from "./remote/client/database.js";
-import { Arg, ArgOrFunc } from "./types/arg.js";
+import DataBaseRemote from "./client/database.js";
+import { Arg, Search, Updater } from "./types/arg.js";
 import { DbFindOpts, FindOpts } from "./types/options.js";
 import { Context } from "./types/types.js";
+import Data from "./types/data.js";
 declare class CollectionManager {
     db: DataBase | DataBaseRemote;
     collection: string;
@@ -10,34 +11,34 @@ declare class CollectionManager {
     /**
      * Add data to a database.
      */
-    add(data: Arg, id_gen?: boolean): Promise<any>;
+    add<T = Data>(data: Arg, id_gen?: boolean): Promise<T>;
     /**
      * Find data in a database.
      */
-    find(search: ArgOrFunc, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<any>;
+    find<T = Data>(search: Search, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<T[]>;
     /**
      * Find one data entry in a database.
      */
-    findOne(search: ArgOrFunc, context?: Context, findOpts?: FindOpts): Promise<any>;
+    findOne<T = Data>(search: Search, context?: Context, findOpts?: FindOpts): Promise<T>;
     /**
      * Update data in a database.
      */
-    update(search: ArgOrFunc, arg: ArgOrFunc, context?: Context): Promise<any>;
+    update(search: Search, updater: Updater, context?: Context): Promise<boolean>;
     /**
      * Update one data entry in a database.
      */
-    updateOne(search: ArgOrFunc, arg: ArgOrFunc, context?: Context): Promise<any>;
+    updateOne(search: Search, updater: Updater, context?: Context): Promise<boolean>;
     /**
      * Remove data from a database.
      */
-    remove(search: ArgOrFunc, context?: Context): Promise<any>;
+    remove(search: Search, context?: Context): Promise<boolean>;
     /**
      * Remove one data entry from a database.
      */
-    removeOne(search: ArgOrFunc, context?: Context): Promise<any>;
+    removeOne(search: Search, context?: Context): Promise<boolean>;
     /**
      * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
      */
-    updateOneOrAdd(search: ArgOrFunc, arg: ArgOrFunc, add_arg?: Arg, context?: Context, id_gen?: boolean): Promise<any>;
+    updateOneOrAdd(search: Search, arg: Search, add_arg?: Arg, context?: Context, id_gen?: boolean): Promise<boolean>;
 }
 export default CollectionManager;

package/dist/cjs/CollectionManager.js

@@ -28,14 +28,14 @@ class CollectionManager {
     /**
      * Update data in a database.
      */
-    async update(search, arg, context = {}) {
-        return await this.db.update(this.collection, search, arg, context);
+    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, arg, context = {}) {
-        return await this.db.updateOne(this.collection, search, arg, context);
+    async updateOne(search, updater, context = {}) {
+        return await this.db.updateOne(this.collection, search, updater, context);
     }
     /**
      * Remove data from a database.

package/dist/cjs/action.d.ts

@@ -1,6 +1,7 @@
-import { Arg, ArgOrFunc } from "./types/arg.js";
+import { Arg, Search, Updater } from "./types/arg.js";
 import { DbFindOpts, DbOpts, FindOpts } from "./types/options.js";
 import { Context } from "./types/types";
+import { SearchOptions } from "./types/searchOpts.js";
 import Data from "./types/data.js";
 /**
  * A class representing database actions on files.
@@ -12,27 +13,21 @@ declare class dbActionC {
     /**
      * Creates a new instance of dbActionC.
      * @constructor
-     * @param {string} folder - The folder where database files are stored.
-     * @param {object} options - The options object.
+     * @param folder - The folder where database files are stored.
+     * @param options - The options object.
      */
     constructor(folder: string, options: DbOpts);
     _getCollectionPath(collection: string): string;
     /**
      * Get a list of available databases in the specified folder.
-     * @returns {string[]} An array of database names.
      */
     getCollections(): string[];
     /**
      * Check and create the specified collection if it doesn't exist.
-     * @function
-     * @param {string} collection - The collection to check.
      */
     checkCollection(collection: string): void;
     /**
      * Check if a collection exists.
-     * @function
-     * @param {string} collection - The name of the collection.
-     * @returns {boolean} True if the collection exists, false otherwise.
      */
     issetCollection(collection: string): boolean;
     /**
@@ -42,27 +37,27 @@ declare class dbActionC {
     /**
      * Find entries in the specified database based on search criteria.
      */
-    find(collection: string, arg: ArgOrFunc, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<any[]>;
+    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: ArgOrFunc, context?: Context, findOpts?: FindOpts): Promise<Data>;
+    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: ArgOrFunc, obj: ArgOrFunc, context?: {}): Promise<boolean>;
+    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: ArgOrFunc, obj: ArgOrFunc, context?: Context): Promise<boolean>;
+    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: ArgOrFunc, context?: Context): Promise<boolean>;
+    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: ArgOrFunc, context?: Context): Promise<boolean>;
+    removeOne(collection: string, arg: Search, context?: Context): Promise<boolean>;
     /**
      * Removes a database collection from the file system.
      */

package/dist/cjs/action.js

@@ -17,8 +17,8 @@ class dbActionC {
     /**
      * Creates a new instance of dbActionC.
      * @constructor
-     * @param {string} folder - The folder where database files are stored.
-     * @param {object} options - The options object.
+     * @param folder - The folder where database files are stored.
+     * @param options - The options object.
      */
     constructor(folder, options) {
         this.folder = folder;
@@ -34,7 +34,6 @@ class dbActionC {
     }
     /**
      * Get a list of available databases in the specified folder.
-     * @returns {string[]} An array of database names.
      */
     getCollections() {
         const collections = (0, fs_1.readdirSync)(this.folder, { recursive: true, withFileTypes: true })
@@ -48,8 +47,6 @@ class dbActionC {
     }
     /**
      * Check and create the specified collection if it doesn't exist.
-     * @function
-     * @param {string} collection - The collection to check.
      */
     checkCollection(collection) {
         const cpath = this._getCollectionPath(collection);
@@ -58,9 +55,6 @@ class dbActionC {
     }
     /**
      * Check if a collection exists.
-     * @function
-     * @param {string} collection - The name of the collection.
-     * @returns {boolean} True if the collection exists, false otherwise.
      */
     issetCollection(collection) {
         const path = this.folder + "/" + collection;
@@ -129,16 +123,16 @@ class dbActionC {
     /**
      * Update entries in the specified database based on search criteria and an updater function or object.
      */
-    async update(collection, arg, obj, context = {}) {
+    async update(collection, arg, updater, context = {}) {
         this.checkCollection(collection);
-        return await (0, index_js_1.update)(this._getCollectionPath(collection), arg, obj, context);
+        return await (0, index_js_1.update)(this._getCollectionPath(collection), 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, obj, context = {}) {
+    async updateOne(collection, arg, updater, context = {}) {
         this.checkCollection(collection);
-        return await (0, index_js_1.update)(this._getCollectionPath(collection), arg, obj, context, true);
+        return await (0, index_js_1.update)(this._getCollectionPath(collection), arg, updater, context, true);
     }
     /**
      * Remove entries from the specified database based on search criteria.

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

@@ -0,0 +1,72 @@
+import CollectionManager from "../CollectionManager.js";
+import { Remote, RequestData } from "./remote.js";
+import { Arg, Search, Updater } from "../types/arg";
+import { DbFindOpts, FindOpts } from "../types/options.js";
+import { Context } from "../types/types";
+import Data from "../types/data.js";
+/**
+ * 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<T>(type: string, data: RequestData): Promise<T>;
+    /**
+     * Create a new instance of a CollectionManager class.
+     */
+    c(collection: string): CollectionManager;
+    /**
+     * Get the names of all available databases.
+     */
+    getCollections(): Promise<string[]>;
+    /**
+     * Check and create the specified collection if it doesn't exist.
+     */
+    checkCollection(collection: string): Promise<boolean>;
+    /**
+     * Check if a collection exists.
+     */
+    issetCollection(collection: string): Promise<boolean>;
+    /**
+     * Add data to a database.
+     */
+    add<T = Data>(collection: string, data: Arg, id_gen?: boolean): Promise<T>;
+    /**
+     * Find data in a database.
+     */
+    find<T = Data>(collection: string, search: Search, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<T[]>;
+    /**
+     * Find one data entry in a database.
+     */
+    findOne<T = Data>(collection: string, search: Search, context?: Context, findOpts?: FindOpts): Promise<T>;
+    /**
+     * Update data in a database.
+     */
+    update(collection: string, search: Search, updater: Updater, context?: Context): Promise<boolean>;
+    /**
+     * Update one data entry in a database.
+     */
+    updateOne(collection: string, search: Search, updater: Updater, context?: Context): Promise<boolean>;
+    /**
+     * Remove data from a database.
+     */
+    remove(collection: string, search: Search, context?: Context): Promise<boolean>;
+    /**
+     * Remove one data entry from a database.
+     */
+    removeOne(collection: string, search: Search, context?: Context): Promise<boolean>;
+    /**
+     * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
+     */
+    updateOneOrAdd(collection: string, search: Search, arg: Search, add_arg?: Arg, context?: Context, id_gen?: boolean): Promise<boolean>;
+    /**
+     * Removes a database collection from the file system.
+     */
+    removeCollection(name: string): Promise<boolean>;
+}
+export default DataBaseRemote;

package/dist/cjs/{remote/client → client}/database.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const got_1 = __importDefault(require("got"));
-const CollectionManager_js_1 = __importDefault(require("../../CollectionManager.js"));
+const CollectionManager_js_1 = __importDefault(require("../CollectionManager.js"));
 const function_js_1 = __importDefault(require("./function.js"));
 /**
  * Represents a database management class for performing CRUD operations.
@@ -21,10 +21,10 @@ class DataBaseRemote {
      */
     async _request(type, data) {
         data.db = this.remote.name;
-        const procesed = (0, function_js_1.default)(data);
+        const processed = (0, function_js_1.default)(data);
         data = {
-            keys: procesed.keys,
-            ...procesed.data
+            keys: processed.keys,
+            ...processed.data
         };
         const res = await got_1.default.post(this.remote.url + "/db/database/" + type, {
             // @ts-ignore: Some jerk can't do the types correctly.
@@ -100,17 +100,17 @@ class DataBaseRemote {
     /**
      * Update data in a database.
      */
-    async update(collection, search, arg, context = {}) {
+    async update(collection, search, updater, context = {}) {
         const searchStr = typeof search === "function" ? search.toString() : search;
-        const argStr = typeof arg === "function" ? arg.toString() : arg;
+        const argStr = typeof updater === "function" ? updater.toString() : updater;
         return await this._request("update", { collection, search: searchStr, arg: argStr, context });
     }
     /**
      * Update one data entry in a database.
      */
-    async updateOne(collection, search, arg, context = {}) {
+    async updateOne(collection, search, updater, context = {}) {
         const searchStr = typeof search === "function" ? search.toString() : search;
-        const argStr = typeof arg === "function" ? arg.toString() : arg;
+        const argStr = typeof updater === "function" ? updater.toString() : updater;
         return await this._request("updateOne", { collection, search: searchStr, arg: argStr, context });
     }
     /**
@@ -138,8 +138,8 @@ class DataBaseRemote {
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection(name) {
-        return this._request("removeCollection", { name });
+    async removeCollection(name) {
+        return await this._request("removeCollection", { name });
     }
 }
 exports.default = DataBaseRemote;

package/dist/cjs/database.d.ts

@@ -2,7 +2,7 @@ import dbActionC from "./action.js";
 import executorC from "./executor.js";
 import CollectionManager from "./CollectionManager.js";
 import { DbFindOpts, DbOpts, FindOpts } from "./types/options.js";
-import { Arg, ArgOrFunc } from "./types/arg.js";
+import { Arg, Search, Updater } from "./types/arg.js";
 import Data from "./types/data.js";
 import { Context } from "./types/types.js";
 /**
@@ -32,46 +32,38 @@ declare class DataBase {
     /**
      * Add data to a database.
      */
-    add(collection: string, data: Arg, id_gen?: boolean): Promise<Data>;
+    add<T = Data>(collection: string, data: Arg, id_gen?: boolean): Promise<T>;
     /**
      * Find data in a database.
      */
-    find(collection: string, search: ArgOrFunc, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<Data[]>;
+    find<T = Data>(collection: string, search: Search, context?: Context, options?: DbFindOpts, findOpts?: FindOpts): Promise<T[]>;
     /**
      * 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.
      */
-    findOne(collection: string, search: ArgOrFunc, context?: Context, findOpts?: FindOpts): Promise<Data>;
+    findOne<T = Data>(collection: string, search: Search, context?: Context, findOpts?: FindOpts): Promise<T>;
     /**
      * Update data in a database.
      */
-    update(collection: string, search: ArgOrFunc, arg: ArgOrFunc, context?: {}): Promise<boolean>;
+    update(collection: string, search: Search, updater: Updater, context?: {}): Promise<boolean>;
     /**
      * Update one data entry in a database.
      */
-    updateOne(collection: string, search: ArgOrFunc, arg: ArgOrFunc, context?: Context): Promise<boolean>;
+    updateOne(collection: string, search: Search, updater: Updater, context?: Context): Promise<boolean>;
     /**
      * Remove data from a database.
      */
-    remove(collection: string, search: ArgOrFunc, context?: Context): Promise<boolean>;
+    remove(collection: string, search: Search, context?: Context): Promise<boolean>;
     /**
      * Remove one data entry from a database.
      */
-    removeOne(collection: string, search: ArgOrFunc, context?: Context): Promise<boolean>;
+    removeOne(collection: string, search: Search, context?: Context): Promise<boolean>;
     /**
      * 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<boolean>;
+    updateOneOrAdd(collection: string, search: Search, updater: Updater, add_arg?: Arg, context?: Context, id_gen?: boolean): Promise<boolean>;
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection(collection: string): void;
+    removeCollection(collection: string): Promise<void>;
 }
 export default DataBase;

package/dist/cjs/database.js

@@ -55,14 +55,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);
@@ -70,14 +62,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.
@@ -94,14 +86,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);
@@ -111,7 +103,7 @@ class DataBase {
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection(collection) {
+    async removeCollection(collection) {
         this.dbAction.removeCollection(collection);
     }
 }

package/dist/cjs/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/cjs/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/cjs/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/cjs/file/update.js

@@ -23,7 +23,7 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
     let updated = false;
     for await (let line of rl) {
         if (one && updated) {
-            (0, fs_1.appendFileSync)(file, line + "\n");
+            await fs_1.promises.appendFile(file, line + "\n");
             continue;
         }
         const data = (0, format_js_1.parse)(line);
@@ -35,9 +35,11 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
             ob = (0, hasFieldsAdvanced_js_1.default)(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 = (0, updateObject_js_1.default)(data, updater);
@@ -45,7 +47,7 @@ async function updateWorker(file, search, updater, context = {}, one = false) {
             line = await (0, format_js_1.stringify)(updateObj);
             updated = true;
         }
-        (0, fs_1.appendFileSync)(file, line + "\n");
+        await fs_1.promises.appendFile(file, line + "\n");
     }
     await fs_1.promises.writeFile(file + ".tmp", "");
     return updated;
@@ -53,12 +55,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 = (0, fs_1.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/cjs/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/cjs/index.js

@@ -8,9 +8,9 @@ const database_js_1 = __importDefault(require("./database.js"));
 exports.DataBase = database_js_1.default;
 const graph_js_1 = __importDefault(require("./graph.js"));
 exports.Graph = graph_js_1.default;
-const database_js_2 = __importDefault(require("./remote/client/database.js"));
+const database_js_2 = __importDefault(require("./client/database.js"));
 exports.DataBaseRemote = database_js_2.default;
-const graph_js_2 = __importDefault(require("./remote/client/graph.js"));
+const graph_js_2 = __importDefault(require("./client/graph.js"));
 exports.GraphRemote = graph_js_2.default;
 const gen_js_1 = __importDefault(require("./gen.js"));
 exports.genId = gen_js_1.default;

package/dist/cjs/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/cjs/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>;