inibase 1.1.20 → 1.1.22

package/dist/file.d.ts

@@ -1,4 +1,4 @@
-import type { ComparisonOperator, FieldType, Schema } from "./index.js";
+import { type ComparisonOperator, type Field } from "./index.js";
 export declare const lock: (folderPath: string, prefix?: string) => Promise<void>;
 export declare const unlock: (folderPath: string, prefix?: string) => Promise<void>;
 export declare const write: (filePath: string, data: any) => Promise<void>;
@@ -25,27 +25,30 @@ export declare const encode: (input: string | number | boolean | null | (string
  * Handles different formats of input, including strings, numbers, and their array representations.
  *
  * @param input - The input to be decoded, can be a string, number, or null.
- * @param fieldType - Optional type of the field to guide decoding (e.g., 'number', 'boolean').
- * @param fieldChildrenType - Optional type for child elements in array inputs.
- * @param secretKey - Optional secret key for decoding, can be a string or Buffer.
+ * @param field - Field object config.
  * @returns Decoded value as a string, number, boolean, or array of these, or null if no fieldType or input is null/empty.
  */
-export declare const decode: (input: string | null | number, fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | Schema, secretKey?: string | Buffer) => string | number | boolean | null | (string | number | null | boolean)[];
+export declare const decode: (input: string | null | number, field: Field & {
+    databasePath?: string;
+}) => string | number | boolean | null | (string | number | null | boolean)[];
 /**
  * Asynchronously reads and decodes data from a file at specified line numbers.
  * Decodes each line based on specified field types and an optional secret key.
  *
  * @param filePath - Path of the file to be read.
  * @param lineNumbers - Optional line number(s) to read from the file. If -1, reads the last line.
- * @param fieldType - Optional type of the field to guide decoding (e.g., 'number', 'boolean').
- * @param fieldChildrenType - Optional type for child elements in array inputs.
- * @param secretKey - Optional secret key for decoding, can be a string or Buffer.
+ * @param field - Field object config.
+ * @param readWholeFile - Optional Flag to indicate whether to continue reading the file after reaching the limit.
  * @returns Promise resolving to a tuple:
  *   1. Record of line numbers and their decoded content or null if no lines are read.
  *   2. Total count of lines processed.
  */
-export declare function get(filePath: string, lineNumbers?: number | number[], fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | Schema, secretKey?: string | Buffer, readWholeFile?: false): Promise<Record<number, string | number | boolean | null | (string | number | boolean | (string | number | boolean)[] | null)[]> | null>;
-export declare function get(filePath: string, lineNumbers: undefined | number | number[], fieldType: undefined | FieldType | FieldType[], fieldChildrenType: undefined | FieldType | FieldType[], secretKey: undefined | string | Buffer, readWholeFile: true): Promise<[
+export declare function get(filePath: string, lineNumbers?: number | number[], field?: Field & {
+    databasePath?: string;
+}, readWholeFile?: false): Promise<Record<number, string | number | boolean | null | (string | number | boolean | (string | number | boolean)[] | null)[]> | null>;
+export declare function get(filePath: string, lineNumbers: undefined | number | number[], field: undefined | (Field & {
+    databasePath?: string;
+}), readWholeFile: true): Promise<[
     Record<number, string | number | boolean | null | (string | number | boolean | (string | number | boolean)[] | null)[]> | null,
     number
 ]>;
@@ -95,19 +98,19 @@ export declare const remove: (filePath: string, linesToDelete: number | number[]
  * @param operator - Comparison operator(s) for evaluation (e.g., '=', '!=', '>', '<').
  * @param comparedAtValue - Value(s) to compare each line against.
  * @param logicalOperator - Optional logical operator ('and' or 'or') for combining multiple comparisons.
- * @param fieldType - Optional type of the field to guide comparison.
- * @param fieldChildrenType - Optional type for child elements in array inputs.
+ * @param field - Field object config.
  * @param limit - Optional limit on the number of results to return.
  * @param offset - Optional offset to start returning results from.
  * @param readWholeFile - Flag to indicate whether to continue reading the file after reaching the limit.
- * @param secretKey - Optional secret key for decoding, can be a string or Buffer.
  * @returns Promise resolving to a tuple:
  *   1. Record of line numbers and their content that match the criteria or null if none.
  *   2. The count of found items or processed items based on the 'readWholeFile' flag.
  *
  * Note: Decodes each line for comparison and can handle complex queries with multiple conditions.
  */
-export declare const search: (filePath: string, operator: ComparisonOperator | ComparisonOperator[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[], logicalOperator?: "and" | "or", searchIn?: Set<number>, fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | Schema, limit?: number, offset?: number, readWholeFile?: boolean, secretKey?: string | Buffer) => Promise<[Record<number, string | number | boolean | null | (string | number | boolean | null)[]> | null, number, Set<number> | null]>;
+export declare const search: (filePath: string, operator: ComparisonOperator | ComparisonOperator[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[], logicalOperator?: "and" | "or", searchIn?: Set<number>, field?: Field & {
+    databasePath?: string;
+}, limit?: number, offset?: number, readWholeFile?: boolean) => Promise<[Record<number, string | number | boolean | null | (string | number | boolean | null)[]> | null, number, Set<number> | null]>;
 /**
  * Asynchronously calculates the sum of numerical values from specified lines in a file.
  *

package/dist/file.js

@@ -5,6 +5,7 @@ import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { createGunzip, createGzip } from "node:zlib";
 import Inison from "inison";
+import { globalConfig, } from "./index.js";
 import { detectFieldType, isArrayOfObjects, isNumber, isObject, isStringified, } from "./utils.js";
 import { compare, encodeID, exec, gunzip, gzip } from "./utils.server.js";
 export const lock = async (folderPath, prefix) => {
@@ -131,34 +132,39 @@ const unSecureString = (input) => {
  * Handles different data types and structures, including nested arrays.
  *
  * @param value - The value to be decoded, can be string, number, or array.
- * @param fieldType - Optional type of the field to guide decoding (e.g., 'number', 'boolean').
+ * @param field - Field object config.
  * @param fieldChildrenType - Optional type for children elements, used for arrays.
- * @param secretKey - Optional secret key for decoding, can be string or Buffer.
  * @returns Decoded value, transformed according to the specified field type(s).
  */
-const decodeHelper = (value, fieldType, fieldChildrenType, secretKey) => {
-    if (Array.isArray(value) && fieldType !== "array")
-        return value.map((v) => decodeHelper(v, fieldType, fieldChildrenType, secretKey));
-    switch (fieldType) {
+const decodeHelper = (value, field) => {
+    if (Array.isArray(value) && field.type !== "array")
+        return value.map((v) => decodeHelper(v, field));
+    switch (field.type) {
         case "number":
             return isNumber(value) ? Number(value) : null;
         case "boolean":
             return typeof value === "string" ? value === "true" : Boolean(value);
         case "array":
             if (!Array.isArray(value))
-                return [value];
-            if (fieldChildrenType && !isArrayOfObjects(fieldChildrenType))
-                return fieldChildrenType
-                    ? value.map((v) => decode(v, Array.isArray(fieldChildrenType)
-                        ? detectFieldType(v, fieldChildrenType)
-                        : fieldChildrenType, undefined, secretKey))
-                    : value;
+                value = [value];
+            if (field.children && !isArrayOfObjects(field.children))
+                return value.map((v) => decode(v, {
+                    ...field,
+                    type: Array.isArray(field.children)
+                        ? detectFieldType(v, field.children)
+                        : field.children,
+                }));
             break;
         case "table":
-        case "id":
-            return isNumber(value) && secretKey
-                ? encodeID(value, secretKey)
+            return isNumber(value) &&
+                (!field.table ||
+                    !field.databasePath ||
+                    !globalConfig[field.databasePath].tables.get(field.table).config
+                        .decodeID)
+                ? encodeID(value)
                 : value;
+        case "id":
+            return isNumber(value) ? encodeID(value) : value;
         default:
             return value;
     }
@@ -168,25 +174,21 @@ const decodeHelper = (value, fieldType, fieldChildrenType, secretKey) => {
  * Handles different formats of input, including strings, numbers, and their array representations.
  *
  * @param input - The input to be decoded, can be a string, number, or null.
- * @param fieldType - Optional type of the field to guide decoding (e.g., 'number', 'boolean').
- * @param fieldChildrenType - Optional type for child elements in array inputs.
- * @param secretKey - Optional secret key for decoding, can be a string or Buffer.
+ * @param field - Field object config.
  * @returns Decoded value as a string, number, boolean, or array of these, or null if no fieldType or input is null/empty.
  */
-export const decode = (input, fieldType, fieldChildrenType, secretKey) => {
-    if (!fieldType)
-        return null;
+export const decode = (input, field) => {
     if (input === null || input === "")
         return undefined;
     // Detect the fieldType based on the input and the provided array of possible types.
-    if (Array.isArray(fieldType))
-        fieldType = detectFieldType(String(input), fieldType);
+    if (Array.isArray(field.type))
+        field.type = detectFieldType(String(input), field.type);
     // Decode the input using the decodeHelper function.
     return decodeHelper(typeof input === "string"
         ? isStringified(input)
             ? Inison.unstringify(input)
             : unSecureString(input)
-        : input, fieldType, fieldChildrenType, secretKey);
+        : input, field);
 };
 function _groupIntoRanges(arr, action = "p") {
     if (arr.length === 0)
@@ -211,7 +213,7 @@ function _groupIntoRanges(arr, action = "p") {
     ranges.push(start === end ? `${start}` : `${start},${end}`);
     return ranges.map((range) => `${range}${action}`).join(";");
 }
-export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, secretKey, readWholeFile = false) {
+export async function get(filePath, lineNumbers, field, readWholeFile = false) {
     let fileHandle = null;
     try {
         fileHandle = await open(filePath, "r");
@@ -220,7 +222,7 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
         if (!lineNumbers) {
             for await (const line of rl) {
                 linesCount++;
-                lines[linesCount] = decode(line, fieldType, fieldChildrenType, secretKey);
+                lines[linesCount] = decode(line, field);
             }
         }
         else if (lineNumbers == -1) {
@@ -229,7 +231,7 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
                 ? `zcat ${escapedFilePath} | sed -n '$p'`
                 : `sed -n '$p' ${escapedFilePath}`, foundedLine = (await exec(command)).stdout.trimEnd();
             if (foundedLine)
-                lines[linesCount] = decode(foundedLine, fieldType, fieldChildrenType, secretKey);
+                lines[linesCount] = decode(foundedLine, field);
         }
         else {
             lineNumbers = Array.isArray(lineNumbers) ? lineNumbers : [lineNumbers];
@@ -241,7 +243,7 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
                     linesCount++;
                     if (!lineNumbersArray.has(linesCount))
                         continue;
-                    lines[linesCount] = decode(line, fieldType, fieldChildrenType, secretKey);
+                    lines[linesCount] = decode(line, field);
                     lineNumbersArray.delete(linesCount);
                 }
                 return [lines, linesCount];
@@ -252,7 +254,7 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
                 : `sed -n '${_groupIntoRanges(lineNumbers)}' ${escapedFilePath}`, foundedLines = (await exec(command)).stdout.trimEnd().split("\n");
             let index = 0;
             for (const line of foundedLines) {
-                lines[lineNumbers[index]] = decode(line, fieldType, fieldChildrenType, secretKey);
+                lines[lineNumbers[index]] = decode(line, field);
                 index++;
             }
         }
@@ -504,19 +506,17 @@ export const remove = async (filePath, linesToDelete) => {
  * @param operator - Comparison operator(s) for evaluation (e.g., '=', '!=', '>', '<').
  * @param comparedAtValue - Value(s) to compare each line against.
  * @param logicalOperator - Optional logical operator ('and' or 'or') for combining multiple comparisons.
- * @param fieldType - Optional type of the field to guide comparison.
- * @param fieldChildrenType - Optional type for child elements in array inputs.
+ * @param field - Field object config.
  * @param limit - Optional limit on the number of results to return.
  * @param offset - Optional offset to start returning results from.
  * @param readWholeFile - Flag to indicate whether to continue reading the file after reaching the limit.
- * @param secretKey - Optional secret key for decoding, can be a string or Buffer.
  * @returns Promise resolving to a tuple:
  *   1. Record of line numbers and their content that match the criteria or null if none.
  *   2. The count of found items or processed items based on the 'readWholeFile' flag.
  *
  * Note: Decodes each line for comparison and can handle complex queries with multiple conditions.
  */
-export const search = async (filePath, operator, comparedAtValue, logicalOperator, searchIn, fieldType, fieldChildrenType, limit, offset, readWholeFile, secretKey) => {
+export const search = async (filePath, operator, comparedAtValue, logicalOperator, searchIn, field, limit, offset, readWholeFile) => {
     // Initialize a Map to store the matching lines with their line numbers.
     const matchingLines = {};
     // Initialize counters for line number, found items, and processed items.
@@ -526,10 +526,10 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
     const meetsConditions = (value) => (Array.isArray(operator) &&
         Array.isArray(comparedAtValue) &&
         ((logicalOperator === "or" &&
-            operator.some((single_operator, index) => compare(single_operator, value, comparedAtValue[index], fieldType))) ||
-            operator.every((single_operator, index) => compare(single_operator, value, comparedAtValue[index], fieldType)))) ||
+            operator.some((single_operator, index) => compare(single_operator, value, comparedAtValue[index], field.type))) ||
+            operator.every((single_operator, index) => compare(single_operator, value, comparedAtValue[index], field.type)))) ||
         (!Array.isArray(operator) &&
-            compare(operator, value, comparedAtValue, fieldType));
+            compare(operator, value, comparedAtValue, field.type));
     try {
         // Open the file for reading.
         fileHandle = await open(filePath, "r");
@@ -544,7 +544,7 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
                 (!searchIn.has(linesCount) || searchIn.has(-linesCount)))
                 continue;
             // Decode the line for comparison.
-            const decodedLine = decode(line, fieldType, fieldChildrenType, secretKey);
+            const decodedLine = decode(line, field);
             // Check if the line meets the specified conditions based on comparison and logical operators.
             const doesMeetCondition = (Array.isArray(decodedLine) &&
                 decodedLine.flat().some(meetsConditions)) ||
@@ -600,7 +600,7 @@ export const sum = async (filePath, lineNumbers) => {
                 linesCount++;
                 if (!lineNumbersArray.has(linesCount))
                     continue;
-                sum += +(decode(line, "number") ?? 0);
+                sum += +(decode(line, { key: "BLABLA", type: "number" }) ?? 0);
                 lineNumbersArray.delete(linesCount);
                 if (!lineNumbersArray.size)
                     break;
@@ -608,7 +608,7 @@ export const sum = async (filePath, lineNumbers) => {
         }
         else
             for await (const line of rl)
-                sum += +(decode(line, "number") ?? 0);
+                sum += +(decode(line, { key: "BLABLA", type: "number" }) ?? 0);
         return sum;
     }
     finally {
@@ -636,7 +636,7 @@ export const max = async (filePath, lineNumbers) => {
                 linesCount++;
                 if (!lineNumbersArray.has(linesCount))
                     continue;
-                const lineContentNum = +(decode(line, "number") ?? 0);
+                const lineContentNum = +(decode(line, { key: "BLABLA", type: "number" }) ?? 0);
                 if (lineContentNum > max)
                     max = lineContentNum;
                 lineNumbersArray.delete(linesCount);
@@ -646,7 +646,7 @@ export const max = async (filePath, lineNumbers) => {
         }
         else
             for await (const line of rl) {
-                const lineContentNum = +(decode(line, "number") ?? 0);
+                const lineContentNum = +(decode(line, { key: "BLABLA", type: "number" }) ?? 0);
                 if (lineContentNum > max)
                     max = lineContentNum;
             }
@@ -677,7 +677,7 @@ export const min = async (filePath, lineNumbers) => {
                 linesCount++;
                 if (!lineNumbersArray.has(linesCount))
                     continue;
-                const lineContentNum = +(decode(line, "number") ?? 0);
+                const lineContentNum = +(decode(line, { key: "BLABLA", type: "number" }) ?? 0);
                 if (lineContentNum < min)
                     min = lineContentNum;
                 lineNumbersArray.delete(linesCount);
@@ -687,7 +687,7 @@ export const min = async (filePath, lineNumbers) => {
         }
         else
             for await (const line of rl) {
-                const lineContentNum = +(decode(line, "number") ?? 0);
+                const lineContentNum = +(decode(line, { key: "BLABLA", type: "number" }) ?? 0);
                 if (lineContentNum < min)
                     min = lineContentNum;
             }

package/dist/index.d.ts

@@ -53,13 +53,18 @@ declare global {
 }
 export type ErrorCodes = "GROUP_UNIQUE" | "FIELD_UNIQUE" | "FIELD_REQUIRED" | "NO_SCHEMA" | "TABLE_EMPTY" | "INVALID_ID" | "INVALID_TYPE" | "INVALID_PARAMETERS" | "NO_ENV" | "TABLE_EXISTS" | "TABLE_NOT_EXISTS" | "INVALID_REGEX_MATCH";
 export type ErrorLang = "en" | "ar" | "fr" | "es";
+export declare const globalConfig: {
+    [database: string]: {
+        tables?: Map<string, TableObject>;
+    };
+} & {
+    salt?: string | Buffer;
+};
 export default class Inibase {
     pageInfo: Record<string, pageInfo>;
     language: ErrorLang;
-    salt: Buffer;
+    fileExtension: string;
     private databasePath;
-    private fileExtension;
-    private tablesMap;
     private uniqueMap;
     private totalItems;
     constructor(database: string, mainFolder?: string, language?: ErrorLang);

package/dist/index.js

@@ -10,13 +10,12 @@ import * as Utils from "./utils.js";
 import * as UtilsServer from "./utils.server.js";
 // hide ExperimentalWarning glob()
 process.removeAllListeners("warning");
+export const globalConfig = {};
 export default class Inibase {
     pageInfo;
     language;
-    salt;
-    databasePath;
     fileExtension = ".txt";
-    tablesMap;
+    databasePath;
     uniqueMap;
     totalItems;
     constructor(database, mainFolder = ".", language = "en") {
@@ -27,11 +26,11 @@ export default class Inibase {
             if (existsSync(".env") &&
                 readFileSync(".env").includes("INIBASE_SECRET="))
                 throw this.createError("NO_ENV");
-            this.salt = scryptSync(randomBytes(16), randomBytes(16), 32);
-            appendFileSync(".env", `\nINIBASE_SECRET=${this.salt.toString("hex")}\n`);
+            globalConfig.salt = scryptSync(randomBytes(16), randomBytes(16), 32);
+            appendFileSync(".env", `\nINIBASE_SECRET=${globalConfig.salt.toString("hex")}\n`);
         }
         else
-            this.salt = Buffer.from(process.env.INIBASE_SECRET, "hex");
+            globalConfig.salt = Buffer.from(process.env.INIBASE_SECRET, "hex");
     }
     static errorMessages = {
         en: {
@@ -112,7 +111,7 @@ export default class Inibase {
         return error;
     }
     clear() {
-        this.tablesMap = new Map();
+        globalConfig[this.databasePath] = { tables: new Map() };
         this.totalItems = new Map();
         this.pageInfo = {};
         this.uniqueMap = new Map();
@@ -120,9 +119,9 @@ export default class Inibase {
     getFileExtension(tableName) {
         let mainExtension = this.fileExtension;
         // TODO: ADD ENCRYPTION
-        // if(this.tablesMap.get(tableName).config.encryption)
+        // if(globalConfig[this.databasePath].tables.get(tableName).config.encryption)
         // 	mainExtension += ".enc"
-        if (this.tablesMap.get(tableName).config.compression)
+        if (globalConfig[this.databasePath].tables.get(tableName).config.compression)
             mainExtension += ".gz";
         return mainExtension;
     }
@@ -134,9 +133,7 @@ export default class Inibase {
                 Utils.isArrayOfObjects(field.children))
                 Utils.deepMerge(RETURN, this._schemaToIdsPath(tableName, field.children, `${(prefix ?? "") + field.key}.`));
             else if (field.id)
-                RETURN[Utils.isValidID(field.id)
-                    ? UtilsServer.decodeID(field.id, this.salt)
-                    : field.id] = `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`;
+                RETURN[Utils.isValidID(field.id) ? UtilsServer.decodeID(field.id) : field.id] = `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`;
         return RETURN;
     }
     /**
@@ -170,7 +167,7 @@ export default class Inibase {
         }
         if (schema) {
             const lastSchemaID = { value: 0 };
-            await writeFile(join(tablePath, "schema.json"), JSON.stringify(UtilsServer.addIdToSchema(schema, lastSchemaID, this.salt), null, 2));
+            await writeFile(join(tablePath, "schema.json"), JSON.stringify(UtilsServer.addIdToSchema(schema, lastSchemaID), null, 2));
             await writeFile(join(tablePath, `${lastSchemaID.value}.schema`), "");
         }
         else
@@ -206,7 +203,7 @@ export default class Inibase {
             };
             if (await File.isExists(join(tablePath, "schema.json"))) {
                 // update columns files names based on field id
-                schema = UtilsServer.addIdToSchema(schema, lastSchemaID, this.salt);
+                schema = UtilsServer.addIdToSchema(schema, lastSchemaID);
                 if (table.schema?.length) {
                     const replaceOldPathes = Utils.findChangedProperties(this._schemaToIdsPath(tableName, table.schema), this._schemaToIdsPath(tableName, schema));
                     if (replaceOldPathes)
@@ -217,7 +214,7 @@ export default class Inibase {
                 }
             }
             else
-                schema = UtilsServer.addIdToSchema(schema, lastSchemaID, this.salt);
+                schema = UtilsServer.addIdToSchema(schema, lastSchemaID);
             await writeFile(join(tablePath, "schema.json"), JSON.stringify(schema, null, 2));
             if (schemaIdFilePath)
                 await rename(schemaIdFilePath, join(tablePath, `${lastSchemaID.value}.schema`));
@@ -291,7 +288,7 @@ export default class Inibase {
                     await this.replaceStringInFile(schemaPath, `"table": "${tableName}"`, `"table": "${config.name}"`);
             }
         }
-        this.tablesMap.delete(tableName);
+        globalConfig[this.databasePath].tables.delete(tableName);
     }
     /**
      * Get table schema and config
@@ -303,8 +300,8 @@ export default class Inibase {
         const tablePath = join(this.databasePath, tableName);
         if (!(await File.isExists(tablePath)))
             throw this.createError("TABLE_NOT_EXISTS", tableName);
-        if (!this.tablesMap.has(tableName))
-            this.tablesMap.set(tableName, {
+        if (!globalConfig[this.databasePath].tables.has(tableName))
+            globalConfig[this.databasePath].tables.set(tableName, {
                 schema: await this.getTableSchema(tableName, encodeIDs),
                 config: {
                     compression: await File.isExists(join(tablePath, ".compression.config")),
@@ -313,7 +310,7 @@ export default class Inibase {
                     decodeID: await File.isExists(join(tablePath, ".decodeID.config")),
                 },
             });
-        return this.tablesMap.get(tableName);
+        return globalConfig[this.databasePath].tables.get(tableName);
     }
     async getTableSchema(tableName, encodeIDs = true) {
         const tablePath = join(this.databasePath, tableName);
@@ -345,7 +342,7 @@ export default class Inibase {
         ];
         if (!encodeIDs)
             return schema;
-        return UtilsServer.encodeSchemaID(schema, this.salt);
+        return UtilsServer.encodeSchemaID(schema);
     }
     async throwErrorIfTableEmpty(tableName) {
         const table = await this.getTable(tableName, false);
@@ -370,11 +367,7 @@ export default class Inibase {
                         throw this.createError("FIELD_REQUIRED", field.key);
                     continue;
                 }
-                if (!Utils.validateFieldType(data[field.key], field.type, (field.type === "array" || field.type === "object") &&
-                    field.children &&
-                    !Utils.isArrayOfObjects(field.children)
-                    ? field.children
-                    : undefined))
+                if (!Utils.validateFieldType(data[field.key], field))
                     throw this.createError("INVALID_TYPE", [
                         field.key,
                         (Array.isArray(field.type) ? field.type.join(", ") : field.type) +
@@ -432,7 +425,7 @@ export default class Inibase {
     async validateData(tableName, data, skipRequiredField = false) {
         const clonedData = structuredClone(data);
         // Skip ID and (created|updated)At
-        this._validateData(clonedData, this.tablesMap.get(tableName).schema.slice(1, -2), skipRequiredField);
+        this._validateData(clonedData, globalConfig[this.databasePath].tables.get(tableName).schema.slice(1, -2), skipRequiredField);
         await this.checkUnique(tableName);
     }
     cleanObject(obj) {
@@ -473,12 +466,12 @@ export default class Inibase {
                             Utils.isNumber(value.id)))
                         return Utils.isNumber(value.id)
                             ? Number(value.id)
-                            : UtilsServer.decodeID(value.id, this.salt);
+                            : UtilsServer.decodeID(value.id);
                 }
                 else if (Utils.isValidID(value) || Utils.isNumber(value))
                     return Utils.isNumber(value)
                         ? Number(value)
-                        : UtilsServer.decodeID(value, this.salt);
+                        : UtilsServer.decodeID(value);
                 break;
             case "password":
                 return Utils.isPassword(value)
@@ -493,7 +486,7 @@ export default class Inibase {
             case "id":
                 return Utils.isNumber(value)
                     ? value
-                    : UtilsServer.decodeID(value, this.salt);
+                    : UtilsServer.decodeID(value);
             case "json": {
                 if (typeof value === "string" && Utils.isStringified(value))
                     return value;
@@ -513,7 +506,7 @@ export default class Inibase {
     }
     async checkUnique(tableName) {
         const tablePath = join(this.databasePath, tableName);
-        const flattenSchema = Utils.flattenSchema(this.tablesMap.get(tableName).schema);
+        const flattenSchema = Utils.flattenSchema(globalConfig[this.databasePath].tables.get(tableName).schema);
         function hasDuplicates(setA, setB) {
             for (const value of setA)
                 if (setB.has(value))
@@ -529,7 +522,7 @@ export default class Inibase {
                 index++;
                 const field = flattenSchema.find(({ id }) => id === columnID);
                 fieldsKeys.push(field.key);
-                const [_, totalLines, lineNumbers] = await File.search(join(tablePath, `${field.key}${this.getFileExtension(tableName)}`), "[]", Array.from(values), undefined, valueObject.exclude, field.type, field.children, 1, undefined, false, this.salt);
+                const [_, totalLines, lineNumbers] = await File.search(join(tablePath, `${field.key}${this.getFileExtension(tableName)}`), "[]", Array.from(values), undefined, valueObject.exclude, { ...field, databasePath: this.databasePath }, 1, undefined, false);
                 if (totalLines > 0) {
                     if (valueObject.columnsValues.size === 1 ||
                         (valueObject.columnsValues.size === index &&
@@ -727,9 +720,14 @@ export default class Inibase {
     async processSimpleField(tableName, field, linesNumber, RETURN, _options, prefix) {
         const fieldPath = join(this.databasePath, tableName, `${prefix ?? ""}${field.key}${this.getFileExtension(tableName)}`);
         if (await File.isExists(fieldPath)) {
-            const items = await File.get(fieldPath, linesNumber, field.key === "id" && this.tablesMap.get(tableName).config.decodeID
-                ? "number"
-                : field.type, field.children, this.salt);
+            const items = await File.get(fieldPath, linesNumber, {
+                ...field,
+                type: field.key === "id" &&
+                    globalConfig[this.databasePath].tables.get(tableName).config.decodeID
+                    ? "number"
+                    : field.type,
+                databasePath: this.databasePath,
+            });
             if (items) {
                 for (const [index, item] of Object.entries(items)) {
                     if (typeof item === "undefined")
@@ -875,7 +873,10 @@ export default class Inibase {
             (await File.isExists(join(this.databasePath, field.table)))) {
             const fieldPath = join(this.databasePath, tableName, `${prefix ?? ""}${field.key}${this.getFileExtension(tableName)}`);
             if (await File.isExists(fieldPath)) {
-                const itemsIDs = await File.get(fieldPath, linesNumber, field.type, field.children, this.salt);
+                const itemsIDs = (await File.get(fieldPath, linesNumber, {
+                    ...field,
+                    databasePath: this.databasePath,
+                }));
                 const isArrayField = this.isArrayField(field.type);
                 if (itemsIDs) {
                     const searchableIDs = new Map();
@@ -888,26 +889,29 @@ export default class Inibase {
                             searchableIDs.set(lineNumber, lineContent);
                     }
                     if (searchableIDs.size) {
-                        const items = await this.get(field.table, isArrayField
-                            ? Array.from(new Set(Array.from(searchableIDs.values()).flat())).flat()
-                            : Array.from(new Set(searchableIDs.values())), {
+                        const items = await this.get(field.table, Array.from(new Set(isArrayField
+                            ? Array.from(searchableIDs.values()).flat()
+                            : searchableIDs.values())).flat(), {
                             ...options,
                             perPage: Number.POSITIVE_INFINITY,
                             columns: options.columns
                                 ?.filter((column) => column.includes(`${field.key}.`))
                                 .map((column) => column.replace(`${field.key}.`, "")),
                         });
-                        if (items) {
-                            for (const [lineNumber, lineContent] of searchableIDs.entries()) {
-                                const foundedItem = isArrayField
-                                    ? Utils.isArrayOfArrays(lineContent)
-                                        ? lineContent.map((item) => items.filter(({ id }) => item.includes(id)))
-                                        : lineContent.flatMap((item) => items.find(({ id }) => item === id))
-                                    : items.find(({ id }) => id === lineContent);
-                                if (foundedItem)
-                                    RETURN[lineNumber][field.key] = foundedItem;
-                            }
-                        }
+                        for (const [lineNumber, lineContent] of searchableIDs.entries())
+                            RETURN[lineNumber][field.key] = isArrayField
+                                ? Utils.isArrayOfArrays(lineContent)
+                                    ? lineContent.map((item) => items
+                                        ? items.filter(({ id }) => item.includes(id))
+                                        : {
+                                            id: item,
+                                        })
+                                    : lineContent.flatMap((item) => items
+                                        ? items.find(({ id }) => item === id)
+                                        : { id: item })
+                                : (items?.find(({ id }) => id === lineContent) ?? {
+                                    id: lineContent,
+                                });
                     }
                 }
             }
@@ -950,7 +954,7 @@ export default class Inibase {
             criteria = Utils.toDotNotation(criteria, ["or", "and"]);
             let index = -1;
             for await (const [key, value] of Object.entries(criteria)) {
-                const field = Utils.getField(key, this.tablesMap.get(tableName).schema);
+                const field = Utils.getField(key, globalConfig[this.databasePath].tables.get(tableName).schema);
                 index++;
                 let searchOperator = undefined;
                 let searchComparedAtValue = undefined;
@@ -1008,9 +1012,7 @@ export default class Inibase {
                     searchOperator = "=";
                     searchComparedAtValue = value;
                 }
-                const [searchResult, totalLines, linesNumbers] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, allTrue ? searchIn : undefined, field?.type, field?.children, options.perPage, (options.page - 1) * options.perPage + 1, true, field.key === "id" && this.tablesMap.get(tableName).config.decodeID
-                    ? undefined
-                    : this.salt);
+                const [searchResult, totalLines, linesNumbers] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, allTrue ? searchIn : undefined, { ...field, databasePath: this.databasePath }, options.perPage, (options.page - 1) * options.perPage + 1, true);
                 if (searchResult) {
                     const formatedSearchResult = Object.fromEntries(Object.entries(searchResult).map(([id, value]) => {
                         const nestedObj = {};
@@ -1128,13 +1130,13 @@ export default class Inibase {
                     .map((column) => [column, true]);
             let cacheKey = "";
             // Criteria
-            if (this.tablesMap.get(tableName).config.cache)
+            if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                 cacheKey = UtilsServer.hashString(inspect(sortArray, { sorted: true }));
             if (where) {
                 const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
                 if (!lineNumbers?.length)
                     return null;
-                const itemsIDs = Object.values((await File.get(join(tablePath, `id${this.getFileExtension(tableName)}`), lineNumbers, "number", undefined, this.salt)) ?? {}).map(Number);
+                const itemsIDs = Object.values((await File.get(join(tablePath, `id${this.getFileExtension(tableName)}`), lineNumbers, { key: "BLABLA", type: "number" })) ?? {}).map(Number);
                 awkCommand = `awk '${itemsIDs.map((id) => `$1 == ${id}`).join(" || ")}'`;
             }
             else
@@ -1157,9 +1159,7 @@ export default class Inibase {
                 .map(([key, ascending], i) => {
                 const field = Utils.getField(key, schema);
                 if (field)
-                    return `-k${i + index},${i + index}${Utils.isFieldType(["id", "number", "date"], field.type, field.children)
-                        ? "n"
-                        : ""}${!ascending ? "r" : ""}`;
+                    return `-k${i + index},${i + index}${Utils.isFieldType(field, ["id", "number", "date"]) ? "n" : ""}${!ascending ? "r" : ""}`;
                 return "";
             })
                 .join(" ");
@@ -1168,7 +1168,7 @@ export default class Inibase {
                 if (cacheKey)
                     await File.lock(join(tablePath, ".tmp"), cacheKey);
                 // Combine && Execute the commands synchronously
-                let lines = (await UtilsServer.exec(this.tablesMap.get(tableName).config.cache
+                let lines = (await UtilsServer.exec(globalConfig[this.databasePath].tables.get(tableName).config.cache
                     ? (await File.isExists(join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)))
                         ? `${awkCommand} '${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}'`
                         : `${pasteCommand} | ${sortCommand} -o '${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}' && ${awkCommand} '${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}'`
@@ -1192,10 +1192,11 @@ export default class Inibase {
                         const field = Utils.getField(parse(fileName).name, schema);
                         if (field) {
                             if (field.key === "id" &&
-                                this.tablesMap.get(tableName).config.decodeID)
+                                globalConfig[this.databasePath].tables.get(tableName).config
+                                    .decodeID)
                                 outputObject[field.key] = splitedFileColumns[index];
                             else
-                                outputObject[field.key] = File.decode(splitedFileColumns[index], field?.type, field?.children, this.salt);
+                                outputObject[field.key] = File.decode(splitedFileColumns[index], { ...field, databasePath: this.databasePath });
                         }
                     });
                     return outputObject;
@@ -1223,7 +1224,8 @@ export default class Inibase {
         }
         else if (((Array.isArray(where) && where.every(Utils.isNumber)) ||
             Utils.isNumber(where)) &&
-            (_whereIsLinesNumbers || !this.tablesMap.get(tableName).config.decodeID)) {
+            (_whereIsLinesNumbers ||
+                !globalConfig[this.databasePath].tables.get(tableName).config.decodeID)) {
             // "where" in this case, is the line(s) number(s) and not id(s)
             let lineNumbers = where;
             if (!Array.isArray(lineNumbers))
@@ -1238,7 +1240,7 @@ export default class Inibase {
                 RETURN = RETURN[0];
         }
         else if ((!_whereIsLinesNumbers &&
-            this.tablesMap.get(tableName).config.decodeID &&
+            globalConfig[this.databasePath].tables.get(tableName).config.decodeID &&
             ((Array.isArray(where) && where.every(Utils.isNumber)) ||
                 Utils.isNumber(where))) ||
             (Array.isArray(where) && where.every(Utils.isValidID)) ||
@@ -1246,7 +1248,7 @@ export default class Inibase {
             let Ids = where;
             if (!Array.isArray(Ids))
                 Ids = [Ids];
-            const [lineNumbers, countItems] = await File.search(join(tablePath, `id${this.getFileExtension(tableName)}`), "[]", Ids.map((id) => Utils.isNumber(id) ? Number(id) : UtilsServer.decodeID(id, this.salt)), undefined, undefined, "number", undefined, Ids.length, 0, !this.totalItems.has(`${tableName}-*`), this.salt);
+            const [lineNumbers, countItems] = await File.search(join(tablePath, `id${this.getFileExtension(tableName)}`), "[]", Ids.map((id) => Utils.isNumber(id) ? Number(id) : UtilsServer.decodeID(id)), undefined, undefined, { key: "BLABLA", type: "number" }, Ids.length, 0, !this.totalItems.has(`${tableName}-*`));
             if (!lineNumbers)
                 return null;
             if (!this.totalItems.has(`${tableName}-*`))
@@ -1267,7 +1269,7 @@ export default class Inibase {
         else if (Utils.isObject(where)) {
             let cachedFilePath = "";
             // Criteria
-            if (this.tablesMap.get(tableName).config.cache) {
+            if (globalConfig[this.databasePath].tables.get(tableName).config.cache) {
                 cachedFilePath = join(tablePath, ".cache", `${UtilsServer.hashString(inspect(where, { sorted: true }))}${this.fileExtension}`);
                 if (await File.isExists(cachedFilePath)) {
                     const cachedItems = (await readFile(cachedFilePath, "utf8")).split(",");
@@ -1292,9 +1294,9 @@ export default class Inibase {
                 const alreadyExistsColumnsIDs = Utils.flattenSchema(schema)
                     .filter(({ key }) => alreadyExistsColumns.includes(key))
                     .map(({ id }) => id);
-                RETURN = Object.values(Utils.deepMerge(LineNumberDataMap, await this.processSchemaData(tableName, Utils.filterSchema(schema, ({ id, type, children }) => !alreadyExistsColumnsIDs.includes(id) ||
-                    Utils.isFieldType("table", type, children)), Object.keys(LineNumberDataMap).map(Number), options)));
-                if (this.tablesMap.get(tableName).config.cache)
+                RETURN = Object.values(Utils.deepMerge(LineNumberDataMap, await this.processSchemaData(tableName, Utils.filterSchema(schema, (field) => !alreadyExistsColumnsIDs.includes(field.id) ||
+                    Utils.isFieldType(field, "table")), Object.keys(LineNumberDataMap).map(Number), options)));
+                if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                     await writeFile(cachedFilePath, Array.from(linesNumbers).join(","));
             }
         }
@@ -1323,7 +1325,7 @@ export default class Inibase {
             };
         const tablePath = join(this.databasePath, tableName);
         await this.getTable(tableName);
-        if (!this.tablesMap.get(tableName).schema)
+        if (!globalConfig[this.databasePath].tables.get(tableName).schema)
             throw this.createError("NO_SCHEMA", tableName);
         if (!returnPostedData)
             returnPostedData = false;
@@ -1352,25 +1354,25 @@ export default class Inibase {
                 clonedData.createdAt = Date.now();
                 clonedData.updatedAt = undefined;
             }
-            clonedData = this.formatData(clonedData, this.tablesMap.get(tableName).schema, false);
-            const pathesContents = this.joinPathesContents(tableName, this.tablesMap.get(tableName).config.prepend
+            clonedData = this.formatData(clonedData, globalConfig[this.databasePath].tables.get(tableName).schema, false);
+            const pathesContents = this.joinPathesContents(tableName, globalConfig[this.databasePath].tables.get(tableName).config.prepend
                 ? Array.isArray(clonedData)
                     ? clonedData.toReversed()
                     : clonedData
                 : clonedData);
-            await Promise.allSettled(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(this.tablesMap.get(tableName).config.prepend
+            await Promise.allSettled(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(globalConfig[this.databasePath].tables.get(tableName).config.prepend
                 ? await File.prepend(path, content)
                 : await File.append(path, content))));
             await Promise.allSettled(renameList
                 .filter(([_, filePath]) => filePath)
                 .map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
-            if (this.tablesMap.get(tableName).config.cache)
+            if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                 await this.clearCache(tableName);
             const currentValue = this.totalItems.get(`${tableName}-*`) || 0;
             this.totalItems.set(`${tableName}-*`, currentValue + (Array.isArray(data) ? data.length : 1));
             await rename(paginationFilePath, join(tablePath, `${lastId}-${this.totalItems.get(`${tableName}-*`)}.pagination`));
             if (returnPostedData)
-                return this.get(tableName, this.tablesMap.get(tableName).config.prepend
+                return this.get(tableName, globalConfig[this.databasePath].tables.get(tableName).config.prepend
                     ? Array.isArray(clonedData)
                         ? clonedData.map((_, index) => index + 1).toReversed()
                         : 1
@@ -1381,10 +1383,10 @@ export default class Inibase {
                         : this.totalItems.get(`${tableName}-*`), options, !Utils.isArrayOfObjects(clonedData), // return only one item if data is not array of objects
                 undefined, true);
             return Array.isArray(clonedData)
-                ? (this.tablesMap.get(tableName).config.prepend
+                ? (globalConfig[this.databasePath].tables.get(tableName).config.prepend
                     ? clonedData.toReversed()
-                    : clonedData).map(({ id }) => UtilsServer.encodeID(id, this.salt))
-                : UtilsServer.encodeID(clonedData.id, this.salt);
+                    : clonedData).map(({ id }) => UtilsServer.encodeID(id))
+                : UtilsServer.encodeID(clonedData.id);
         }
         finally {
             if (renameList.length)
@@ -1412,7 +1414,7 @@ export default class Inibase {
                 return this.put(tableName, clonedData, clonedData.id, options, returnUpdatedData);
             }
             await this.validateData(tableName, clonedData, true);
-            clonedData = this.formatData(clonedData, this.tablesMap.get(tableName).schema, true);
+            clonedData = this.formatData(clonedData, globalConfig[this.databasePath].tables.get(tableName).schema, true);
             const pathesContents = this.joinPathesContents(tableName, {
                 ...(({ id, ...restOfData }) => restOfData)(clonedData),
                 updatedAt: Date.now(),
@@ -1427,7 +1429,7 @@ export default class Inibase {
                 await Promise.allSettled(renameList
                     .filter(([_, filePath]) => filePath)
                     .map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
-                if (this.tablesMap.get(tableName).config.cache)
+                if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                     await this.clearCache(join(tablePath, ".cache"));
                 if (returnUpdatedData)
                     return await this.get(tableName, undefined, options);
@@ -1440,10 +1442,11 @@ export default class Inibase {
         }
         else if (((Array.isArray(where) && where.every(Utils.isNumber)) ||
             Utils.isNumber(where)) &&
-            (_whereIsLinesNumbers || !this.tablesMap.get(tableName).config.decodeID)) {
+            (_whereIsLinesNumbers ||
+                !globalConfig[this.databasePath].tables.get(tableName).config.decodeID)) {
             // "where" in this case, is the line(s) number(s) and not id(s)
             await this.validateData(tableName, clonedData, true);
-            clonedData = this.formatData(clonedData, this.tablesMap.get(tableName).schema, true);
+            clonedData = this.formatData(clonedData, globalConfig[this.databasePath].tables.get(tableName).schema, true);
             const pathesContents = Object.fromEntries(Object.entries(this.joinPathesContents(tableName, Array.isArray(clonedData)
                 ? clonedData.map((item) => ({
                     ...item,
@@ -1465,7 +1468,7 @@ export default class Inibase {
                 await Promise.allSettled(renameList
                     .filter(([_, filePath]) => filePath)
                     .map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
-                if (this.tablesMap.get(tableName).config.cache)
+                if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                     await this.clearCache(tableName);
                 if (returnUpdatedData)
                     return this.get(tableName, where, options, !Array.isArray(where), undefined, true);
@@ -1477,7 +1480,7 @@ export default class Inibase {
             }
         }
         else if ((!_whereIsLinesNumbers &&
-            this.tablesMap.get(tableName).config.decodeID &&
+            globalConfig[this.databasePath].tables.get(tableName).config.decodeID &&
             ((Array.isArray(where) && where.every(Utils.isNumber)) ||
                 Utils.isNumber(where))) ||
             (Array.isArray(where) && where.every(Utils.isValidID)) ||
@@ -1520,7 +1523,7 @@ export default class Inibase {
                 await Promise.all((await readdir(tablePath))
                     ?.filter((fileName) => fileName.endsWith(this.getFileExtension(tableName)))
                     .map(async (file) => unlink(join(tablePath, file))));
-                if (this.tablesMap.get(tableName).config.cache)
+                if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                     await this.clearCache(tableName);
                 await rename(paginationFilePath, join(tablePath, `${pagination[0]}-0.pagination`));
                 return true;
@@ -1531,7 +1534,8 @@ export default class Inibase {
         }
         if (((Array.isArray(where) && where.every(Utils.isNumber)) ||
             Utils.isNumber(where)) &&
-            (_whereIsLinesNumbers || !this.tablesMap.get(tableName).config.decodeID)) {
+            (_whereIsLinesNumbers ||
+                !globalConfig[this.databasePath].tables.get(tableName).config.decodeID)) {
             // "where" in this case, is the line(s) number(s) and not id(s)
             const files = (await readdir(tablePath))?.filter((fileName) => fileName.endsWith(this.getFileExtension(tableName)));
             if (files.length) {
@@ -1559,7 +1563,7 @@ export default class Inibase {
                         await Promise.all((await readdir(tablePath))
                             ?.filter((fileName) => fileName.endsWith(this.getFileExtension(tableName)))
                             .map(async (file) => unlink(join(tablePath, file))));
-                    if (this.tablesMap.get(tableName).config.cache)
+                    if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                         await this.clearCache(tableName);
                     await rename(paginationFilePath, join(tablePath, `${pagination[0]}-${pagination[1] - (Array.isArray(where) ? where.length : 1)}.pagination`));
                     return true;
@@ -1572,7 +1576,7 @@ export default class Inibase {
             }
         }
         if ((!_whereIsLinesNumbers &&
-            this.tablesMap.get(tableName).config.decodeID &&
+            globalConfig[this.databasePath].tables.get(tableName).config.decodeID &&
             ((Array.isArray(where) && where.every(Utils.isNumber)) ||
                 Utils.isNumber(where))) ||
             (Array.isArray(where) && where.every(Utils.isValidID)) ||

package/dist/utils.d.ts

@@ -156,18 +156,17 @@ export declare const findChangedProperties: (obj1: Record<string, string>, obj2:
  * @returns The detected field type as a string, or undefined if no matching type is found.
  */
 export declare const detectFieldType: (input: any, availableTypes: FieldType[]) => FieldType | undefined;
-export declare const isFieldType: (compareAtType: string | string[], fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | Schema) => boolean;
+export declare const isFieldType: (field: Field, compareAtType: string | string[]) => boolean;
 export declare const flattenSchema: (schema: Schema, keepParents?: boolean) => Schema;
 export declare const filterSchema: (schema: Schema, callback: (arg0: Field) => boolean) => Field[];
 /**
  * Validates if the given value matches the specified field type(s).
  *
  * @param value - The value to be validated.
- * @param fieldType - The expected field type or an array of possible field types.
- * @param fieldChildrenType - Optional; the expected type(s) of children elements, used if the field type is an array.
+ * @param field - Field object config.
  * @returns A boolean indicating whether the value matches the specified field type(s).
  */
-export declare const validateFieldType: (value: any, fieldType: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[]) => boolean;
+export declare const validateFieldType: (value: any, field: Field) => boolean;
 export declare const FormatObjectCriteriaValue: (value: string) => [ComparisonOperator, string | number | boolean | null | (string | number | null)[]];
 /**
  * Get field from schema

package/dist/utils.js

@@ -256,6 +256,8 @@ export const detectFieldType = (input, availableTypes) => {
                     return "number";
                 if (availableTypes.includes("string") && String(input).at(0) === "0")
                     return "string";
+                if (availableTypes.includes("id"))
+                    return "id";
             }
             else if (typeof input === "string") {
                 if (availableTypes.includes("table") && isValidID(input))
@@ -282,30 +284,28 @@ export const detectFieldType = (input, availableTypes) => {
             return "array";
     return undefined;
 };
-export const isFieldType = (compareAtType, fieldType, fieldChildrenType) => {
-    if (fieldType) {
-        if (Array.isArray(fieldType)) {
-            if (fieldType.some((type) => Array.isArray(compareAtType)
-                ? compareAtType.includes(type)
-                : compareAtType === type))
-                return true;
-        }
-        else if ((Array.isArray(compareAtType) && compareAtType.includes(fieldType)) ||
-            compareAtType === fieldType)
+export const isFieldType = (field, compareAtType) => {
+    if (Array.isArray(field.type)) {
+        if (field.type.some((type) => Array.isArray(compareAtType)
+            ? compareAtType.includes(type)
+            : compareAtType === type))
             return true;
     }
-    if (fieldChildrenType) {
-        if (Array.isArray(fieldChildrenType)) {
-            if (!isArrayOfObjects(fieldChildrenType)) {
-                if (fieldChildrenType.some((type) => Array.isArray(compareAtType)
+    else if ((Array.isArray(compareAtType) && compareAtType.includes(field.type)) ||
+        compareAtType === field.type)
+        return true;
+    if (field.children) {
+        if (Array.isArray(field.children)) {
+            if (!isArrayOfObjects(field.children)) {
+                if (field.children.some((type) => Array.isArray(compareAtType)
                     ? compareAtType.includes(type)
                     : compareAtType === type))
                     return true;
             }
         }
         else if ((Array.isArray(compareAtType) &&
-            compareAtType.includes(fieldChildrenType)) ||
-            compareAtType === fieldChildrenType)
+            compareAtType.includes(field.children)) ||
+            compareAtType === field.children)
             return true;
     }
     return false;
@@ -339,32 +339,35 @@ export const filterSchema = (schema, callback) => schema.filter((field) => {
  * Validates if the given value matches the specified field type(s).
  *
  * @param value - The value to be validated.
- * @param fieldType - The expected field type or an array of possible field types.
- * @param fieldChildrenType - Optional; the expected type(s) of children elements, used if the field type is an array.
+ * @param field - Field object config.
  * @returns A boolean indicating whether the value matches the specified field type(s).
  */
-export const validateFieldType = (value, fieldType, fieldChildrenType) => {
+export const validateFieldType = (value, field) => {
     if (value === null)
         return true;
-    if (Array.isArray(fieldType)) {
-        const detectedFieldType = detectFieldType(value, fieldType);
+    if (Array.isArray(field.type)) {
+        const detectedFieldType = detectFieldType(value, field.type);
         if (!detectedFieldType)
             return false;
-        fieldType = detectedFieldType;
+        field.type = detectedFieldType;
     }
-    if (fieldType === "array" && fieldChildrenType)
+    if (field.type === "array" && field.children)
         return (Array.isArray(value) &&
-            value.every((v) => {
-                let _fieldChildrenType = fieldChildrenType;
-                if (Array.isArray(_fieldChildrenType)) {
-                    const detectedFieldType = detectFieldType(v, _fieldChildrenType);
-                    if (!detectedFieldType)
-                        return false;
-                    _fieldChildrenType = detectedFieldType;
-                }
-                return validateFieldType(v, _fieldChildrenType);
-            }));
-    switch (fieldType) {
+            (isArrayOfObjects(field.children) ||
+                value.every((v) => {
+                    let _fieldChildrenType = field.children;
+                    if (Array.isArray(_fieldChildrenType)) {
+                        const detectedFieldType = detectFieldType(v, _fieldChildrenType);
+                        if (!detectedFieldType)
+                            return false;
+                        _fieldChildrenType = detectedFieldType;
+                    }
+                    return validateFieldType(v, {
+                        key: "BLABLA",
+                        type: _fieldChildrenType,
+                    });
+                })));
+    switch (field.type) {
         case "string":
             return isString(value);
         case "password":

package/dist/utils.server.d.ts

@@ -1,7 +1,7 @@
-import { exec as execSync, execFile as execFileSync } from "node:child_process";
+import { execFile as execFileSync, exec as execSync } from "node:child_process";
 import { gunzip as gunzipSync, gzip as gzipSync } from "node:zlib";
-import type { ComparisonOperator, Field, FieldType, Schema } from "./index.js";
 import RE2 from "re2";
+import type { ComparisonOperator, Field, FieldType, Schema } from "./index.js";
 export declare const exec: typeof execSync.__promisify__;
 export declare const execFile: typeof execFileSync.__promisify__;
 export declare const gzip: typeof gzipSync.__promisify__;
@@ -21,30 +21,27 @@ export declare const hashPassword: (password: string) => string;
  * @returns A boolean indicating whether the input password matches the hashed password.
  */
 export declare const comparePassword: (hash: string, password: string) => boolean;
-export declare const encodeID: (id: number | string, secretKeyOrSalt: string | number | Buffer) => string;
-export declare const decodeID: (input: string, secretKeyOrSalt: string | number | Buffer) => number;
-export declare const extractIdsFromSchema: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => number[];
+export declare const encodeID: (id: number | string) => string;
+export declare const decodeID: (input: string) => number;
+export declare const extractIdsFromSchema: (schema: Schema) => number[];
 /**
  * Finds the last ID number in a schema, potentially decoding it if encrypted.
  *
  * @param schema - The schema to search, defined as an array of schema objects.
- * @param secretKeyOrSalt - The secret key or salt for decoding an encrypted ID, can be a string, number, or Buffer.
  * @returns The last ID number in the schema, decoded if necessary.
  */
-export declare const findLastIdNumber: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => number;
+export declare const findLastIdNumber: (schema: Schema) => number;
 /**
  * Adds or updates IDs in a schema, encoding them using a provided secret key or salt.
  *
  * @param schema - The schema to update, defined as an array of schema objects.
  * @param startWithID - An object containing the starting ID for generating new IDs.
- * @param secretKeyOrSalt - The secret key or salt for encoding IDs, can be a string, number, or Buffer.
- * @param encodeIDs - If true, IDs will be encoded, else they will remain as numbers.
  * @returns The updated schema with encoded IDs.
  */
 export declare const addIdToSchema: (schema: Schema, startWithID: {
     value: number;
-}, secretKeyOrSalt: string | number | Buffer, encodeIDs?: boolean) => Field[];
-export declare const encodeSchemaID: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => Schema;
+}) => Field[];
+export declare const encodeSchemaID: (schema: Schema) => Schema;
 export declare const hashString: (str: string) => string;
 /**
  * Evaluates a comparison between two values based on a specified operator and field types.
@@ -52,7 +49,7 @@ export declare const hashString: (str: string) => string;
  * @param operator - The comparison operator (e.g., '=', '!=', '>', '<', '>=', '<=', '[]', '![]', '*', '!*').
  * @param originalValue - The value to compare, can be a single value or an array of values.
  * @param comparedValue - The value or values to compare against.
- * @param fieldType - Optional type of the field to guide comparison (e.g., 'password', 'boolean').
+ * @param field - Field object config.
  * @param fieldChildrenType - Optional type for child elements in array inputs.
  * @returns boolean - Result of the comparison operation.
  *
@@ -64,7 +61,7 @@ export declare const compare: (operator: ComparisonOperator, originalValue: stri
  *
  * @param originalValue - The original value.
  * @param comparedValue - The value to compare against.
- * @param fieldType - Type of the field.
+ * @param field - Field object config.
  * @returns boolean - Result of the equality check.
  */
 export declare const isEqual: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType) => boolean;

package/dist/utils.server.js

@@ -1,9 +1,10 @@
-import { exec as execSync, execFile as execFileSync } from "node:child_process";
+import { execFile as execFileSync, exec as execSync } from "node:child_process";
 import { createCipheriv, createDecipheriv, createHash, randomBytes, scryptSync, } from "node:crypto";
-import { gunzip as gunzipSync, gzip as gzipSync } from "node:zlib";
 import { promisify } from "node:util";
-import { detectFieldType, isArrayOfObjects, isNumber, isPassword, isValidID, } from "./utils.js";
+import { gunzip as gunzipSync, gzip as gzipSync } from "node:zlib";
 import RE2 from "re2";
+import { globalConfig } from "./index.js";
+import { detectFieldType, isArrayOfObjects, isNumber, isPassword, isValidID, } from "./utils.js";
 export const exec = promisify(execSync);
 export const execFile = promisify(execFileSync);
 export const gzip = promisify(gzipSync);
@@ -38,11 +39,11 @@ export const comparePassword = (hash, password) => {
 // Cache for derived keys if using scrypt
 const derivedKeyCache = new Map();
 // Helper function to create cipher or decipher
-const getKeyAndIv = (secretKeyOrSalt) => {
-    if (Buffer.isBuffer(secretKeyOrSalt)) {
-        return { key: secretKeyOrSalt, iv: secretKeyOrSalt.subarray(0, 16) };
+const getKeyAndIv = () => {
+    if (Buffer.isBuffer(globalConfig.salt)) {
+        return { key: globalConfig.salt, iv: globalConfig.salt.subarray(0, 16) };
     }
-    const cacheKey = secretKeyOrSalt.toString();
+    const cacheKey = globalConfig.salt.toString();
     let key = derivedKeyCache.get(cacheKey);
     if (!key) {
         key = scryptSync(cacheKey, `${INIBASE_SECRET}`, 32);
@@ -53,27 +54,25 @@ const getKeyAndIv = (secretKeyOrSalt) => {
 // Ensure the environment variable is read once
 const INIBASE_SECRET = process.env.INIBASE_SECRET ?? "inibase";
 // Optimized encodeID
-export const encodeID = (id, secretKeyOrSalt) => {
-    const { key, iv } = getKeyAndIv(secretKeyOrSalt);
+export const encodeID = (id) => {
+    const { key, iv } = getKeyAndIv();
     const cipher = createCipheriv("aes-256-cbc", key, iv);
     return cipher.update(id.toString(), "utf8", "hex") + cipher.final("hex");
 };
 // Optimized decodeID
-export const decodeID = (input, secretKeyOrSalt) => {
-    const { key, iv } = getKeyAndIv(secretKeyOrSalt);
+export const decodeID = (input) => {
+    const { key, iv } = getKeyAndIv();
     const decipher = createDecipheriv("aes-256-cbc", key, iv);
     return Number(decipher.update(input, "hex", "utf8") + decipher.final("utf8"));
 };
 // Function to recursively flatten an array of objects and their nested children
-export const extractIdsFromSchema = (schema, secretKeyOrSalt) => {
+export const extractIdsFromSchema = (schema) => {
     const result = [];
     for (const field of schema) {
         if (field.id)
-            result.push(typeof field.id === "number"
-                ? field.id
-                : decodeID(field.id, secretKeyOrSalt));
+            result.push(typeof field.id === "number" ? field.id : decodeID(field.id));
         if (field.children && isArrayOfObjects(field.children))
-            result.push(...extractIdsFromSchema(field.children, secretKeyOrSalt));
+            result.push(...extractIdsFromSchema(field.children));
     }
     return result;
 };
@@ -81,35 +80,24 @@ export const extractIdsFromSchema = (schema, secretKeyOrSalt) => {
  * Finds the last ID number in a schema, potentially decoding it if encrypted.
  *
  * @param schema - The schema to search, defined as an array of schema objects.
- * @param secretKeyOrSalt - The secret key or salt for decoding an encrypted ID, can be a string, number, or Buffer.
  * @returns The last ID number in the schema, decoded if necessary.
  */
-export const findLastIdNumber = (schema, secretKeyOrSalt) => Math.max(...extractIdsFromSchema(schema, secretKeyOrSalt));
+export const findLastIdNumber = (schema) => Math.max(...extractIdsFromSchema(schema));
 /**
  * Adds or updates IDs in a schema, encoding them using a provided secret key or salt.
  *
  * @param schema - The schema to update, defined as an array of schema objects.
  * @param startWithID - An object containing the starting ID for generating new IDs.
- * @param secretKeyOrSalt - The secret key or salt for encoding IDs, can be a string, number, or Buffer.
- * @param encodeIDs - If true, IDs will be encoded, else they will remain as numbers.
  * @returns The updated schema with encoded IDs.
  */
-export const addIdToSchema = (schema, startWithID, secretKeyOrSalt, encodeIDs) => {
+export const addIdToSchema = (schema, startWithID) => {
     function _addIdToField(field) {
         if (!field.id) {
             startWithID.value++;
-            field.id = encodeIDs
-                ? encodeID(startWithID.value, secretKeyOrSalt)
-                : startWithID.value;
-        }
-        else {
-            if (isValidID(field.id)) {
-                if (!encodeIDs)
-                    field.id = decodeID(field.id, secretKeyOrSalt);
-            }
-            else if (encodeIDs)
-                field.id = encodeID(field.id, secretKeyOrSalt);
+            field.id = encodeID(startWithID.value);
         }
+        else
+            field.id = isValidID(field.id) ? decodeID(field.id) : encodeID(field.id);
         if ((field.type === "array" || field.type === "object") &&
             isArrayOfObjects(field.children))
             field.children = _addIdToSchema(field.children);
@@ -118,13 +106,13 @@ export const addIdToSchema = (schema, startWithID, secretKeyOrSalt, encodeIDs) =
     const _addIdToSchema = (schema) => schema.map(_addIdToField);
     return _addIdToSchema(schema);
 };
-export const encodeSchemaID = (schema, secretKeyOrSalt) => schema.map((field) => ({
+export const encodeSchemaID = (schema) => schema.map((field) => ({
     ...field,
-    id: isNumber(field.id) ? encodeID(field.id, secretKeyOrSalt) : field.id,
+    id: isNumber(field.id) ? encodeID(field.id) : field.id,
     ...(field.children
         ? isArrayOfObjects(field.children)
             ? {
-                children: encodeSchemaID(field.children, secretKeyOrSalt),
+                children: encodeSchemaID(field.children),
             }
             : { children: field.children }
         : {}),
@@ -136,7 +124,7 @@ export const hashString = (str) => createHash("sha256").update(str).digest("hex"
  * @param operator - The comparison operator (e.g., '=', '!=', '>', '<', '>=', '<=', '[]', '![]', '*', '!*').
  * @param originalValue - The value to compare, can be a single value or an array of values.
  * @param comparedValue - The value or values to compare against.
- * @param fieldType - Optional type of the field to guide comparison (e.g., 'password', 'boolean').
+ * @param field - Field object config.
  * @param fieldChildrenType - Optional type for child elements in array inputs.
  * @returns boolean - Result of the comparison operation.
  *
@@ -199,7 +187,7 @@ const compareNonNullValues = (originalValue, comparedValue, comparator) => {
  *
  * @param originalValue - The original value.
  * @param comparedValue - The value to compare against.
- * @param fieldType - Type of the field.
+ * @param field - Field object config.
  * @returns boolean - Result of the equality check.
  */
 export const isEqual = (originalValue, comparedValue, fieldType) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",