inibase 1.0.0-rc.25 → 1.0.0-rc.27

package/dist/index.js

@@ -1,32 +1,32 @@
-import { unlink, rename, readFile, writeFile, mkdir, readdir, } from "node:fs/promises";
+import { unlink, rename, mkdir, readdir } from "node:fs/promises";
 import { existsSync, appendFileSync } from "node:fs";
 import { join } from "node:path";
+import { cpus } from "node:os";
 import { scryptSync, randomBytes } from "node:crypto";
 import File from "./file.js";
 import Utils from "./utils.js";
 import UtilsServer from "./utils.server.js";
+import Config from "./config.js";
+process.env.UV_THREADPOOL_SIZE = cpus().length.toString();
 export default class Inibase {
     folder;
     database;
     table;
     pageInfo;
-    cache;
     totalItems;
     salt;
     constructor(database, mainFolder = ".") {
         this.database = database;
         this.folder = mainFolder;
         this.table = null;
-        this.cache = new Map();
         this.totalItems = {};
-        this.pageInfo = { page: 1, per_page: 15 };
+        this.pageInfo = {};
         if (!existsSync(".env") || !process.env.INIBASE_SECRET) {
             this.salt = scryptSync(randomBytes(16), randomBytes(16), 32);
             appendFileSync(".env", `INIBASE_SECRET=${this.salt.toString("hex")}\n`);
         }
-        else {
+        else
             this.salt = Buffer.from(process.env.INIBASE_SECRET, "hex");
-        }
     }
     throwError(code, variable, language = "en") {
         const errorMessages = {
@@ -55,7 +55,9 @@ export default class Inibase {
     }
     async setTableSchema(tableName, schema) {
         const decodeIdFromSchema = (schema) => schema.map((field) => {
-            if (field.children && Utils.isArrayOfObjects(field.children))
+            if ((field.type === "array" || field.type === "object") &&
+                field.children &&
+                Utils.isArrayOfObjects(field.children))
                 field.children = decodeIdFromSchema(field.children);
             if (field.id && !Utils.isNumber(field.id))
                 field.id = UtilsServer.decodeID(field.id, this.salt);
@@ -67,12 +69,16 @@ export default class Inibase {
         const TablePath = join(this.folder, this.database, tableName), TableSchemaPath = join(TablePath, "schema.json");
         if (!(await File.isExists(TablePath)))
             await mkdir(TablePath, { recursive: true });
+        if (!(await File.isExists(join(TablePath, ".tmp"))))
+            await mkdir(join(TablePath, ".tmp"));
         if (await File.isExists(TableSchemaPath)) {
             // update columns files names based on field id
             const schemaToIdsPath = (schema, prefix = "") => {
                 let RETURN = {};
                 for (const field of schema)
-                    if (field.children && Utils.isArrayOfObjects(field.children)) {
+                    if ((field.type === "array" || field.type === "object") &&
+                        field.children &&
+                        Utils.isArrayOfObjects(field.children)) {
                         Utils.deepMerge(RETURN, schemaToIdsPath(field.children, (prefix ?? "") + field.key + "."));
                     }
                     else if (Utils.isValidID(field.id))
@@ -85,17 +91,16 @@ export default class Inibase {
                     if (await File.isExists(join(TablePath, oldPath)))
                         await rename(join(TablePath, oldPath), join(TablePath, newPath));
         }
-        await writeFile(join(TablePath, "schema.json"), JSON.stringify(decodeIdFromSchema(schema)));
+        await File.write(join(TablePath, "schema.json"), JSON.stringify(decodeIdFromSchema(schema), null, 2), true);
     }
     async getTableSchema(tableName) {
         const TableSchemaPath = join(this.folder, this.database, tableName, "schema.json");
         if (!(await File.isExists(TableSchemaPath)))
             return undefined;
-        if (!this.cache.has(TableSchemaPath))
-            this.cache.set(TableSchemaPath, await readFile(TableSchemaPath, "utf8"));
-        if (!this.cache.get(TableSchemaPath))
+        const schemaFile = await File.read(TableSchemaPath, true);
+        if (!schemaFile)
             return undefined;
-        const schema = JSON.parse(this.cache.get(TableSchemaPath) ?? ""), lastIdNumber = UtilsServer.findLastIdNumber(schema, this.salt);
+        const schema = JSON.parse(schemaFile), lastIdNumber = UtilsServer.findLastIdNumber(schema, this.salt);
         return [
             {
                 id: UtilsServer.encodeID(0, this.salt),
@@ -118,49 +123,45 @@ export default class Inibase {
             },
         ];
     }
-    getField(keyPath, schema, property) {
+    getField(keyPath, schema) {
+        let RETURN = null;
         const keyPathSplited = keyPath.split(".");
         for (const [index, key] of keyPathSplited.entries()) {
-            if (key === "*")
-                continue;
             const foundItem = schema.find((item) => item.key === key);
             if (!foundItem)
                 return null;
             if (index === keyPathSplited.length - 1)
-                schema = foundItem;
+                RETURN = foundItem;
             if ((foundItem.type === "array" || foundItem.type === "object") &&
                 foundItem.children &&
                 Utils.isArrayOfObjects(foundItem.children))
-                schema = foundItem.children;
-        }
-        if (property) {
-            switch (property) {
-                case "type":
-                    return schema.type;
-                case "children":
-                    return schema.children;
-                default:
-                    return schema[property];
-            }
+                RETURN = foundItem.children;
         }
-        else
-            return schema;
+        if (!RETURN)
+            return null;
+        return Utils.isArrayOfObjects(RETURN) ? RETURN[0] : RETURN;
     }
     validateData(data, schema, skipRequiredField = false) {
         if (Utils.isArrayOfObjects(data))
             for (const single_data of data)
                 this.validateData(single_data, schema, skipRequiredField);
         else if (Utils.isObject(data)) {
-            for (const { key, type, required, children } of schema) {
-                if (!data.hasOwnProperty(key) && required && !skipRequiredField)
-                    throw this.throwError("FIELD_REQUIRED", key);
-                if (data.hasOwnProperty(key) &&
-                    !Utils.validateFieldType(data[key], type, children && !Utils.isArrayOfObjects(children) ? children : undefined))
-                    throw this.throwError("INVALID_TYPE", key + " " + type + " " + data[key]);
-                if ((type === "array" || type === "object") &&
-                    children &&
-                    Utils.isArrayOfObjects(children))
-                    this.validateData(data[key], children, skipRequiredField);
+            for (const field of schema) {
+                if (!data.hasOwnProperty(field.key) &&
+                    field.required &&
+                    !skipRequiredField)
+                    throw this.throwError("FIELD_REQUIRED", field.key);
+                if (data.hasOwnProperty(field.key) &&
+                    !Utils.validateFieldType(data[field.key], field.type, (field.type === "array" || field.type === "object") &&
+                        field.children &&
+                        !Utils.isArrayOfObjects(field.children)
+                        ? field.children
+                        : undefined))
+                    throw this.throwError("INVALID_TYPE", field.key + " " + field.type + " " + data[field.key]);
+                if ((field.type === "array" || field.type === "object") &&
+                    field.children &&
+                    Utils.isArrayOfObjects(field.children))
+                    this.validateData(data[field.key], field.children, skipRequiredField);
             }
         }
     }
@@ -169,10 +170,8 @@ export default class Inibase {
             field.type = Utils.detectFieldType(value, field.type) ?? field.type[0];
         switch (field.type) {
             case "array":
-                if (!Array.isArray(value))
-                    value = [value];
                 if (typeof field.children === "string") {
-                    if (field.type === "array" && field.children === "table") {
+                    if (field.children === "table") {
                         if (Array.isArray(value)) {
                             if (Utils.isArrayOfObjects(value)) {
                                 if (value.every((item) => item.hasOwnProperty("id") &&
@@ -194,8 +193,8 @@ export default class Inibase {
                         else if (Utils.isNumber(value))
                             return [Number(value)];
                     }
-                    else if (value.hasOwnProperty(field.key))
-                        return value;
+                    else
+                        return Array.isArray(value) ? value : [value];
                 }
                 else if (Utils.isArrayOfObjects(field.children))
                     return this.formatData(value, field.children, formatOnlyAvailiableKeys);
@@ -304,10 +303,7 @@ export default class Inibase {
         const path = join(this.folder, this.database, tableName);
         let RETURN = {};
         for await (const field of schema) {
-            if ((field.type === "array" ||
-                (Array.isArray(field.type) &&
-                    field.type.includes("array"))) &&
-                field.children) {
+            if (field.type === "array" && field.children) {
                 if (Utils.isArrayOfObjects(field.children)) {
                     if (field.children.filter((children) => children.type === "array" &&
                         Utils.isArrayOfObjects(children.children)).length) {
@@ -389,8 +385,7 @@ export default class Inibase {
                         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;
+                    const items = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field.children, this.salt);
                     if (items)
                         for await (const [index, item] of Object.entries(items)) {
                             if (!RETURN[index])
@@ -401,8 +396,7 @@ export default class Inibase {
                         }
                 }
                 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;
+                    const items = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
                     if (items)
                         for (const [index, item] of Object.entries(items)) {
                             if (!RETURN[index])
@@ -433,8 +427,7 @@ export default class Inibase {
                             .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;
+                    const items = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, "number", undefined, this.salt);
                     if (items)
                         for await (const [index, item] of Object.entries(items)) {
                             if (!RETURN[index])
@@ -446,8 +439,7 @@ export default class Inibase {
                 }
             }
             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;
+                const items = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
                 if (items)
                     for (const [index, item] of Object.entries(items)) {
                         if (!RETURN[index])
@@ -518,23 +510,26 @@ export default class Inibase {
         }
     }
     async applyCriteria(tableName, schema, options, criteria, allTrue) {
-        let RETURN = {};
+        let RETURN = {}, RETURN_LineNumbers = null;
         if (!criteria)
-            return null;
+            return [null, null];
         if (criteria.and && Utils.isObject(criteria.and)) {
-            const searchResult = await this.applyCriteria(tableName, schema, options, criteria.and, true);
+            const [searchResult, lineNumbers] = 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;
+                RETURN_LineNumbers = lineNumbers;
             }
             else
-                return null;
+                return [null, null];
         }
         if (criteria.or && Utils.isObject(criteria.or)) {
-            const searchResult = await this.applyCriteria(tableName, schema, options, criteria.or, false);
+            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.or, false);
             delete criteria.or;
-            if (searchResult)
+            if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, searchResult);
+                RETURN_LineNumbers = lineNumbers;
+            }
         }
         if (Object.keys(criteria).length > 0) {
             if (allTrue === undefined)
@@ -597,7 +592,7 @@ export default class Inibase {
                     searchOperator = "=";
                     searchComparedAtValue = value;
                 }
-                const [searchResult, total_lines] = await File.search(join(this.folder, this.database, tableName, key + ".inib"), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, field?.type, field?.children, options.per_page, options.page - 1 * options.per_page + 1, true, this.salt);
+                const [searchResult, totalLines, linesNumbers] = await File.search(join(this.folder, this.database, tableName, key + ".inib"), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, field?.type, field?.children, options.perPage, options.page - 1 * options.perPage + 1, true, this.salt);
                 if (searchResult) {
                     RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).map(([id, value]) => [
                         id,
@@ -605,7 +600,8 @@ export default class Inibase {
                             [key]: value,
                         },
                     ])));
-                    this.totalItems[tableName + "-" + key] = total_lines;
+                    this.totalItems[tableName + "-" + key] = totalLines;
+                    RETURN_LineNumbers = linesNumbers;
                 }
                 if (allTrue && index > 0) {
                     if (!Object.keys(RETURN).length)
@@ -616,31 +612,10 @@ export default class Inibase {
                 }
             }
         }
-        return Object.keys(RETURN).length ? RETURN : null;
+        return [Object.keys(RETURN).length ? RETURN : null, RETURN_LineNumbers];
     }
-    async get(tableName, where, options = {
-        page: 1,
-        per_page: 15,
-    }, onlyOne, onlyLinesNumbers) {
-        if (options.columns) {
-            if (!Array.isArray(options.columns))
-                options.columns = [options.columns];
-            if (options.columns.length &&
-                !options.columns.includes("id"))
-                options.columns.push("id");
-        }
-        if (!options.page)
-            options.page = 1;
-        if (!options.per_page)
-            options.per_page = 15;
-        let RETURN;
-        let schema = await this.getTableSchema(tableName);
-        if (!schema)
-            throw this.throwError("NO_SCHEMA", tableName);
-        const idFilePath = join(this.folder, this.database, tableName, "id.inib");
-        if (!(await File.isExists(idFilePath)))
-            return null;
-        const filterSchemaByColumns = (schema, columns) => schema
+    _filterSchemaByColumns(schema, columns) {
+        return schema
             .map((field) => {
             if (columns.some((column) => column.startsWith("!")))
                 return columns.includes("!" + field.key) ? null : field;
@@ -650,7 +625,7 @@ export default class Inibase {
                 Utils.isArrayOfObjects(field.children) &&
                 columns.filter((column) => column.startsWith(field.key + ".") ||
                     column.startsWith("!" + field.key + ".")).length) {
-                field.children = filterSchemaByColumns(field.children, columns
+                field.children = this._filterSchemaByColumns(field.children, columns
                     .filter((column) => column.startsWith(field.key + ".") ||
                     column.startsWith("!" + field.key + "."))
                     .map((column) => column.replace(field.key + ".", "")));
@@ -659,13 +634,55 @@ export default class Inibase {
             return null;
         })
             .filter((i) => i);
+    }
+    async get(tableName, where, options = {
+        page: 1,
+        perPage: 15,
+    }, onlyOne, onlyLinesNumbers, tableSchema) {
+        // Ensure options.columns is an array
+        if (options.columns) {
+            options.columns = Array.isArray(options.columns)
+                ? options.columns
+                : [options.columns];
+            if (options.columns.length && !options.columns.includes("id"))
+                options.columns.push("id");
+        }
+        // Default values for page and perPage
+        options.page = options.page || 1;
+        options.perPage = options.perPage || 15;
+        let RETURN;
+        let schema = tableSchema ?? (await this.getTableSchema(tableName));
+        if (!schema)
+            throw this.throwError("NO_SCHEMA", tableName);
+        const idFilePath = join(this.folder, this.database, tableName, "id.inib");
+        if (!(await File.isExists(idFilePath)))
+            return null;
         if (options.columns && options.columns.length)
-            schema = filterSchemaByColumns(schema, options.columns);
+            schema = this._filterSchemaByColumns(schema, options.columns);
         if (!where) {
             // Display all data
-            RETURN = Object.values(await this.getItemsFromSchema(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.perPage }, (_, index) => (options.page - 1) * options.perPage +
                 index +
                 1), options));
+            if (Config.isCacheEnabled &&
+                (await File.isExists(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"))))
+                this.totalItems[tableName + "-*"] = Number(await File.read(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"), true));
+            else {
+                this.totalItems[tableName + "-*"] = await File.count(idFilePath);
+                if (Config.isCacheEnabled)
+                    await File.write(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"), String(this.totalItems[tableName + "-*"]), true);
+            }
+        }
+        else if ((Array.isArray(where) && where.every(Utils.isNumber)) ||
+            (Utils.isNumber(where) && !onlyLinesNumbers)) {
+            let lineNumbers = where;
+            if (!Array.isArray(lineNumbers))
+                lineNumbers = [lineNumbers];
+            RETURN = Object.values((await this.getItemsFromSchema(tableName, schema, lineNumbers, options)) ?? {});
+            if (!this.totalItems[tableName + "-*"])
+                this.totalItems[tableName + "-*"] = lineNumbers.length;
+            if (RETURN && RETURN.length && !Array.isArray(where))
+                RETURN = RETURN[0];
         }
         else if ((Array.isArray(where) &&
             (where.every(Utils.isValidID) || where.every(Utils.isNumber))) ||
@@ -682,29 +699,56 @@ export default class Inibase {
                     ? Object.keys(lineNumbers).map(Number)
                     : null;
             RETURN = Object.values((await this.getItemsFromSchema(tableName, schema, Object.keys(lineNumbers).map(Number), options)) ?? {});
+            if (!this.totalItems[tableName + "-*"]) {
+                if (Config.isCacheEnabled &&
+                    (await File.isExists(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"))))
+                    this.totalItems[tableName + "-*"] = Number(await File.read(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"), true));
+                else {
+                    this.totalItems[tableName + "-*"] = await File.count(idFilePath);
+                    if (Config.isCacheEnabled)
+                        await File.write(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"), String(this.totalItems[tableName + "-*"]), true);
+                }
+            }
             if (RETURN && RETURN.length && !Array.isArray(where))
                 RETURN = RETURN[0];
         }
         else if (Utils.isObject(where)) {
+            let cachedFilePath = "";
             // Criteria
-            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]);
-                RETURN = Object.values(Utils.deepMerge(RETURN, await this.getItemsFromSchema(tableName, schema.filter((field) => !alreadyExistsColumns.includes(field.key)), Object.keys(RETURN).map(Number), options)));
+            if (Config.isCacheEnabled)
+                cachedFilePath = join(this.folder, this.database, tableName, ".tmp", `${UtilsServer.hashObject(where)}.inib`);
+            if (Config.isCacheEnabled && (await File.isExists(cachedFilePath))) {
+                const cachedItems = (await File.read(cachedFilePath, true)).split(",");
+                this.totalItems[tableName + "-*"] = cachedItems.length;
+                return this.get(tableName, cachedItems
+                    .slice((options.page - 1) * options.perPage, options.page * options.perPage)
+                    .map(Number), options, undefined, undefined, schema);
+            }
+            else {
+                let linesNumbers;
+                [RETURN, linesNumbers] = await this.applyCriteria(tableName, schema, options, where);
+                if (RETURN && linesNumbers) {
+                    if (onlyLinesNumbers)
+                        return Object.keys(RETURN).map(Number);
+                    const alreadyExistsColumns = Object.keys(Object.values(RETURN)[0]);
+                    RETURN = Object.values(Utils.deepMerge(RETURN, await this.getItemsFromSchema(tableName, schema.filter((field) => !alreadyExistsColumns.includes(field.key)), Object.keys(RETURN).map(Number), options)));
+                    if (Config.isCacheEnabled)
+                        await File.write(cachedFilePath, Array.from(linesNumbers).join(","), true);
+                }
             }
         }
         if (!RETURN ||
             (Utils.isObject(RETURN) && !Object.keys(RETURN).length) ||
             (Array.isArray(RETURN) && !RETURN.length))
             return null;
-        const greatestTotalItems = Math.max(...Object.entries(this.totalItems)
-            .filter(([k]) => k.startsWith(tableName + "-"))
-            .map(([, v]) => v));
-        this.pageInfo = {
+        const greatestTotalItems = this.totalItems[tableName + "-*"] ??
+            Math.max(...Object.entries(this.totalItems)
+                .filter(([k]) => k.startsWith(tableName + "-"))
+                .map(([, v]) => v));
+        this.pageInfo[tableName] = {
             ...(({ columns, ...restOfOptions }) => restOfOptions)(options),
-            total_pages: Math.ceil(greatestTotalItems / options.per_page),
+            perPage: Array.isArray(RETURN) ? RETURN.length : 1,
+            totalPages: Math.ceil(greatestTotalItems / options.perPage),
             total: greatestTotalItems,
         };
         return onlyOne && Array.isArray(RETURN) ? RETURN[0] : RETURN;
@@ -713,7 +757,7 @@ export default class Inibase {
         if (!options)
             options = {
                 page: 1,
-                per_page: 15,
+                perPage: 15,
             };
         if (!returnPostedData)
             returnPostedData = false;
@@ -721,46 +765,54 @@ export default class Inibase {
         let RETURN;
         if (!schema)
             throw this.throwError("NO_SCHEMA", tableName);
-        const idFilePath = join(this.folder, this.database, tableName, "id.inib");
-        let [last_line_number, last_id] = (await File.isExists(idFilePath))
-            ? Object.entries((await File.get(idFilePath, -1, "number", undefined, this.salt))[0] ??
-                {})[0].map(Number) ?? [0, 0]
-            : [0, 0];
+        const idFilePath = join(this.folder, this.database, tableName, "id.inib"), cashFolderPath = join(this.folder, this.database, tableName, ".tmp");
+        let lastId = 0, totalItems = 0, lastIdObj;
+        if (await File.isExists(idFilePath)) {
+            if (await File.isExists(join(cashFolderPath, "lastId.inib"))) {
+                lastId = Number(await File.read(join(cashFolderPath, "lastId.inib"), true));
+                if (await File.isExists(join(cashFolderPath, "totalItems.inib")))
+                    totalItems = Number(await File.read(join(cashFolderPath, "totalItems.inib"), true));
+                else
+                    totalItems = await File.count(join(this.folder, this.database, tableName, "id.inib"));
+            }
+            else {
+                [lastIdObj, totalItems] = await File.get(idFilePath, -1, "number", undefined, this.salt, true);
+                if (lastIdObj)
+                    lastId = Number(Object.entries(lastIdObj)[0][1]) ?? 0;
+            }
+        }
         if (Utils.isArrayOfObjects(data))
             RETURN = data.map(({ id, updatedAt, createdAt, ...rest }) => ({
-                id: ++last_id,
+                id: ++lastId,
                 ...rest,
                 createdAt: Date.now(),
             }));
         else
             RETURN = (({ id, updatedAt, createdAt, ...rest }) => ({
-                id: ++last_id,
+                id: ++lastId,
                 ...rest,
                 createdAt: Date.now(),
             }))(data);
         if (!RETURN)
             throw this.throwError("NO_DATA");
         RETURN = this.formatData(RETURN, schema);
-        const pathesContents = this.joinPathesContents(join(this.folder, this.database, tableName), RETURN);
-        last_line_number += 1;
+        const pathesContents = this.joinPathesContents(join(this.folder, this.database, tableName), Array.isArray(RETURN) ? RETURN.toReversed() : RETURN);
+        const renameList = [];
         for await (const [path, content] of Object.entries(pathesContents))
-            await File.append(path, 
-            // Array.isArray(content)
-            //   ? content.reduce((obj, value, index) => {
-            //       obj[last_line_number + index] = value;
-            //       return obj;
-            //     }, {})
-            //   : { [last_line_number]: content }
-            content, last_line_number);
+            renameList.push(await File.append(path, content));
+        for await (const [tempPath, filePath] of renameList)
+            await rename(tempPath, filePath);
+        await File.write(join(cashFolderPath, "lastId.inib"), lastId.toString(), true);
+        await File.write(join(cashFolderPath, "totalItems.inib"), String(totalItems + (Array.isArray(RETURN) ? RETURN.length : 1)), true);
         if (returnPostedData)
             return this.get(tableName, Utils.isArrayOfObjects(RETURN)
                 ? RETURN.map((data) => Number(data.id))
-                : RETURN.id, options, !Utils.isArrayOfObjects(data) // return only one item if data is not array of objects
-            );
+                : RETURN.id, options, !Utils.isArrayOfObjects(data), // return only one item if data is not array of objects
+            undefined, schema);
     }
     async put(tableName, data, where, options = {
         page: 1,
-        per_page: 15,
+        perPage: 15,
     }, returnPostedData) {
         const schema = await this.getTableSchema(tableName);
         if (!schema)
@@ -794,8 +846,14 @@ export default class Inibase {
                     });
                 for await (const [path, content] of Object.entries(pathesContents))
                     await File.replace(path, content);
+                if (Config.isCacheEnabled) {
+                    const cacheFiles = (await readdir(join(this.folder, this.database, tableName, ".tmp")))?.filter((fileName) => !["lastId.inib", "totalItems.inib"].includes(fileName));
+                    if (cacheFiles.length)
+                        for await (const file of cacheFiles)
+                            await unlink(join(this.folder, this.database, tableName, ".tmp", file));
+                }
                 if (returnPostedData)
-                    return this.get(tableName, where, options);
+                    return this.get(tableName, where, options, undefined, undefined, schema);
             }
         }
         else if ((Array.isArray(where) &&
@@ -804,7 +862,7 @@ export default class Inibase {
             Utils.isNumber(where)) {
             if ((Array.isArray(where) && where.every(Utils.isValidID)) ||
                 Utils.isValidID(where)) {
-                const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+                const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
                 return this.put(tableName, data, lineNumbers);
             }
             else if ((Array.isArray(where) && where.every(Utils.isNumber)) ||
@@ -822,14 +880,23 @@ export default class Inibase {
                         [lineNum]: Array.isArray(content) ? content[index] : content,
                     }), {}),
                 ]));
+                const renameList = [];
                 for await (const [path, content] of Object.entries(pathesContents))
-                    await File.replace(path, content);
+                    renameList.push(await File.replace(path, content));
+                for await (const [tempPath, filePath] of renameList)
+                    await rename(tempPath, filePath);
+                if (Config.isCacheEnabled) {
+                    const cacheFiles = (await readdir(join(this.folder, this.database, tableName, ".tmp")))?.filter((fileName) => !["lastId.inib", "totalItems.inib"].includes(fileName));
+                    if (cacheFiles.length)
+                        for await (const file of cacheFiles)
+                            await unlink(join(this.folder, this.database, tableName, ".tmp", file));
+                }
                 if (returnPostedData)
-                    return this.get(tableName, where, options, !Array.isArray(where));
+                    return this.get(tableName, where, options, !Array.isArray(where), undefined, schema);
             }
         }
         else if (Utils.isObject(where)) {
-            const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+            const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
             if (!lineNumbers || !lineNumbers.length)
                 throw this.throwError("NO_ITEMS", tableName);
             return this.put(tableName, data, lineNumbers);
@@ -849,6 +916,12 @@ export default class Inibase {
             if (files.length)
                 for await (const file of files)
                     await unlink(join(this.folder, this.database, tableName, file));
+            if (Config.isCacheEnabled) {
+                const cacheFiles = (await readdir(join(this.folder, this.database, tableName, ".tmp")))?.filter((fileName) => !["lastId.inib", "totalItems.inib"].includes(fileName));
+                if (cacheFiles.length)
+                    for await (const file of cacheFiles)
+                        await unlink(join(this.folder, this.database, tableName, ".tmp", file));
+            }
             return "*";
         }
         else if ((Array.isArray(where) &&
@@ -857,7 +930,7 @@ export default class Inibase {
             Utils.isNumber(where)) {
             if ((Array.isArray(where) && where.every(Utils.isValidID)) ||
                 Utils.isValidID(where)) {
-                const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+                const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
                 if (!lineNumbers)
                     return null;
                 return this.delete(tableName, lineNumbers, where);
@@ -868,17 +941,29 @@ export default class Inibase {
                 const files = (await readdir(join(this.folder, this.database, tableName)))?.filter((fileName) => fileName.endsWith(".inib"));
                 if (files.length) {
                     if (!_id)
-                        _id = Object.entries((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0] ?? {}).map(([_key, id]) => UtilsServer.encodeID(Number(id), this.salt));
+                        _id = Object.entries((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt)) ?? {}).map(([_key, id]) => UtilsServer.encodeID(Number(id), this.salt));
                     if (!_id.length)
                         throw this.throwError("NO_ITEMS", tableName);
+                    const renameList = [];
                     for await (const file of files)
-                        await File.remove(join(this.folder, this.database, tableName, file), where);
+                        renameList.push(await File.remove(join(this.folder, this.database, tableName, file), where));
+                    for await (const [tempPath, filePath] of renameList)
+                        await rename(tempPath, filePath);
+                    if (Config.isCacheEnabled) {
+                        const cacheFiles = (await readdir(join(this.folder, this.database, tableName, ".tmp")))?.filter((fileName) => !["lastId.inib", "totalItems.inib"].includes(fileName));
+                        if (cacheFiles.length)
+                            for await (const file of cacheFiles)
+                                await unlink(join(this.folder, this.database, tableName, ".tmp", file));
+                        await File.write(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"), String(((await File.isExists(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib")))
+                            ? Number(await File.read(join(this.folder, this.database, tableName, ".tmp", "totalItems.inib"), true))
+                            : await File.count(join(this.folder, this.database, tableName, "id.inib"))) - (Array.isArray(where) ? where.length : 1)), true);
+                    }
                     return Array.isArray(_id) && _id.length === 1 ? _id[0] : _id;
                 }
             }
         }
         else if (Utils.isObject(where)) {
-            const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+            const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
             if (!lineNumbers || !lineNumbers.length)
                 throw this.throwError("NO_ITEMS", tableName);
             return this.delete(tableName, lineNumbers);
@@ -900,7 +985,7 @@ export default class Inibase {
             const columnPath = join(this.folder, this.database, tableName, column + ".inib");
             if (await File.isExists(columnPath)) {
                 if (where) {
-                    const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+                    const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
                     RETURN[column] = lineNumbers
                         ? await File.sum(columnPath, lineNumbers)
                         : 0;
@@ -924,7 +1009,7 @@ export default class Inibase {
             const columnPath = join(this.folder, this.database, tableName, column + ".inib");
             if (await File.isExists(columnPath)) {
                 if (where) {
-                    const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+                    const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
                     RETURN[column] = lineNumbers
                         ? await File.max(columnPath, lineNumbers)
                         : 0;
@@ -948,7 +1033,7 @@ export default class Inibase {
             const columnPath = join(this.folder, this.database, tableName, column + ".inib");
             if (await File.isExists(columnPath)) {
                 if (where) {
-                    const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+                    const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
                     RETURN[column] = lineNumbers
                         ? await File.min(columnPath, lineNumbers)
                         : 0;