inibase 1.0.0-rc.17 → 1.0.0-rc.19

package/dist/file.js

@@ -1,4 +1,4 @@
-import { open, stat, writeFile } from "node:fs/promises";
+import { open, rename, stat, writeFile } from "node:fs/promises";
 import { createInterface } from "node:readline";
 import { detectFieldType, isArrayOfArrays, isNumber } from "./utils.js";
 import { encodeID, comparePassword } from "./utils.server.js";
@@ -51,7 +51,7 @@ export const encode = (input, secretKey) => {
         ? joinMultidimensionalArray(secureArray(input))
         : secureString(input);
 };
-const unSecureString = (input) => decodeURIComponent(input)
+const unSecureString = (input) => input
     .replaceAll("&lt;", "<")
     .replaceAll("&gt;", ">")
     .replaceAll("%2C", ",")
@@ -93,11 +93,11 @@ const decodeHelper = (value, fieldType, fieldChildrenType, secretKey) => {
             if (!Array.isArray(value))
                 return [value];
             if (fieldChildrenType)
-                return value.map((v) => decode(v, Array.isArray(fieldChildrenType)
-                    ? detectFieldType(v, fieldChildrenType)
-                    : fieldChildrenType, undefined, secretKey));
-            else
-                return value;
+                return fieldChildrenType
+                    ? value.map((v) => decode(v, Array.isArray(fieldChildrenType)
+                        ? detectFieldType(v, fieldChildrenType)
+                        : fieldChildrenType, undefined, secretKey))
+                    : value;
         case "id":
             return isNumber(value) ? encodeID(value, secretKey) : value;
         default:
@@ -119,9 +119,9 @@ export const decode = (input, fieldType, fieldChildrenType, secretKey) => {
 };
 export const get = async (filePath, lineNumbers, fieldType, fieldChildrenType, secretKey) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let lines = new Map(), lineCount = 0;
@@ -154,12 +154,12 @@ export const get = async (filePath, lineNumbers, fieldType, fieldChildrenType, s
 };
 export const replace = async (filePath, replacements) => {
     if (await isExists(filePath)) {
-        const fileHandle = await open(filePath, "r+"), rl = doesSupportReadLines()
+        const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
             ? fileHandle.readLines({ autoClose: false })
             : createInterface({
                 input: fileHandle.createReadStream({ autoClose: false }),
                 crlfDelay: Infinity,
-            }), writeStream = fileHandle.createWriteStream();
+            }), fileTempPath = `${filePath.replace(".inib", "")}-${Date.now()}.tmp`, fileTempHandle = await open(fileTempPath, "w+"), writeStream = fileTempHandle.createWriteStream({ autoClose: false });
         if (typeof replacements === "object" && !Array.isArray(replacements)) {
             if (!(replacements instanceof Map))
                 replacements = new Map(Object.entries(replacements));
@@ -181,7 +181,10 @@ export const replace = async (filePath, replacements) => {
         else
             for await (const _line of rl)
                 writeStream.write(replacements + "\n");
-        writeStream.end(async () => await fileHandle.close());
+        // writeStream.end(async () => await rename(fileTempPath, filePath));
+        await fileHandle.close();
+        await fileTempHandle.close();
+        await rename(fileTempPath, filePath);
     }
     else if (typeof replacements === "object" && !Array.isArray(replacements)) {
         if (!(replacements instanceof Map))
@@ -195,7 +198,7 @@ export const replace = async (filePath, replacements) => {
 };
 export const append = async (filePath, data, startsAt = 1) => {
     const doesFileExists = await isExists(filePath);
-    const fileHandle = await open(filePath, "a"), writeStream = fileHandle.createWriteStream();
+    const fileHandle = await open(filePath, "a"), writeStream = fileHandle.createWriteStream({ autoClose: false });
     if (doesFileExists) {
         const currentNumberOfLines = await count(filePath);
         if (startsAt - currentNumberOfLines - 1 > 0)
@@ -221,25 +224,28 @@ export const append = async (filePath, data, startsAt = 1) => {
 };
 export const remove = async (filePath, linesToDelete) => {
     let lineCount = 0;
-    const linesToDeleteArray = new Set(Array.isArray(linesToDelete) ? linesToDelete : [linesToDelete]), fileHandle = await open(filePath, "r+"), rl = doesSupportReadLines()
+    const linesToDeleteArray = new Set(Array.isArray(linesToDelete) ? linesToDelete : [linesToDelete]), fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
         ? fileHandle.readLines({ autoClose: false })
         : createInterface({
             input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
-        }), writeStream = fileHandle.createWriteStream();
+        }), fileTempPath = `${filePath.replace(".inib", "")}-${Date.now()}.tmp`, fileTempHandle = await open(fileTempPath, "w+"), writeStream = fileTempHandle.createWriteStream({ autoClose: false });
     for await (const line of rl) {
         lineCount++;
         if (!linesToDeleteArray.has(lineCount))
             writeStream.write(`${line}\n`);
     }
-    writeStream.end(async () => await fileHandle.close()); // Rename the temp file to the original file name
+    // writeStream.end(async () => await rename(fileTempPath, filePath));
+    await fileHandle.close();
+    await fileTempHandle.close();
+    await rename(fileTempPath, filePath);
 };
 export const count = async (filePath) => {
     let lineCount = 0;
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     for await (const line of rl)
@@ -301,9 +307,9 @@ const handleComparisonOperator = (operator, originalValue, comparedAtValue, fiel
 export const search = async (filePath, operator, comparedAtValue, logicalOperator, fieldType, fieldChildrenType, limit, offset, readWholeFile, secretKey) => {
     let RETURN = new Map(), lineCount = 0, foundItems = 0;
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     for await (const line of rl) {
@@ -335,9 +341,9 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
 };
 export const sum = async (filePath, lineNumbers) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let sum = 0;
@@ -357,14 +363,13 @@ export const sum = async (filePath, lineNumbers) => {
     else
         for await (const line of rl)
             sum += +decode(line, "number");
-    await fileHandle.close();
     return sum;
 };
 export const max = async (filePath, lineNumbers) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let max = 0;
@@ -389,14 +394,13 @@ export const max = async (filePath, lineNumbers) => {
             if (lineContentNum > max)
                 max = lineContentNum;
         }
-    await fileHandle.close();
     return max;
 };
 export const min = async (filePath, lineNumbers) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let min = 0;
@@ -421,21 +425,18 @@ export const min = async (filePath, lineNumbers) => {
             if (lineContentNum < min)
                 min = lineContentNum;
         }
-    await fileHandle.close();
     return min;
 };
 export const sort = async (filePath, sortDirection, lineNumbers, _lineNumbersPerChunk = 100000) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let lineCount = 0;
-    for await (const line of rl) {
+    for await (const line of rl)
         lineCount++;
-    }
-    await fileHandle.close();
 };
 export default class File {
     static get = get;

package/dist/index.d.ts

@@ -2,8 +2,8 @@
 export interface Data {
     id?: number | string;
     [key: string]: any;
-    createdAt?: Date;
-    updatedAt?: Date;
+    createdAt?: number;
+    updatedAt?: number;
 }
 export type FieldType = "string" | "number" | "boolean" | "date" | "email" | "url" | "table" | "object" | "array" | "password" | "html" | "ip" | "id";
 type FieldDefault = {
@@ -73,10 +73,17 @@ export default class Inibase {
     formatData<dataType extends Data | Data[]>(data: dataType, schema: Schema, formatOnlyAvailiableKeys?: boolean): dataType extends Data ? Data : Data[];
     private getDefaultValue;
     private joinPathesContents;
+    private getItemsFromSchema;
+    private FormatObjectCriteriaValue;
+    private applyCriteria;
     get(tableName: string, where?: string | number | (string | number)[] | Criteria | undefined, options?: Options | undefined, onlyOne?: true, onlyLinesNumbers?: undefined): Promise<Data | null>;
     get(tableName: string, where?: string | number | (string | number)[] | Criteria | undefined, options?: Options | undefined, onlyOne?: boolean | undefined, onlyLinesNumbers?: true): Promise<number[] | null>;
-    post<DataType extends Data | Data[]>(tableName: string, data: DataType, options?: Options, returnPostedData?: boolean): Promise<DataType extends Data ? Data | null | void : Data[] | null | void>;
-    put<returnPostedDataType extends boolean = true>(tableName: string, data: Data | Data[], where?: number | string | (number | string)[] | Criteria, options?: Options, returnPostedData?: returnPostedDataType): Promise<(returnPostedDataType extends true ? Data | Data[] : void) | null>;
+    post(tableName: string, data: Data | Data[], options: Options | undefined, returnPostedData?: false): Promise<void | null>;
+    post(tableName: string, data: Data, options: Options | undefined, returnPostedData: true): Promise<Data | null>;
+    post(tableName: string, data: Data[], options: Options | undefined, returnPostedData: true): Promise<Data[] | null>;
+    put(tableName: string, data: Data | Data[], where?: number | string | (number | string)[] | Criteria | undefined, options?: Options | undefined, returnPostedData?: false): Promise<void | null>;
+    put(tableName: string, data: Data, where: number | string | (number | string)[] | Criteria | undefined, options: Options | undefined, returnPostedData: true): Promise<Data | null>;
+    put(tableName: string, data: Data[], where: number | string | (number | string)[] | Criteria | undefined, options: Options | undefined, returnPostedData: true): Promise<Data[] | null>;
     delete(tableName: string, where?: number | string | (number | string)[] | Criteria, _id?: string | string[]): Promise<string | string[] | null>;
     sum(tableName: string, columns: string, where?: number | string | (number | string)[] | Criteria): Promise<number>;
     sum(tableName: string, columns: string[], where?: number | string | (number | string)[] | Criteria): Promise<Record<string, number>>;

package/dist/index.js

@@ -291,6 +291,304 @@ export default class Inibase {
                 File.encode(value, this.salt),
             ]));
     }
+    async getItemsFromSchema(tableName, schema, linesNumber, options, prefix) {
+        const path = join(this.folder, this.database, tableName);
+        let RETURN = {};
+        for (const field of schema) {
+            if ((field.type === "array" ||
+                (Array.isArray(field.type) &&
+                    field.type.includes("array"))) &&
+                field.children) {
+                if (Utils.isArrayOfObjects(field.children)) {
+                    if (field.children.filter((children) => children.type === "array" &&
+                        Utils.isArrayOfObjects(children.children)).length) {
+                        // one of children has array field type and has children array of object = Schema
+                        Object.entries((await this.getItemsFromSchema(tableName, field.children.filter((children) => children.type === "array" &&
+                            Utils.isArrayOfObjects(children.children)), linesNumber, options, (prefix ?? "") + field.key + ".")) ?? {}).forEach(([index, item]) => {
+                            if (Utils.isObject(item)) {
+                                if (!RETURN[index])
+                                    RETURN[index] = {};
+                                if (!RETURN[index][field.key])
+                                    RETURN[index][field.key] = [];
+                                for (const child_field of field.children.filter((children) => children.type === "array" &&
+                                    Utils.isArrayOfObjects(children.children))) {
+                                    if (Utils.isObject(item[child_field.key])) {
+                                        Object.entries(item[child_field.key]).forEach(([key, value]) => {
+                                            if (!Utils.isArrayOfArrays(value))
+                                                value = value.map((_value) => child_field.type === "array" ? [[_value]] : [_value]);
+                                            for (let _i = 0; _i < value.length; _i++) {
+                                                if (Utils.isArrayOfNulls(value[_i]))
+                                                    continue;
+                                                if (!RETURN[index][field.key][_i])
+                                                    RETURN[index][field.key][_i] = {};
+                                                if (!RETURN[index][field.key][_i][child_field.key])
+                                                    RETURN[index][field.key][_i][child_field.key] = [];
+                                                value[_i].forEach((_element, _index) => {
+                                                    if (!RETURN[index][field.key][_i][child_field.key][_index])
+                                                        RETURN[index][field.key][_i][child_field.key][_index] = {};
+                                                    RETURN[index][field.key][_i][child_field.key][_index][key] = _element;
+                                                });
+                                            }
+                                        });
+                                    }
+                                }
+                            }
+                        });
+                        field.children = field.children.filter((children) => children.type !== "array" ||
+                            !Utils.isArrayOfObjects(children.children));
+                    }
+                    Object.entries((await this.getItemsFromSchema(tableName, field.children, linesNumber, options, (prefix ?? "") + field.key + ".")) ?? {}).forEach(([index, item]) => {
+                        if (!RETURN[index])
+                            RETURN[index] = {};
+                        if (Utils.isObject(item)) {
+                            if (!Object.values(item).every((i) => i === null)) {
+                                if (RETURN[index][field.key]) {
+                                    Object.entries(item).forEach(([key, value], _index) => {
+                                        RETURN[index][field.key] = RETURN[index][field.key].map((_obj, _i) => ({
+                                            ..._obj,
+                                            [key]: value[_i],
+                                        }));
+                                    });
+                                }
+                                else if (Object.values(item).every((_i) => Utils.isArrayOfArrays(_i) || Array.isArray(_i)))
+                                    RETURN[index][field.key] = item;
+                                else {
+                                    RETURN[index][field.key] = [];
+                                    Object.entries(item).forEach(([key, value]) => {
+                                        for (let _i = 0; _i < value.length; _i++) {
+                                            if (value[_i] === null ||
+                                                (Array.isArray(value[_i]) &&
+                                                    value[_i].every((_item) => _item === null)))
+                                                continue;
+                                            if (!RETURN[index][field.key][_i])
+                                                RETURN[index][field.key][_i] = {};
+                                            RETURN[index][field.key][_i][key] = value[_i];
+                                        }
+                                    });
+                                }
+                            }
+                            else
+                                RETURN[index][field.key] = null;
+                        }
+                        else
+                            RETURN[index][field.key] = item;
+                    });
+                }
+                else if (field.children === "table" ||
+                    (Array.isArray(field.children) && field.children.includes("table"))) {
+                    if (options.columns)
+                        options.columns = options.columns
+                            .filter((column) => column.includes(`${field.key}.`))
+                            .map((column) => column.replace(`${field.key}.`, ""));
+                    const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field.children, this.salt);
+                    this.totalItems[tableName + "-" + field.key] = total_lines;
+                    for (const [index, item] of Object.entries(items)) {
+                        if (!RETURN[index])
+                            RETURN[index] = {};
+                        RETURN[index][field.key] = item
+                            ? await this.get(field.key, item, options)
+                            : this.getDefaultValue(field);
+                    }
+                }
+                else if (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))) {
+                    const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
+                    this.totalItems[tableName + "-" + field.key] = total_lines;
+                    for (const [index, item] of Object.entries(items)) {
+                        if (!RETURN[index])
+                            RETURN[index] = {};
+                        RETURN[index][field.key] = item ?? this.getDefaultValue(field);
+                    }
+                }
+            }
+            else if (field.type === "object") {
+                for (const [index, item] of Object.entries((await this.getItemsFromSchema(tableName, field.children, linesNumber, options, (prefix ?? "") + field.key + ".")) ?? {})) {
+                    if (!RETURN[index])
+                        RETURN[index] = {};
+                    if (Utils.isObject(item)) {
+                        if (!Object.values(item).every((i) => i === null))
+                            RETURN[index][field.key] = item;
+                        else
+                            RETURN[index][field.key] = null;
+                    }
+                    else
+                        RETURN[index][field.key] = null;
+                }
+            }
+            else if (field.type === "table") {
+                if ((await File.isExists(join(this.folder, this.database, field.key))) &&
+                    (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib")))) {
+                    if (options.columns)
+                        options.columns = options.columns
+                            .filter((column) => column.includes(`${field.key}.`) &&
+                            !column.includes(`${field.key}.`))
+                            .map((column) => column.replace(`${field.key}.`, ""));
+                    const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, "number", undefined, this.salt);
+                    this.totalItems[tableName + "-" + field.key] = total_lines;
+                    for (const [index, item] of Object.entries(items)) {
+                        if (!RETURN[index])
+                            RETURN[index] = {};
+                        RETURN[index][field.key] = item
+                            ? await this.get(field.key, item, options)
+                            : this.getDefaultValue(field);
+                    }
+                }
+            }
+            else if (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))) {
+                const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
+                this.totalItems[tableName + "-" + field.key] = total_lines;
+                for (const [index, item] of Object.entries(items)) {
+                    if (!RETURN[index])
+                        RETURN[index] = {};
+                    RETURN[index][field.key] = item ?? this.getDefaultValue(field);
+                }
+            }
+        }
+        return RETURN;
+    }
+    FormatObjectCriteriaValue(value, isParentArray = false) {
+        switch (value[0]) {
+            case ">":
+            case "<":
+            case "[":
+                return ["=", "]", "*"].includes(value[1])
+                    ? [
+                        value.slice(0, 2),
+                        value.slice(2),
+                    ]
+                    : [
+                        value.slice(0, 1),
+                        value.slice(1),
+                    ];
+            case "!":
+                return ["=", "*"].includes(value[1])
+                    ? [
+                        value.slice(0, 2),
+                        value.slice(2),
+                    ]
+                    : value[1] === "["
+                        ? [
+                            value.slice(0, 3),
+                            value.slice(3),
+                        ]
+                        : [
+                            (value.slice(0, 1) + "="),
+                            value.slice(1),
+                        ];
+            case "=":
+                return isParentArray
+                    ? [
+                        value.slice(0, 1),
+                        value.slice(1),
+                    ]
+                    : [
+                        value.slice(0, 1),
+                        (value.slice(1) + ","),
+                    ];
+            case "*":
+                return [
+                    value.slice(0, 1),
+                    value.slice(1),
+                ];
+            default:
+                return ["=", value];
+        }
+    }
+    async applyCriteria(tableName, schema, options, criteria, allTrue) {
+        let RETURN = {};
+        if (!criteria)
+            return null;
+        if (criteria.and && Utils.isObject(criteria.and)) {
+            const searchResult = await this.applyCriteria(tableName, schema, options, criteria.and, true);
+            if (searchResult) {
+                RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).length === Object.keys(criteria.and ?? {}).length)));
+                delete criteria.and;
+            }
+            else
+                return null;
+        }
+        if (criteria.or && Utils.isObject(criteria.or)) {
+            const searchResult = await this.applyCriteria(tableName, schema, options, criteria.or, false);
+            delete criteria.or;
+            if (searchResult)
+                RETURN = Utils.deepMerge(RETURN, searchResult);
+        }
+        if (Object.keys(criteria).length > 0) {
+            if (allTrue === undefined)
+                allTrue = true;
+            let index = -1;
+            for (const [key, value] of Object.entries(criteria)) {
+                const field = this.getField(key, schema);
+                index++;
+                let searchOperator = undefined, searchComparedAtValue = undefined, searchLogicalOperator = undefined;
+                if (Utils.isObject(value)) {
+                    if (value?.or &&
+                        Array.isArray(value.or)) {
+                        const searchCriteria = value.or
+                            .map((single_or) => typeof single_or === "string"
+                            ? this.FormatObjectCriteriaValue(single_or)
+                            : ["=", single_or])
+                            .filter((a) => a);
+                        if (searchCriteria.length > 0) {
+                            searchOperator = searchCriteria.map((single_or) => single_or[0]);
+                            searchComparedAtValue = searchCriteria.map((single_or) => single_or[1]);
+                            searchLogicalOperator = "or";
+                        }
+                        delete value.or;
+                    }
+                    if (value?.and &&
+                        Array.isArray(value.and)) {
+                        const searchCriteria = value.and
+                            .map((single_and) => typeof single_and === "string"
+                            ? this.FormatObjectCriteriaValue(single_and)
+                            : ["=", single_and])
+                            .filter((a) => a);
+                        if (searchCriteria.length > 0) {
+                            searchOperator = searchCriteria.map((single_and) => single_and[0]);
+                            searchComparedAtValue = searchCriteria.map((single_and) => single_and[1]);
+                            searchLogicalOperator = "and";
+                        }
+                        delete value.and;
+                    }
+                }
+                else if (Array.isArray(value)) {
+                    const searchCriteria = value
+                        .map((single) => typeof single === "string"
+                        ? this.FormatObjectCriteriaValue(single)
+                        : ["=", single])
+                        .filter((a) => a);
+                    if (searchCriteria.length > 0) {
+                        searchOperator = searchCriteria.map((single) => single[0]);
+                        searchComparedAtValue = searchCriteria.map((single) => single[1]);
+                        searchLogicalOperator = "and";
+                    }
+                }
+                else if (typeof value === "string") {
+                    const ComparisonOperatorValue = this.FormatObjectCriteriaValue(value);
+                    if (ComparisonOperatorValue) {
+                        searchOperator = ComparisonOperatorValue[0];
+                        searchComparedAtValue = ComparisonOperatorValue[1];
+                    }
+                }
+                else {
+                    searchOperator = "=";
+                    searchComparedAtValue = value;
+                }
+                const [searchResult, total_lines] = await File.search(join(this.folder, this.database, tableName, key + ".inib"), searchOperator, searchComparedAtValue, searchLogicalOperator, field?.type, field?.children, options.per_page, options.page - 1 * options.per_page + 1, true, this.salt);
+                if (searchResult) {
+                    RETURN = Utils.deepMerge(RETURN, searchResult);
+                    this.totalItems[tableName + "-" + key] = total_lines;
+                }
+                if (allTrue && index > 0) {
+                    if (!Object.keys(RETURN).length)
+                        RETURN = {};
+                    RETURN = Object.fromEntries(Object.entries(RETURN).filter(([_index, item]) => Object.keys(item).length > index));
+                    if (!Object.keys(RETURN).length)
+                        RETURN = {};
+                }
+            }
+        }
+        return Object.keys(RETURN).length ? RETURN : null;
+    }
     async get(tableName, where, options = {
         page: 1,
         per_page: 15,
@@ -333,166 +631,11 @@ export default class Inibase {
             .filter((i) => i);
         if (options.columns.length)
             schema = filterSchemaByColumns(schema, options.columns);
-        const getItemsFromSchema = async (path, schema, linesNumber, prefix) => {
-            let RETURN = {};
-            for (const field of schema) {
-                if ((field.type === "array" ||
-                    (Array.isArray(field.type) &&
-                        field.type.includes("array"))) &&
-                    field
-                        .children) {
-                    if (Utils.isArrayOfObjects(field
-                        .children)) {
-                        if (field
-                            .children.filter((children) => children.type === "array" &&
-                            Utils.isArrayOfObjects(children.children)).length) {
-                            // one of children has array field type and has children array of object = Schema
-                            Object.entries((await getItemsFromSchema(path, field.children.filter((children) => children.type === "array" &&
-                                Utils.isArrayOfObjects(children.children)), linesNumber, (prefix ?? "") + field.key + ".")) ?? {}).forEach(([index, item]) => {
-                                if (Utils.isObject(item)) {
-                                    if (!RETURN[index])
-                                        RETURN[index] = {};
-                                    if (!RETURN[index][field.key])
-                                        RETURN[index][field.key] = [];
-                                    for (const child_field of field.children.filter((children) => children.type === "array" &&
-                                        Utils.isArrayOfObjects(children.children))) {
-                                        if (Utils.isObject(item[child_field.key])) {
-                                            Object.entries(item[child_field.key]).forEach(([key, value]) => {
-                                                for (let _i = 0; _i < value.length; _i++) {
-                                                    if (!RETURN[index][field.key][_i])
-                                                        RETURN[index][field.key][_i] = {};
-                                                    if (!RETURN[index][field.key][_i][child_field.key])
-                                                        RETURN[index][field.key][_i][child_field.key] =
-                                                            [];
-                                                    value[_i].forEach((_element, _index) => {
-                                                        if (!RETURN[index][field.key][_i][child_field.key][_index])
-                                                            RETURN[index][field.key][_i][child_field.key][_index] = {};
-                                                        RETURN[index][field.key][_i][child_field.key][_index][key] = _element;
-                                                    });
-                                                }
-                                            });
-                                        }
-                                    }
-                                }
-                            });
-                            field.children = field
-                                .children.filter((children) => children.type !== "array" ||
-                                !Utils.isArrayOfObjects(children.children));
-                        }
-                        Object.entries((await getItemsFromSchema(path, field
-                            .children, linesNumber, (prefix ?? "") + field.key + ".")) ?? {}).forEach(([index, item]) => {
-                            if (!RETURN[index])
-                                RETURN[index] = {};
-                            if (Utils.isObject(item)) {
-                                if (!Object.values(item).every((i) => i === null)) {
-                                    if (RETURN[index][field.key])
-                                        Object.entries(item).forEach(([key, value], _index) => {
-                                            RETURN[index][field.key] = RETURN[index][field.key].map((_obj, _i) => ({
-                                                ..._obj,
-                                                [key]: value[_i],
-                                            }));
-                                        });
-                                    else if (Object.values(item).every(Utils.isArrayOfArrays))
-                                        RETURN[index][field.key] = item;
-                                    else {
-                                        RETURN[index][field.key] = [];
-                                        Object.entries(item).forEach(([key, value]) => {
-                                            for (let _i = 0; _i < value.length; _i++) {
-                                                if (!RETURN[index][field.key][_i])
-                                                    RETURN[index][field.key][_i] = {};
-                                                RETURN[index][field.key][_i][key] = value[_i];
-                                            }
-                                        });
-                                    }
-                                }
-                                else
-                                    RETURN[index][field.key] = null;
-                            }
-                            else
-                                RETURN[index][field.key] = item;
-                        });
-                    }
-                    else if (field
-                        .children === "table" ||
-                        (Array.isArray(field
-                            .children) &&
-                            field
-                                .children.includes("table"))) {
-                        if (options.columns)
-                            options.columns = options.columns
-                                .filter((column) => column.includes(`${field.key}.`))
-                                .map((column) => column.replace(`${field.key}.`, ""));
-                        const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field
-                            .children, this.salt);
-                        this.totalItems[tableName + "-" + field.key] = total_lines;
-                        for (const [index, item] of Object.entries(items)) {
-                            if (!RETURN[index])
-                                RETURN[index] = {};
-                            RETURN[index][field.key] = item
-                                ? await this.get(field.key, item, options)
-                                : this.getDefaultValue(field);
-                        }
-                    }
-                    else if (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))) {
-                        const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
-                        this.totalItems[tableName + "-" + field.key] = total_lines;
-                        for (const [index, item] of Object.entries(items)) {
-                            if (!RETURN[index])
-                                RETURN[index] = {};
-                            RETURN[index][field.key] = item ?? this.getDefaultValue(field);
-                        }
-                    }
-                }
-                else if (field.type === "object") {
-                    for (const [index, item] of Object.entries((await getItemsFromSchema(path, field.children, linesNumber, (prefix ?? "") + field.key + ".")) ?? {})) {
-                        if (!RETURN[index])
-                            RETURN[index] = {};
-                        if (Utils.isObject(item)) {
-                            if (!Object.values(item).every((i) => i === null))
-                                RETURN[index][field.key] = item;
-                            else
-                                RETURN[index][field.key] = null;
-                        }
-                        else
-                            RETURN[index][field.key] = null;
-                    }
-                }
-                else if (field.type === "table") {
-                    if ((await File.isExists(join(this.folder, this.database, field.key))) &&
-                        (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib")))) {
-                        if (options.columns)
-                            options.columns = options.columns
-                                .filter((column) => column.includes(`${field.key}.`) &&
-                                !column.includes(`${field.key}.`))
-                                .map((column) => column.replace(`${field.key}.`, ""));
-                        const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, "number", undefined, this.salt);
-                        this.totalItems[tableName + "-" + field.key] = total_lines;
-                        for (const [index, item] of Object.entries(items)) {
-                            if (!RETURN[index])
-                                RETURN[index] = {};
-                            RETURN[index][field.key] = item
-                                ? await this.get(field.key, item, options)
-                                : this.getDefaultValue(field);
-                        }
-                    }
-                }
-                else if (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))) {
-                    const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
-                    this.totalItems[tableName + "-" + field.key] = total_lines;
-                    for (const [index, item] of Object.entries(items)) {
-                        if (!RETURN[index])
-                            RETURN[index] = {};
-                        RETURN[index][field.key] = item ?? this.getDefaultValue(field);
-                    }
-                }
-            }
-            return RETURN;
-        };
         if (!where) {
             // Display all data
-            RETURN = Object.values(await getItemsFromSchema(join(this.folder, this.database, tableName), schema, Array.from({ length: options.per_page }, (_, index) => (options.page - 1) * options.per_page +
+            RETURN = Object.values(await this.getItemsFromSchema(tableName, schema, Array.from({ length: options.per_page }, (_, index) => (options.page - 1) * options.per_page +
                 index +
-                1)));
+                1), options));
         }
         else if ((Array.isArray(where) &&
             (where.every(Utils.isValidID) || where.every(Utils.isNumber))) ||
@@ -505,164 +648,21 @@ export default class Inibase {
             if (!lineNumbers)
                 throw this.throwError("INVALID_ID", where);
             if (onlyLinesNumbers)
-                return Object.keys(lineNumbers).map(Number);
-            RETURN = Object.values((await getItemsFromSchema(join(this.folder, this.database, tableName), schema, Object.keys(lineNumbers).map(Number))) ?? {});
+                return Object.keys(lineNumbers).length
+                    ? Object.keys(lineNumbers).map(Number)
+                    : null;
+            RETURN = Object.values((await this.getItemsFromSchema(tableName, schema, Object.keys(lineNumbers).map(Number), options)) ?? {});
             if (RETURN.length && !Array.isArray(where))
                 RETURN = RETURN[0];
         }
         else if (Utils.isObject(where)) {
             // Criteria
-            const FormatObjectCriteriaValue = (value, isParentArray = false) => {
-                switch (value[0]) {
-                    case ">":
-                    case "<":
-                    case "[":
-                        return ["=", "]", "*"].includes(value[1])
-                            ? [
-                                value.slice(0, 2),
-                                value.slice(2),
-                            ]
-                            : [
-                                value.slice(0, 1),
-                                value.slice(1),
-                            ];
-                    case "!":
-                        return ["=", "*"].includes(value[1])
-                            ? [
-                                value.slice(0, 2),
-                                value.slice(2),
-                            ]
-                            : value[1] === "["
-                                ? [
-                                    value.slice(0, 3),
-                                    value.slice(3),
-                                ]
-                                : [
-                                    (value.slice(0, 1) + "="),
-                                    value.slice(1),
-                                ];
-                    case "=":
-                        return isParentArray
-                            ? [
-                                value.slice(0, 1),
-                                value.slice(1),
-                            ]
-                            : [
-                                value.slice(0, 1),
-                                (value.slice(1) + ","),
-                            ];
-                    case "*":
-                        return [
-                            value.slice(0, 1),
-                            value.slice(1),
-                        ];
-                    default:
-                        return ["=", value];
-                }
-            };
-            const applyCriteria = async (criteria, allTrue) => {
-                let RETURN = {};
-                if (!criteria)
-                    return null;
-                if (criteria.and && Utils.isObject(criteria.and)) {
-                    const searchResult = await applyCriteria(criteria.and, true);
-                    if (searchResult) {
-                        RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).length ===
-                            Object.keys(criteria.and ?? {}).length)));
-                        delete criteria.and;
-                    }
-                    else
-                        return null;
-                }
-                if (criteria.or && Utils.isObject(criteria.or)) {
-                    const searchResult = await applyCriteria(criteria.or, false);
-                    delete criteria.or;
-                    if (searchResult)
-                        RETURN = Utils.deepMerge(RETURN, searchResult);
-                }
-                if (Object.keys(criteria).length > 0) {
-                    if (allTrue === undefined)
-                        allTrue = true;
-                    let index = -1;
-                    for (const [key, value] of Object.entries(criteria)) {
-                        const field = this.getField(key, schema);
-                        index++;
-                        let searchOperator = undefined, searchComparedAtValue = undefined, searchLogicalOperator = undefined;
-                        if (Utils.isObject(value)) {
-                            if (value?.or &&
-                                Array.isArray(value.or)) {
-                                const searchCriteria = value.or
-                                    .map((single_or) => typeof single_or === "string"
-                                    ? FormatObjectCriteriaValue(single_or)
-                                    : ["=", single_or])
-                                    .filter((a) => a);
-                                if (searchCriteria.length > 0) {
-                                    searchOperator = searchCriteria.map((single_or) => single_or[0]);
-                                    searchComparedAtValue = searchCriteria.map((single_or) => single_or[1]);
-                                    searchLogicalOperator = "or";
-                                }
-                                delete value.or;
-                            }
-                            if (value?.and &&
-                                Array.isArray(value.and)) {
-                                const searchCriteria = value.and
-                                    .map((single_and) => typeof single_and === "string"
-                                    ? FormatObjectCriteriaValue(single_and)
-                                    : ["=", single_and])
-                                    .filter((a) => a);
-                                if (searchCriteria.length > 0) {
-                                    searchOperator = searchCriteria.map((single_and) => single_and[0]);
-                                    searchComparedAtValue = searchCriteria.map((single_and) => single_and[1]);
-                                    searchLogicalOperator = "and";
-                                }
-                                delete value.and;
-                            }
-                        }
-                        else if (Array.isArray(value)) {
-                            const searchCriteria = value
-                                .map((single) => typeof single === "string"
-                                ? FormatObjectCriteriaValue(single)
-                                : ["=", single])
-                                .filter((a) => a);
-                            if (searchCriteria.length > 0) {
-                                searchOperator = searchCriteria.map((single) => single[0]);
-                                searchComparedAtValue = searchCriteria.map((single) => single[1]);
-                                searchLogicalOperator = "and";
-                            }
-                        }
-                        else if (typeof value === "string") {
-                            const ComparisonOperatorValue = FormatObjectCriteriaValue(value);
-                            if (ComparisonOperatorValue) {
-                                searchOperator = ComparisonOperatorValue[0];
-                                searchComparedAtValue = ComparisonOperatorValue[1];
-                            }
-                        }
-                        else {
-                            searchOperator = "=";
-                            searchComparedAtValue = value;
-                        }
-                        const [searchResult, total_lines] = await File.search(join(this.folder, this.database, tableName, key + ".inib"), searchOperator, searchComparedAtValue, searchLogicalOperator, field?.type, field?.children, options.per_page, options.page - 1 * options.per_page + 1, true, this.salt);
-                        if (searchResult) {
-                            RETURN = Utils.deepMerge(RETURN, searchResult);
-                            this.totalItems[tableName + "-" + key] = total_lines;
-                        }
-                        if (allTrue && index > 0) {
-                            if (!Object.keys(RETURN).length)
-                                RETURN = {};
-                            RETURN = Object.fromEntries(Object.entries(RETURN).filter(([_index, item]) => Object.keys(item).length > index));
-                            if (!Object.keys(RETURN).length)
-                                RETURN = {};
-                        }
-                    }
-                }
-                return Object.keys(RETURN).length ? RETURN : null;
-            };
-            RETURN = await applyCriteria(where);
+            RETURN = await this.applyCriteria(tableName, schema, options, where);
             if (RETURN) {
                 if (onlyLinesNumbers)
                     return Object.keys(RETURN).map(Number);
                 const alreadyExistsColumns = Object.keys(Object.values(RETURN)[0]).map((key) => parse(key).name);
-                RETURN = Object.values(Utils.deepMerge(RETURN, await getItemsFromSchema(join(this.folder, this.database, tableName), schema.filter((field) => !alreadyExistsColumns.includes(field.key)), Object.keys(RETURN).map(Number))));
+                RETURN = Object.values(Utils.deepMerge(RETURN, await this.getItemsFromSchema(tableName, schema.filter((field) => !alreadyExistsColumns.includes(field.key)), Object.keys(RETURN).map(Number), options)));
             }
         }
         if (!RETURN ||
@@ -695,13 +695,13 @@ export default class Inibase {
             RETURN = data.map(({ id, updatedAt, createdAt, ...rest }) => ({
                 id: ++last_id,
                 ...rest,
-                createdAt: new Date(),
+                createdAt: new Date().getTime(),
             }));
         else
             RETURN = (({ id, updatedAt, createdAt, ...rest }) => ({
                 id: ++last_id,
                 ...rest,
-                createdAt: new Date(),
+                createdAt: new Date().getTime(),
             }))(data);
         if (!RETURN)
             throw this.throwError("NO_DATA");
@@ -742,11 +742,11 @@ export default class Inibase {
                 const pathesContents = this.joinPathesContents(join(this.folder, this.database, tableName), Utils.isArrayOfObjects(data)
                     ? data.map((item) => ({
                         ...(({ id, ...restOfData }) => restOfData)(item),
-                        updatedAt: new Date(),
+                        updatedAt: new Date().getTime(),
                     }))
                     : {
                         ...(({ id, ...restOfData }) => restOfData)(data),
-                        updatedAt: new Date(),
+                        updatedAt: new Date().getTime(),
                     });
                 for await (const [path, content] of Object.entries(pathesContents))
                     await File.replace(path, content);
@@ -769,9 +769,9 @@ export default class Inibase {
                 const pathesContents = Object.fromEntries(Object.entries(this.joinPathesContents(join(this.folder, this.database, tableName), Utils.isArrayOfObjects(data)
                     ? data.map((item) => ({
                         ...item,
-                        updatedAt: new Date(),
+                        updatedAt: new Date().getTime(),
                     }))
-                    : { ...data, updatedAt: new Date() })).map(([path, content]) => [
+                    : { ...data, updatedAt: new Date().getTime() })).map(([path, content]) => [
                     path,
                     [...(Array.isArray(where) ? where : [where])].reduce((obj, lineNum, index) => ({
                         ...obj,
@@ -784,9 +784,9 @@ export default class Inibase {
                     return this.get(tableName, where, options, !Array.isArray(where));
             }
         }
-        else if (typeof where === "object") {
-            const lineNumbers = this.get(tableName, where, undefined, undefined, true);
-            if (!lineNumbers || !Array.isArray(lineNumbers) || !lineNumbers.length)
+        else if (Utils.isObject(where)) {
+            const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+            if (!lineNumbers || !lineNumbers.length)
                 throw this.throwError("NO_ITEMS", tableName);
             return this.put(tableName, data, lineNumbers);
         }
@@ -823,16 +823,18 @@ export default class Inibase {
                 const files = await readdir(join(this.folder, this.database, tableName));
                 if (files.length) {
                     if (!_id)
-                        _id = Object.values((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0]).map((id) => UtilsServer.encodeID(Number(id), this.salt));
+                        _id = Object.values((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0] ?? {}).map((id) => UtilsServer.encodeID(Number(id), this.salt));
+                    if (!_id.length)
+                        throw this.throwError("NO_ITEMS", tableName);
                     for (const file of files.filter((fileName) => fileName.endsWith(".inib")))
                         await File.remove(join(this.folder, this.database, tableName, file), where);
                     return Array.isArray(_id) && _id.length === 1 ? _id[0] : _id;
                 }
             }
         }
-        else if (typeof where === "object" && !Array.isArray(where)) {
-            const lineNumbers = this.get(tableName, where, undefined, undefined, true);
-            if (!lineNumbers || !Array.isArray(lineNumbers) || !lineNumbers.length)
+        else if (Utils.isObject(where)) {
+            const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+            if (!lineNumbers || !lineNumbers.length)
                 throw this.throwError("NO_ITEMS", tableName);
             return this.delete(tableName, lineNumbers);
         }

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
 import { type FieldType } from "./index.js";
 export declare const isArrayOfObjects: (input: any) => input is Record<any, any>[];
 export declare const isArrayOfArrays: (input: any) => input is any[][];
+export declare const isArrayOfNulls: (input: any) => input is null[] | null[][];
 export declare const isObject: (obj: any) => boolean;
 export declare const deepMerge: (target: any, source: any) => any;
 export declare const combineObjects: (arr: Record<string, any>[]) => Record<string, any>;
@@ -38,4 +39,5 @@ export default class Utils {
     static isIP: (input: any) => boolean;
     static validateFieldType: (value: any, fieldType: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[]) => boolean;
     static objectToDotNotation: (input: Record<string, any>) => Record<string, string | number | (string | number)[]>;
+    static isArrayOfNulls: (input: any) => input is null[] | null[][];
 }

package/dist/utils.js

@@ -1,5 +1,6 @@
 export const isArrayOfObjects = (input) => Array.isArray(input) && (input.length === 0 || input.every(isObject));
 export const isArrayOfArrays = (input) => Array.isArray(input) && (input.length === 0 || input.every(Array.isArray));
+export const isArrayOfNulls = (input) => input.every((_input) => Array.isArray(_input) ? isArrayOfNulls(_input) : _input === null);
 export const isObject = (obj) => obj != null &&
     (obj.constructor.name === "Object" ||
         (typeof obj === "object" && !Array.isArray(obj)));
@@ -21,8 +22,8 @@ export const combineObjects = (arr) => {
             if (obj.hasOwnProperty(key)) {
                 const existingValue = result[key];
                 const newValue = obj[key];
-                if (typeof existingValue === "object" &&
-                    typeof newValue === "object" &&
+                if (isObject(existingValue) &&
+                    isObject(newValue) &&
                     existingValue !== null &&
                     existingValue !== undefined &&
                     newValue !== null &&
@@ -35,8 +36,12 @@ export const combineObjects = (arr) => {
                     result[key] =
                         existingValue !== null && existingValue !== undefined
                             ? Array.isArray(existingValue)
-                                ? [...existingValue, newValue]
-                                : [existingValue, newValue]
+                                ? Array.isArray(newValue)
+                                    ? [...existingValue, ...newValue]
+                                    : [...existingValue, newValue]
+                                : Array.isArray(newValue)
+                                    ? [existingValue, ...newValue]
+                                    : [existingValue, newValue]
                             : newValue;
                 }
             }
@@ -81,7 +86,8 @@ export const isBoolean = (input) => typeof input === "boolean" ||
     input === true ||
     input === false;
 export const isPassword = (input) => input.length === 161;
-export const isDate = (input) => !isNaN(Date.parse(String(input))) && Date.parse(String(input)) >= 0;
+export const isDate = (input) => (isNumber(input) && new Date(input).getTime() > 0) ||
+    (!isNaN(Date.parse(String(input))) && Date.parse(String(input)) >= 0);
 export const isValidID = (input) => {
     return typeof input === "string" && input.length === 32;
 };
@@ -198,7 +204,7 @@ export const objectToDotNotation = (input) => {
                     // If the property is an array of strings or numbers, keep the array as is
                     result[newKey] = value;
                 }
-                else if (typeof value === "object" && value !== null) {
+                else if (isObject(value)) {
                     // If the property is an object, push it onto the stack for further processing
                     stack.push({ obj: value, parentKey: newKey });
                 }
@@ -231,4 +237,5 @@ export default class Utils {
     static isIP = isIP;
     static validateFieldType = validateFieldType;
     static objectToDotNotation = objectToDotNotation;
+    static isArrayOfNulls = isArrayOfNulls;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.17",
+  "version": "1.0.0-rc.19",
   "description": "File-based Relational Database for large data",
   "main": "./dist/index.js",
   "types": "./dist",
@@ -63,7 +63,7 @@
   },
   "scripts": {
     "build": "npx tsc",
-    "test": "npx tsx watch ./index.test",
+    "test": "npx tsx watch ./text/index",
     "benchmark": "npx tsx watch ./benchmark.ts"
   }
 }