inibase 1.0.0-rc.53 → 1.0.0-rc.55

package/README.md

@@ -109,7 +109,7 @@ Ps: Testing by default with `user` table, with username, email, password fields
 - [ ] TO-DO:
   - [x] Improve caching
   - [ ] Commenting the code
-  - [ ] Add property "unique" for schema fields
+  - [x] Add property "unique" for schema fields
   - [ ] Add Backup feature (generate a tar.gz)
   - [ ] Add Custom field validation property to schema (using RegEx?)
 - [ ] Features:

package/dist/index.d.ts

@@ -40,7 +40,7 @@ declare global {
         entries<T extends object>(o: T): Entries<T>;
     }
 }
-export type ErrorCodes = "FIELD_UNIQUE" | "FIELD_REQUIRED" | "NO_SCHEMA" | "NO_ITEMS" | "NO_RESULTS" | "INVALID_ID" | "INVALID_TYPE" | "INVALID_PARAMETERS";
+export type ErrorCodes = "FIELD_UNIQUE" | "FIELD_REQUIRED" | "NO_SCHEMA" | "NO_ITEMS" | "NO_RESULTS" | "INVALID_ID" | "INVALID_TYPE" | "INVALID_PARAMETERS" | "NO_ENV";
 export type ErrorLang = "en";
 export default class Inibase {
     folder: string;

package/dist/index.js

@@ -1,14 +1,14 @@
 import { unlink, rename, mkdir, readdir } from "node:fs/promises";
-import { existsSync, appendFileSync } from "node:fs";
+import { existsSync, appendFileSync, readFileSync } from "node:fs";
 import { join, parse } from "node:path";
 import { scryptSync, randomBytes } from "node:crypto";
 import { Worker } from "node:worker_threads";
+import { inspect } from "node:util";
+import Inison from "inison";
 import * as File from "./file.js";
 import * as Utils from "./utils.js";
 import * as UtilsServer from "./utils.server.js";
 import * as Config from "./config.js";
-import { inspect } from "node:util";
-import Inison from "inison";
 export default class Inibase {
     folder;
     database;
@@ -26,7 +26,10 @@ export default class Inibase {
         this.pageInfo = _pageInfo;
         this.isThreadEnabled = _isThreadEnabled;
         this.checkIFunique = {};
-        if (!existsSync(".env") || !process.env.INIBASE_SECRET) {
+        if (!process.env.INIBASE_SECRET) {
+            if (existsSync(".env") &&
+                readFileSync(".env").includes("INIBASE_SECRET="))
+                this.throwError("NO_ENV");
             this.salt = scryptSync(randomBytes(16), randomBytes(16), 32);
             appendFileSync(".env", `\nINIBASE_SECRET=${this.salt.toString("hex")}\n`);
         }
@@ -44,6 +47,9 @@ export default class Inibase {
                 INVALID_ID: "The given ID(s) is/are not valid(s)",
                 INVALID_TYPE: "Expect {variable} to be {variable}, got {variable} instead",
                 INVALID_PARAMETERS: "The given parameters are not valid",
+                NO_ENV: Number(process.versions.node.split(".").reduce((a, b) => a + b)) >= 26
+                    ? "please run with '--env-file=.env'"
+                    : "please use dotenv",
             },
             // Add more languages and error messages as needed
         };
@@ -329,12 +335,14 @@ export default class Inibase {
                         }),
                     ]
                     : null;
-            case "object":
+            case "object": {
                 if (!field.children || !Utils.isArrayOfObjects(field.children))
                     return null;
-                return Utils.combineObjects(field.children.map((f) => ({
-                    [f.key]: this.getDefaultValue(f),
-                })));
+                const RETURN = {};
+                for (const f of field.children)
+                    RETURN[f.key] = this.getDefaultValue(f);
+                return RETURN;
+            }
             case "boolean":
                 return false;
             default:
@@ -923,16 +931,14 @@ export default class Inibase {
             });
             try {
                 await File.lock(join(tablePath, ".tmp"));
-                await Promise.all(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(this.isThreadEnabled
-                    ? await File.createWorker("replace", [
-                        path,
-                        Utils.combineObjects([...Array(totalItems)].map((_, i) => ({
-                            [`${i + 1}`]: content,
-                        }))),
-                    ])
-                    : await File.replace(path, Utils.combineObjects([...Array(totalItems)].map((_, i) => ({
-                        [`${i + 1}`]: content,
-                    })))))));
+                await Promise.all(Object.entries(pathesContents).map(async ([path, content]) => {
+                    const replacementObject = {};
+                    for (const index of [...Array(totalItems)].keys())
+                        replacementObject[`${index + 1}`] = content;
+                    renameList.push(this.isThreadEnabled
+                        ? await File.createWorker("replace", [path, replacementObject])
+                        : await File.replace(path, replacementObject));
+                }));
                 await Promise.all(renameList.map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
                 if (Config.isCacheEnabled)
                     await this.clearCache(join(tablePath, ".cache"));
@@ -1022,7 +1028,7 @@ export default class Inibase {
             const files = (await readdir(tablePath))?.filter((fileName) => fileName.endsWith(".inib"));
             if (files.length) {
                 if (!_id)
-                    _id = Object.entries((await File.get(join(tablePath, "id.inib"), where, "number", undefined, this.salt)) ?? {}).map(([_key, id]) => UtilsServer.encodeID(Number(id), this.salt));
+                    _id = Object.entries((await File.get(join(tablePath, "id.inib"), where, "number", undefined, this.salt)) ?? {}).map(([_, id]) => UtilsServer.encodeID(id, this.salt));
                 if (!_id.length)
                     throw this.throwError("NO_RESULTS", tableName);
                 try {

package/dist/utils.d.ts

@@ -45,15 +45,6 @@ export declare const isObject: (obj: any) => obj is Record<any, any>;
  * Note: Performs a deep merge for nested objects. Non-object properties are directly overwritten.
  */
 export declare const deepMerge: (target: any, source: any) => any;
-/**
- * Combines an array of objects into a single object. If the same key exists in multiple objects, the values are merged.
- *
- * @param arr - Array of objects to be combined.
- * @returns Record<string, any> - A single object with combined keys and values.
- *
- * Note: Handles nested objects by recursively combining them. Non-object values with the same key are merged into arrays.
- */
-export declare const combineObjects: (arr: Record<string, any>[]) => Record<string, any>;
 /**
  * Type guard function to check if the input is a number.
  *

package/dist/utils.js

@@ -56,48 +56,6 @@ export const deepMerge = (target, source) => {
     }
     return target;
 };
-/**
- * Combines an array of objects into a single object. If the same key exists in multiple objects, the values are merged.
- *
- * @param arr - Array of objects to be combined.
- * @returns Record<string, any> - A single object with combined keys and values.
- *
- * Note: Handles nested objects by recursively combining them. Non-object values with the same key are merged into arrays.
- */
-export const combineObjects = (arr) => {
-    const result = {};
-    for (const obj of arr) {
-        for (const key in obj) {
-            if (Object.hasOwn(obj, key)) {
-                const existingValue = result[key];
-                const newValue = obj[key];
-                if (isObject(existingValue) &&
-                    isObject(newValue) &&
-                    existingValue !== null &&
-                    existingValue !== undefined &&
-                    newValue !== null &&
-                    newValue !== undefined) {
-                    // If both values are objects, recursively combine them
-                    result[key] = combineObjects([existingValue, newValue]);
-                }
-                else {
-                    // If one or both values are not objects, overwrite the existing value
-                    result[key] =
-                        existingValue !== null && existingValue !== undefined
-                            ? Array.isArray(existingValue)
-                                ? Array.isArray(newValue)
-                                    ? [...existingValue, ...newValue]
-                                    : [...existingValue, newValue]
-                                : Array.isArray(newValue)
-                                    ? [existingValue, ...newValue]
-                                    : [existingValue, newValue]
-                            : newValue;
-                }
-            }
-        }
-    }
-    return result;
-};
 /**
  * Type guard function to check if the input is a number.
  *
@@ -178,11 +136,7 @@ export const isIP = (input) => /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$
  *
  * Note: Recognizes both boolean literals (true, false) and their string representations ("true", "false").
  */
-export const isBoolean = (input) => typeof input === "boolean" ||
-    input === "true" ||
-    input === "false" ||
-    input === true ||
-    input === false;
+export const isBoolean = (input) => typeof input === "boolean" || input === "true" || input === "false";
 /**
  * Type guard function to check if the input is a password based on a specific length criterion.
  *

package/dist/utils.server.js

@@ -217,7 +217,7 @@ export const isEqual = (originalValue, comparedAtValue, fieldType) => {
             return Number(originalValue) === Number(comparedAtValue);
         // Default comparison.
         default:
-            return originalValue === comparedAtValue;
+            return originalValue == comparedAtValue;
     }
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.53",
+  "version": "1.0.0-rc.55",
   "author": {
     "name": "Karim Amahtil",
     "email": "karim.amahtil@gmail.com"
@@ -87,7 +87,7 @@
   "scripts": {
     "build": "npx tsc",
     "test": "npx tsx watch --expose-gc --env-file=.env ./index.test",
-    "benchmark": "npx tsx watch --env-file=.env ./benchmark/index",
+    "benchmark": "npx tsx --env-file=.env ./benchmark/index",
     "benchmark:single": "npx tsx --expose-gc --env-file=.env ./benchmark/single",
     "benchmark:bulk": "npx tsx --expose-gc --env-file=.env ./benchmark/bulk"
   }