@wxn0brp/db 0.0.8 → 0.1.0

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

@@ -1,8 +1,8 @@
 import CollectionManager from "../CollectionManager.js";
-import { Remote, RequestData } from "./remote.js";
-import { Arg, Search, Updater } from "../types/arg";
+import { Remote } from "./remote.js";
+import { Arg, Search, Updater } from "../types/arg.js";
 import { DbFindOpts, FindOpts } from "../types/options.js";
-import { Context } from "../types/types";
+import { Context } from "../types/types.js";
 import Data from "../types/data.js";
 /**
  * Represents a database management class for performing CRUD operations.
@@ -15,7 +15,7 @@ declare class DataBaseRemote {
     /**
      * Make a request to the remote database.
      */
-    _request<T>(type: string, data: RequestData): Promise<T>;
+    _request<T>(type: string, params?: any[]): Promise<T>;
     /**
      * Create a new instance of a CollectionManager class.
      */

package/dist/esm/client/database.js

@@ -1,4 +1,4 @@
-import got from "got";
+import ky from "ky";
 import CollectionManager from "../CollectionManager.js";
 import serializeFunctions from "./function.js";
 /**
@@ -14,25 +14,23 @@ class DataBaseRemote {
     /**
      * Make a request to the remote database.
      */
-    async _request(type, data) {
-        data.db = this.remote.name;
-        const processed = serializeFunctions(data);
-        data = {
-            keys: processed.keys,
-            ...processed.data
+    async _request(type, params = []) {
+        const processed = serializeFunctions(params);
+        const data = {
+            db: this.remote.name,
+            params: processed.data,
+            keys: processed.keys
         };
-        const res = await got.post(this.remote.url + "/db/database/" + type, {
-            // @ts-ignore: Some jerk can't do the types correctly.
-            body: data,
+        const res = await ky.post(this.remote.url + "/db/" + type, {
+            json: data,
             headers: {
                 "Authorization": this.remote.auth
             },
-            json: true,
-            responseType: "json"
-        });
-        if (res.body.err)
-            throw new Error(res.body.msg);
-        return res.body.result;
+            throwHttpErrors: false
+        }).json();
+        if (res.err)
+            throw new Error(res.msg);
+        return res.result;
     }
     /**
      * Create a new instance of a CollectionManager class.
@@ -44,97 +42,73 @@ class DataBaseRemote {
      * Get the names of all available databases.
      */
     async getCollections() {
-        return await this._request("getCollections", {});
+        return await this._request("getCollections", []);
     }
     /**
      * Check and create the specified collection if it doesn't exist.
      */
     async checkCollection(collection) {
-        return await this._request("checkCollection", { collection });
+        return await this._request("checkCollection", [collection]);
     }
     /**
      * Check if a collection exists.
      */
     async issetCollection(collection) {
-        return await this._request("issetCollection", { collection });
+        return await this._request("issetCollection", [collection]);
     }
     /**
      * Add data to a database.
      */
     async add(collection, data, id_gen = true) {
-        return await this._request("add", { collection, data, id_gen });
+        return await this._request("add", [collection, data, id_gen]);
     }
     /**
      * Find data in a database.
      */
     async find(collection, search, context = {}, options = {}, findOpts = {}) {
-        const searchStr = typeof search === "function" ? search.toString() : search;
-        const findOptsRemote = {};
-        if (findOpts.select)
-            findOptsRemote.select = findOpts.select;
-        if (findOpts.exclude)
-            findOptsRemote.exclude = findOpts.exclude;
-        if (findOpts.transform)
-            findOptsRemote.transform = findOpts.transform.toString();
-        return await this._request("find", { collection, search: searchStr, options, context, findOpts });
+        return await this._request("find", [collection, search, context, options, findOpts]);
     }
     /**
      * Find one data entry in a database.
      */
     async findOne(collection, search, context = {}, findOpts = {}) {
-        const searchStr = typeof search === "function" ? search.toString() : search;
-        const findOptsRemote = {};
-        if (findOpts.select)
-            findOptsRemote.select = findOpts.select;
-        if (findOpts.exclude)
-            findOptsRemote.exclude = findOpts.exclude;
-        if (findOpts.transform)
-            findOptsRemote.transform = findOpts.transform.toString();
-        return await this._request("findOne", { collection, search: searchStr, context, findOpts });
+        return await this._request("findOne", [collection, search, context, findOpts]);
     }
     /**
      * Update data in a database.
      */
     async update(collection, search, updater, context = {}) {
-        const searchStr = typeof search === "function" ? search.toString() : search;
-        const argStr = typeof updater === "function" ? updater.toString() : updater;
-        return await this._request("update", { collection, search: searchStr, arg: argStr, context });
+        return await this._request("update", [collection, search, updater, context]);
     }
     /**
      * Update one data entry in a database.
      */
     async updateOne(collection, search, updater, context = {}) {
-        const searchStr = typeof search === "function" ? search.toString() : search;
-        const argStr = typeof updater === "function" ? updater.toString() : updater;
-        return await this._request("updateOne", { collection, search: searchStr, arg: argStr, context });
+        return await this._request("updateOne", [collection, search, updater, context]);
     }
     /**
      * Remove data from a database.
      */
     async remove(collection, search, context = {}) {
-        const searchStr = typeof search === "function" ? search.toString() : search;
-        return await this._request("remove", { collection, search: searchStr, context });
+        return await this._request("remove", [collection, search, context]);
     }
     /**
      * Remove one data entry from a database.
      */
     async removeOne(collection, search, context = {}) {
-        const searchStr = typeof search === "function" ? search.toString() : search;
-        return await this._request("removeOne", { collection, search: searchStr, context });
+        return await this._request("removeOne", [collection, search, context]);
     }
     /**
      * 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 searchStr = typeof search === "function" ? search.toString() : search;
-        const argStr = typeof arg === "function" ? arg.toString() : arg;
-        return await this._request("updateOneOrAdd", { collection, search: searchStr, arg: argStr, add_arg, id_gen, context });
+        return await this._request("updateOneOrAdd", [collection, search, arg, add_arg, id_gen, context]);
     }
     /**
      * Removes a database collection from the file system.
      */
     async removeCollection(name) {
-        return await this._request("removeCollection", { name });
+        return await this._request("removeCollection", [name]);
     }
 }
 export default DataBaseRemote;

package/dist/esm/client/graph.d.ts

@@ -1,4 +1,4 @@
-import { Remote, RequestData } from "./remote";
+import { Remote } from "./remote.js";
 /**
  * A class representing a graph database.
  * Uses a remote database.
@@ -13,7 +13,7 @@ declare class GraphRemote {
     /**
      * Make a request to the remote database.
      */
-    _request(type: string, data: RequestData): Promise<any>;
+    _request(type: string, params?: any[]): Promise<any>;
     /**
      * Adds an edge between two nodes.
      */

package/dist/esm/client/graph.js

@@ -1,4 +1,4 @@
-import got from "got";
+import ky from "ky";
 /**
  * A class representing a graph database.
  * Uses a remote database.
@@ -15,74 +15,75 @@ class GraphRemote {
     /**
      * Make a request to the remote database.
      */
-    async _request(type, data) {
-        data.db = this.remote.name;
-        const res = await got.post(this.remote.url + "/db/graph/" + type, {
-            // @ts-ignore
-            body: data,
+    async _request(type, params = []) {
+        const data = {
+            db: this.remote.name,
+            params
+        };
+        const res = await ky.post(this.remote.url + "/db/" + type, {
+            json: data,
             headers: {
                 "Authorization": this.remote.auth
             },
-            json: true,
-            responseType: "json"
-        });
-        if (res.body.err)
-            throw new Error(res.body.msg);
-        return res.body.result;
+            throwHttpErrors: false
+        }).json();
+        if (res.err)
+            throw new Error(res.msg);
+        return res.result;
     }
     /**
      * Adds an edge between two nodes.
      */
     async add(collection, nodeA, nodeB) {
-        return await this._request("add", { collection, nodeA, nodeB });
+        return await this._request("add", [collection, nodeA, nodeB]);
     }
     /**
      * Removes an edge between two nodes.
      */
     async remove(collection, nodeA, nodeB) {
-        return await this._request("remove", { collection, nodeA, nodeB });
+        return await this._request("remove", [collection, nodeA, nodeB]);
     }
     /**
      * Finds all edges with either node equal to `node`.
      */
     async find(collection, node) {
-        return await this._request("find", { collection, node });
+        return await this._request("find", [collection, node]);
     }
     /**
      * Finds one edge with either node equal to `nodeA` and the other equal to `nodeB`.
      */
     async findOne(collection, nodeA, nodeB) {
-        return await this._request("findOne", { collection, nodeA, nodeB });
+        return await this._request("findOne", [collection, nodeA, nodeB]);
     }
     /**
      * Get all edges in the collection.
      */
     async getAll(collection) {
-        return await this._request("getAll", { collection });
+        return await this._request("getAll", [collection]);
     }
     /**
      * Get the names of all available databases.
      */
     async getCollections() {
-        return await this._request("getCollections", {});
+        return await this._request("getCollections", []);
     }
     /**
      * Check and create the specified collection if it doesn't exist.
      */
     async checkCollection(collection) {
-        return await this._request("checkCollection", { collection });
+        return await this._request("checkCollection", [collection]);
     }
     /**
      * Check if a collection exists.
      */
     async issetCollection(collection) {
-        return await this._request("issetCollection", { collection });
+        return await this._request("issetCollection", [collection]);
     }
     /**
      * Remove the specified collection.
      */
     removeCollection(collection) {
-        return this._request("removeCollection", { collection });
+        return this._request("removeCollection", [collection]);
     }
 }
 export default GraphRemote;

package/dist/esm/client/remote.d.ts

@@ -4,10 +4,9 @@ export interface Remote {
     auth: string;
 }
 export interface RequestData {
-    collection?: string;
     db?: string;
     keys?: string[];
-    [key: string]: any;
+    params?: Record<string, any>;
 }
 export interface findOptsRemote {
     select?: string[];

package/dist/esm/format.d.ts

@@ -2,17 +2,11 @@
  * Parses given string into a JSON object. If the string does not start with
  * a {, it is wrapped in one. This allows for a shorthand when
  * storing/reading data from a file.
- *
- * @param {string} data
- * @returns {Object}
  */
-export declare function parse(data: any): any;
+export declare function parse(data: string): any;
 /**
  * Converts given object to a string. If the string is a valid json5, it is
  * returned as is. If it is a valid json5 wrapped in {}, the curly brackets
  * are removed. Otherwise the string is wrapped in {}.
- *
- * @param {Object} data
- * @return {String}
  */
 export declare function stringify(data: any): any;

package/dist/esm/format.js

@@ -3,9 +3,6 @@ import json5 from "json5";
  * Parses given string into a JSON object. If the string does not start with
  * a {, it is wrapped in one. This allows for a shorthand when
  * storing/reading data from a file.
- *
- * @param {string} data
- * @returns {Object}
  */
 export function parse(data) {
     if (!data.startsWith("{"))
@@ -16,9 +13,6 @@ export function parse(data) {
  * Converts given object to a string. If the string is a valid json5, it is
  * returned as is. If it is a valid json5 wrapped in {}, the curly brackets
  * are removed. Otherwise the string is wrapped in {}.
- *
- * @param {Object} data
- * @return {String}
  */
 export function stringify(data) {
     data = json5.stringify(data);

package/dist/esm/gen.d.ts

@@ -1,5 +1,8 @@
-import Id from "./types/Id";
+import Id from "./types/Id.js";
 /**
- * Generates a unique identifier based on specified parts.
+ * Generates a unique random identifier based on time and parts.
+ *
+ * @param {number[]} [parts] - an array of lengths of parts of the identifier
+ * @returns {Id} - a new unique identifier
  */
-export default function genId(parts?: number | number[], fill?: number): Id;
+export default function genId(parts?: number[]): Id;

package/dist/esm/gen.js

@@ -1,75 +1,134 @@
 const usedIdsMap = new Map();
+let lastId;
+const recentIdsTimestamps = [];
+let startIndex = 0;
+let lastGeneratedMs = 0;
+let lastRandomValue = 0;
 /**
- * Generates a unique identifier based on specified parts.
+ * Generates a unique random identifier based on time and parts.
+ *
+ * @param {number[]} [parts] - an array of lengths of parts of the identifier
+ * @returns {Id} - a new unique identifier
  */
-export default function genId(parts = null, fill = 1) {
-    parts = changeInputToPartsArray(parts, fill);
+export default function genId(parts = null) {
+    if (parts === null)
+        parts = [1, 1];
     const time = getTime();
-    const id = getUniqueRandom(time, parts);
+    const id = getUniqueRandom({
+        time,
+        partsSchema: parts,
+        s: 0,
+    });
     return id;
 }
 /**
  * Generates a unique random identifier based on time and parts.
- * @param time - The current time in a base36 string format.
- * @param parts - An array of parts to be used for generating the identifier.
- * @param s - Recursion counter for handling collision (default: 0).
- * @returns {string} The unique random identifier.
  */
-function getUniqueRandom(time, partsA, s = 0) {
-    const parts = partsA.map(l => getRandom(l));
-    const id = [time, ...parts].join("-");
-    if (usedIdsMap.has(id)) {
-        s++;
-        if (s < 25)
-            return getUniqueRandom(time, partsA, s);
-        partsA = addOneToPods(partsA);
-        time = getTime();
-        return getUniqueRandom(time, partsA);
+function getUniqueRandom(opts) {
+    while (true) {
+        let minValue = 0;
+        if (lastId) {
+            const parts = lastId.split("-");
+            const lastTime = parts.shift();
+            if (lastTime === opts.time) {
+                const int36 = parts.join("");
+                minValue = parseInt(int36, 36) + 1;
+            }
+        }
+        const partsLengthSum = opts.partsSchema.reduce((acc, num) => acc + num, 0);
+        const partsData = generateBase36InRange(minValue, partsLengthSum);
+        const parts = splitStringByArray(opts.partsSchema, partsData);
+        const id = [opts.time, ...parts].join("-");
+        if (!usedIdsMap.has(id)) {
+            usedIdsMap.set(id, true);
+            setTimeout(() => usedIdsMap.delete(id), 1000);
+            lastId = id;
+            return id;
+        }
+        opts.s++;
+        if (opts.s >= partsLengthSum) {
+            opts.time = getTime();
+            opts.s = 0;
+        }
     }
-    usedIdsMap.set(id, Date.now() + 2000);
-    usedIdsMap.forEach((value, key) => {
-        if (value < Date.now())
-            usedIdsMap.delete(key);
-    });
-    return id;
 }
 /**
- * Generates a random string of base36 characters.
+ * Tracks the current load of the application by counting the number of ids that have been generated in the last second.
+ * @returns The number of ids that have been generated in the last second.
  */
-function getRandom(unix) {
-    return (Math.floor(Math.random() * Math.pow(36, unix))).toString(36);
+function trackLoad() {
+    const now = Date.now();
+    recentIdsTimestamps.push(now);
+    while (startIndex < recentIdsTimestamps.length && recentIdsTimestamps[startIndex] < now - 1) {
+        startIndex++;
+    }
+    return recentIdsTimestamps.length - startIndex;
 }
 /**
- * Gets the current time in a base36 string format.
+ * Generates a base-36 encoded string with a specified length based on a random value within a range.
+ *
+ * The function calculates a random value within the base-36 range determined by the provided
+ * `minValue` and `length`. It uses a bias mechanism to adjust the randomness based on the
+ * current load, ensuring unique generation over short periods. If the system load is low or
+ * the current millisecond has changed, a new random value is generated. Otherwise, the random
+ * value is incremented by a small amount with certain probabilities.
+ *
+ * @param minValue - The minimum value for the base-36 encoded number.
+ * @param length - The length of the resulting base-36 string.
+ * @returns A base-36 encoded string representation of the random value, padded to the specified length.
  */
-function getTime() {
-    return Math.floor(new Date().getTime() / 1000).toString(36);
+function generateBase36InRange(minValue, length) {
+    const maxValue = Math.pow(36, length) - 1;
+    const load = trackLoad();
+    const currentMs = Date.now();
+    if (load < 3 || currentMs !== lastGeneratedMs) {
+        lastRandomValue = biasedRandomInRange(minValue, maxValue);
+        lastGeneratedMs = currentMs;
+    }
+    else {
+        const rand = Math.random();
+        if (rand < 0.6) {
+            lastRandomValue += 1;
+        }
+        else if (rand < 0.9) {
+            lastRandomValue += 2;
+        }
+        else {
+            lastRandomValue = biasedRandomInRange(lastRandomValue, maxValue);
+        }
+    }
+    return lastRandomValue.toString(36).padStart(length, "0");
 }
 /**
- * Adds one to each part of the input array.
+ * Generates a random number between the specified range, but with a bias towards the lower
+ * end of the range. The bias is calculated as the cube root of the random value, which
+ * will make the random value more likely to be closer to the minimum value.
+ * @param min - The minimum value of the range.
+ * @param max - The maximum value of the range.
+ * @returns A random number between the specified range, with a bias towards the lower end.
  */
-function addOneToPods(array) {
-    const sum = array.reduce((acc, current) => acc + current, 0);
-    const num = sum + 1;
-    const len = array.length;
-    const result = [];
-    const quotient = Math.floor(num / len);
-    const remainder = num % len;
-    for (let i = 0; i < len; i++) {
-        if (i < remainder)
-            result.push(quotient + 1);
-        else
-            result.push(quotient);
-    }
-    return result;
+function biasedRandomInRange(min, max) {
+    let randomValue = min;
+    const bias = Math.pow(Math.random(), 3);
+    randomValue = Math.floor(min + (max - min) * bias);
+    return Math.min(randomValue, max);
 }
 /**
- * Converts input to an array of parts.
+ * Splits a string into an array of substrings, where each substring is determined by
+ * the values in the provided array.
+ *
+ * @param arr - An array of numbers, where each number represents the length of a substring.
+ * @param str - The string to split.
+ * @returns An array of substrings, where each element is a substring of the original string,
+ *          determined by the corresponding element in the provided array.
  */
-function changeInputToPartsArray(parts = null, fill = 1) {
-    if (Array.isArray(parts))
-        return parts;
-    if (typeof parts == "number")
-        return Array(parts).fill(fill);
-    return [1, 1];
+function splitStringByArray(arr, str) {
+    let start = 0;
+    return arr.map(length => str.slice(start, start += length));
+}
+/**
+ * Gets the current time in a base36 string format.
+ */
+function getTime() {
+    return new Date().getTime().toString(36);
 }

package/dist/esm/relation.d.ts

@@ -4,61 +4,31 @@ import { DbFindOpts } from "./types/options.js";
 export interface Databases {
     [key: string]: DataBase;
 }
+interface RelationConfig {
+    from: string;
+    localField: string;
+    foreignField: string;
+    as?: string;
+    multiple?: boolean;
+}
 declare class Relation {
-    databases: Databases;
+    private databases;
     constructor(databases: Databases);
     /**
-    * Resolves the relation path in format 'dbName.collectionName'
-    */
-    _resolvePath(path: string): {
-        db: DataBase;
-        collection: string;
-    };
+     * Resolves the relation path in format 'dbName.collectionName'.
+     */
+    private _resolvePath;
     /**
-     * Processes relations for a single item
-     * @param {Object} item - Item to process relations for
-     * @param {Object} relations - Relations configuration
-     * @returns {Promise<Object>} Processed item with resolved relations
+     * Processes relations for a single item.
      */
-    _processItemRelations(item: Object, relations: Object): Promise<{
-        constructor: Function;
-        toString(): string;
-        toLocaleString(): string;
-        valueOf(): Object;
-        hasOwnProperty(v: PropertyKey): boolean;
-        isPrototypeOf(v: Object): boolean;
-        propertyIsEnumerable(v: PropertyKey): boolean;
-    }>;
+    private _processItemRelations;
     /**
-     * Finds items with relations
-     * @param path - Path in format 'dbName.collectionName'
-     * @param search - Search query or function
-     * @param relations - Relations configuration
-     * @param options - Search options
+     * Finds multiple items with relations.
      */
-    find(path: string, search: Search, relations?: {}, options?: DbFindOpts): Promise<{
-        constructor: Function;
-        toString(): string;
-        toLocaleString(): string;
-        valueOf(): Object;
-        hasOwnProperty(v: PropertyKey): boolean;
-        isPrototypeOf(v: Object): boolean;
-        propertyIsEnumerable(v: PropertyKey): boolean;
-    }[]>;
+    find(path: string, search: Search, relations?: Record<string, RelationConfig>, options?: DbFindOpts): Promise<Record<string, any>[]>;
     /**
-     * Finds one item with relations
-     * @param path - Path in format 'dbName.collectionName'
-     * @param search - Search query or function
-     * @param relations - Relations configuration
+     * Finds a single item with relations.
      */
-    findOne(path: string, search: Search, relations?: Object): Promise<{
-        constructor: Function;
-        toString(): string;
-        toLocaleString(): string;
-        valueOf(): Object;
-        hasOwnProperty(v: PropertyKey): boolean;
-        isPrototypeOf(v: Object): boolean;
-        propertyIsEnumerable(v: PropertyKey): boolean;
-    }>;
+    findOne(path: string, search: Search, relations?: Record<string, RelationConfig>): Promise<Record<string, any> | null>;
 }
 export default Relation;