inibase 1.1.3 → 1.1.5

package/README.md

@@ -26,6 +26,7 @@
 
 ```js
 import Inibase from "inibase";
+// const db = new Inibase("databaseName", ".", "es");
 const db = new Inibase("databaseName");
 
 // Get all items from "user" table

package/dist/file.js

@@ -108,6 +108,7 @@ const secureString = (input) => {
 export const encode = (input) => Array.isArray(input)
     ? input.every((_input) => _input === null ||
         _input === undefined ||
+        _input === "" ||
         (typeof _input === "string" && isStringified(_input)))
         ? `[${input.join(",")}]`
         : Inison.stringify(input)

package/dist/index.d.ts

@@ -50,19 +50,20 @@ declare global {
         entries<T extends object>(o: T): Entries<T>;
     }
 }
-export type ErrorCodes = "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";
+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 default class Inibase {
     pageInfo: Record<string, pageInfo>;
+    language: ErrorLang;
     salt: Buffer;
     private databasePath;
     private fileExtension;
     private tablesMap;
     private uniqueMap;
     private totalItems;
-    constructor(database: string, mainFolder?: string);
+    constructor(database: string, mainFolder?: string, language?: ErrorLang);
     private static errorMessages;
-    createError(name: ErrorCodes, variable?: string | number | (string | number)[], language?: ErrorLang): Error;
+    createError(name: ErrorCodes, variable?: string | number | (string | number)[]): Error;
     clear(): void;
     private getFileExtension;
     private _schemaToIdsPath;

package/dist/index.js

@@ -12,15 +12,17 @@ import * as UtilsServer from "./utils.server.js";
 process.removeAllListeners("warning");
 export default class Inibase {
     pageInfo;
+    language;
     salt;
     databasePath;
     fileExtension = ".txt";
     tablesMap;
     uniqueMap;
     totalItems;
-    constructor(database, mainFolder = ".") {
+    constructor(database, mainFolder = ".", language = "en") {
         this.databasePath = join(mainFolder, database);
         this.clear();
+        this.language = language;
         if (!process.env.INIBASE_SECRET) {
             if (existsSync(".env") &&
                 readFileSync(".env").includes("INIBASE_SECRET="))
@@ -37,6 +39,7 @@ export default class Inibase {
             TABLE_EXISTS: "Table {variable} already exists",
             TABLE_NOT_EXISTS: "Table {variable} doesn't exist",
             NO_SCHEMA: "Table {variable} does't have a schema",
+            GROUP_UNIQUE: "Group {variable} should be unique, got duplicated content in {variable}",
             FIELD_UNIQUE: "Field {variable} should be unique, got {variable} instead",
             FIELD_REQUIRED: "Field {variable} is required",
             INVALID_ID: "The given ID(s) is/are not valid(s)",
@@ -47,9 +50,57 @@ export default class Inibase {
                 ? "please run with '--env-file=.env'"
                 : "please use dotenv",
         },
+        ar: {
+            TABLE_EMPTY: "الجدول {variable} فارغ",
+            TABLE_EXISTS: "الجدول {variable} موجود بالفعل",
+            TABLE_NOT_EXISTS: "الجدول {variable} غير موجود",
+            NO_SCHEMA: "الجدول {variable} ليس لديه مخطط",
+            GROUP_UNIQUE: "المجموعة {variable} يجب أن تكون فريدة، تم العثور على محتوى مكرر في {variable}",
+            FIELD_UNIQUE: "الحقل {variable} يجب أن يكون فريدًا، تم العثور على {variable} بدلاً من ذلك",
+            FIELD_REQUIRED: "الحقل {variable} مطلوب",
+            INVALID_ID: "المعرف أو المعرفات المقدمة غير صالحة",
+            INVALID_TYPE: "من المتوقع أن يكون {variable} من النوع {variable}، لكن تم العثور على {variable} بدلاً من ذلك",
+            INVALID_PARAMETERS: "المعلمات المقدمة غير صالحة",
+            INVALID_REGEX_MATCH: "الحقل {variable} لا يتطابق مع النمط المتوقع",
+            NO_ENV: Number(process.versions.node.split(".").reduce((a, b) => a + b)) >= 26
+                ? "يرجى التشغيل باستخدام '--env-file=.env'"
+                : "يرجى استخدام dotenv",
+        },
+        fr: {
+            TABLE_EMPTY: "La table {variable} est vide",
+            TABLE_EXISTS: "La table {variable} existe déjà",
+            TABLE_NOT_EXISTS: "La table {variable} n'existe pas",
+            NO_SCHEMA: "La table {variable} n'a pas de schéma",
+            GROUP_UNIQUE: "Le groupe {variable} doit être unique, contenu dupliqué trouvé dans {variable}",
+            FIELD_UNIQUE: "Le champ {variable} doit être unique, trouvé {variable} à la place",
+            FIELD_REQUIRED: "Le champ {variable} est obligatoire",
+            INVALID_ID: "Le(s) ID donné(s) n'est/ne sont pas valide(s)",
+            INVALID_TYPE: "Attendu que {variable} soit de type {variable}, mais trouvé {variable} à la place",
+            INVALID_PARAMETERS: "Les paramètres donnés ne sont pas valides",
+            INVALID_REGEX_MATCH: "Le champ {variable} ne correspond pas au modèle attendu",
+            NO_ENV: Number(process.versions.node.split(".").reduce((a, b) => a + b)) >= 26
+                ? "veuillez exécuter avec '--env-file=.env'"
+                : "veuillez utiliser dotenv",
+        },
+        es: {
+            TABLE_EMPTY: "La tabla {variable} está vacía",
+            TABLE_EXISTS: "La tabla {variable} ya existe",
+            TABLE_NOT_EXISTS: "La tabla {variable} no existe",
+            NO_SCHEMA: "La tabla {variable} no tiene un esquema",
+            GROUP_UNIQUE: "El grupo {variable} debe ser único, se encontró contenido duplicado en {variable}",
+            FIELD_UNIQUE: "El campo {variable} debe ser único, se encontró {variable} en su lugar",
+            FIELD_REQUIRED: "El campo {variable} es obligatorio",
+            INVALID_ID: "El/los ID proporcionado(s) no es/son válido(s)",
+            INVALID_TYPE: "Se espera que {variable} sea {variable}, pero se encontró {variable} en su lugar",
+            INVALID_PARAMETERS: "Los parámetros proporcionados no son válidos",
+            INVALID_REGEX_MATCH: "El campo {variable} no coincide con el patrón esperado",
+            NO_ENV: Number(process.versions.node.split(".").reduce((a, b) => a + b)) >= 26
+                ? "por favor ejecute con '--env-file=.env'"
+                : "por favor use dotenv",
+        },
     };
-    createError(name, variable, language = "en") {
-        const errorMessage = Inibase.errorMessages[language]?.[name];
+    createError(name, variable) {
+        const errorMessage = Inibase.errorMessages[this.language]?.[name];
         if (!errorMessage)
             return new Error("ERR");
         const error = new Error(variable
@@ -332,6 +383,10 @@ export default class Inibase {
                     Utils.isArrayOfObjects(field.children))
                     this._validateData(data[field.key], field.children, skipRequiredField);
                 else {
+                    if (field.table &&
+                        Utils.isObject(data[field.key]) &&
+                        Object.hasOwn(data[field.key], "id"))
+                        data[field.key] = data[field.key].id;
                     if (field.regex) {
                         const regex = UtilsServer.getCachedRegex(field.regex);
                         if (!regex.test(data[field.key]))
@@ -366,8 +421,9 @@ export default class Inibase {
         }
     }
     async validateData(tableName, data, skipRequiredField = false) {
+        const clonedData = structuredClone(data);
         // Skip ID and (created|updated)At
-        this._validateData(data, this.tablesMap.get(tableName).schema.slice(1, -2), skipRequiredField);
+        this._validateData(clonedData, this.tablesMap.get(tableName).schema.slice(1, -2), skipRequiredField);
         await this.checkUnique(tableName);
     }
     cleanObject(obj) {
@@ -455,16 +511,24 @@ export default class Inibase {
             let index = 0;
             let shouldContinueParent = false; // Flag to manage parent loop continuation
             const mergedLineNumbers = new Set();
+            const fieldsKeys = [];
             for await (const [columnID, values] of valueObject.columnsValues) {
                 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);
                 if (totalLines > 0) {
                     if (valueObject.columnsValues.size === 1 ||
-                        hasDuplicates(lineNumbers, mergedLineNumbers)) {
+                        (valueObject.columnsValues.size === index &&
+                            hasDuplicates(lineNumbers, mergedLineNumbers))) {
                         this.uniqueMap = new Map();
+                        if (valueObject.columnsValues.size > 1)
+                            throw this.createError("GROUP_UNIQUE", [
+                                fieldsKeys.join(" & "),
+                                field.key,
+                            ]);
                         throw this.createError("FIELD_UNIQUE", [
-                            field.key,
+                            fieldsKeys.join(" & "),
                             Array.from(values).join(", "),
                         ]);
                     }
@@ -489,8 +553,9 @@ export default class Inibase {
             for (const field of schema) {
                 if (!Object.hasOwn(clonedData, field.key)) {
                     if (formatOnlyAvailiableKeys)
-                        continue;
-                    RETURN[field.key] = this.getDefaultValue(field);
+                        RETURN[field.key] = "undefined";
+                    else
+                        RETURN[field.key] = this.getDefaultValue(field);
                     continue;
                 }
                 if (Array.isArray(clonedData[field.key]) &&
@@ -551,8 +616,12 @@ export default class Inibase {
             else if (Utils.isArrayOfArrays(value) &&
                 value.every(Utils.isArrayOfObjects))
                 Object.assign(RETURN, this._CombineData(this._combineObjectsToArray(value.map(this._combineObjectsToArray)), `${(prefix ?? "") + key}.`));
-            else
-                RETURN[(prefix ?? "") + key] = File.encode(value);
+            else if (value !== "undefined")
+                RETURN[(prefix ?? "") + key] = File.encode(Array.isArray(value)
+                    ? value.map((_value) => typeof _value === "string" && _value === "undefined"
+                        ? ""
+                        : _value)
+                    : value);
         }
         return RETURN;
     }
@@ -1331,16 +1400,17 @@ export default class Inibase {
             // "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);
-            const pathesContents = Object.fromEntries(Object.entries(this.joinPathesContents(tableName, Utils.isArrayOfObjects(clonedData)
+            const pathesContents = Object.fromEntries(Object.entries(this.joinPathesContents(tableName, Array.isArray(clonedData)
                 ? clonedData.map((item) => ({
                     ...item,
                     updatedAt: Date.now(),
                 }))
                 : { ...clonedData, updatedAt: Date.now() })).map(([path, content]) => [
                 path,
-                [...(Array.isArray(where) ? where : [where])].reduce((obj, lineNum, index) => Object.assign(obj, {
-                    [lineNum]: Array.isArray(content) ? content[index] : content,
-                }), {}),
+                (Array.isArray(where) ? where : [where]).reduce((obj, lineNum, index) => {
+                    obj[lineNum] = Array.isArray(content) ? content[index] : content;
+                    return obj;
+                }, {}),
             ]));
             const keys = UtilsServer.hashString(Object.keys(pathesContents)
                 .map((path) => path.replaceAll(this.getFileExtension(tableName), ""))

package/package.json

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