inibase 1.0.0-rc.95 → 1.0.0-rc.97

package/dist/index.d.ts

@@ -60,7 +60,7 @@ export default class Inibase {
     private checkIFunique;
     private totalItems;
     constructor(database: string, mainFolder?: string);
-    private throwError;
+    private Error;
     private getFileExtension;
     private _schemaToIdsPath;
     /**

package/dist/index.js

@@ -25,14 +25,14 @@ export default class Inibase {
         if (!process.env.INIBASE_SECRET) {
             if (existsSync(".env") &&
                 readFileSync(".env").includes("INIBASE_SECRET="))
-                throw this.throwError("NO_ENV");
+                throw this.Error("NO_ENV");
             this.salt = scryptSync(randomBytes(16), randomBytes(16), 32);
             appendFileSync(".env", `\nINIBASE_SECRET=${this.salt.toString("hex")}\n`);
         }
         else
             this.salt = Buffer.from(process.env.INIBASE_SECRET, "hex");
     }
-    throwError(code, variable, language = "en") {
+    Error(code, variable, language = "en") {
         const errorMessages = {
             en: {
                 FIELD_UNIQUE: "Field {variable} should be unique, got {variable} instead",
@@ -90,7 +90,7 @@ export default class Inibase {
     async createTable(tableName, schema, config) {
         const tablePath = join(this.databasePath, tableName);
         if (await File.isExists(tablePath))
-            throw this.throwError("TABLE_EXISTS", tableName);
+            throw this.Error("TABLE_EXISTS", tableName);
         await mkdir(join(tablePath, ".tmp"), { recursive: true });
         await mkdir(join(tablePath, ".cache"));
         // if config not set => load default global env config
@@ -228,7 +228,7 @@ export default class Inibase {
     async getTable(tableName) {
         const tablePath = join(this.databasePath, tableName);
         if (!(await File.isExists(tablePath)))
-            throw this.throwError("TABLE_NOT_EXISTS", tableName);
+            throw this.Error("TABLE_NOT_EXISTS", tableName);
         if (!this.tables[tableName])
             this.tables[tableName] = {
                 schema: await this.getTableSchema(tableName),
@@ -277,9 +277,9 @@ export default class Inibase {
     async throwErrorIfTableEmpty(tableName) {
         const table = await this.getTable(tableName);
         if (!table.schema)
-            throw this.throwError("NO_SCHEMA", tableName);
+            throw this.Error("NO_SCHEMA", tableName);
         if (!(await File.isExists(join(this.databasePath, tableName, `id${this.getFileExtension(tableName)}`))))
-            throw this.throwError("NO_ITEMS", tableName);
+            throw this.Error("NO_ITEMS", tableName);
         return table;
     }
     validateData(data, schema, skipRequiredField = false) {
@@ -290,18 +290,18 @@ export default class Inibase {
             for (const field of schema) {
                 if (!Object.hasOwn(data, field.key) ||
                     data[field.key] === null ||
-                    data[field.key] === undefined) {
+                    data[field.key] === undefined ||
+                    data[field.key] === "") {
                     if (field.required && !skipRequiredField)
-                        throw this.throwError("FIELD_REQUIRED", field.key);
+                        throw this.Error("FIELD_REQUIRED", field.key);
                     return;
                 }
-                if (Object.hasOwn(data, field.key) &&
-                    !Utils.validateFieldType(data[field.key], field.type, (field.type === "array" || field.type === "object") &&
-                        field.children &&
-                        !Utils.isArrayOfObjects(field.children)
-                        ? field.children
-                        : undefined))
-                    throw this.throwError("INVALID_TYPE", [
+                if (!Utils.validateFieldType(data[field.key], field.type, (field.type === "array" || field.type === "object") &&
+                    field.children &&
+                    !Utils.isArrayOfObjects(field.children)
+                    ? field.children
+                    : undefined))
+                    throw this.Error("INVALID_TYPE", [
                         field.key,
                         Array.isArray(field.type) ? field.type.join(", ") : field.type,
                         data[field.key],
@@ -328,11 +328,10 @@ export default class Inibase {
     }
     formatField(value, fieldType, fieldChildrenType, _formatOnlyAvailiableKeys) {
         if (Array.isArray(fieldType))
-            fieldType = (Utils.detectFieldType(value, fieldType) ??
-                fieldType[0]);
+            fieldType = Utils.detectFieldType(value, fieldType) ?? fieldType[0];
         if (!value)
             return null;
-        if (fieldType !== "array" && fieldType !== "json" && Array.isArray(value))
+        if (Array.isArray(value) && !["array", "json"].includes(fieldType))
             value = value[0];
         switch (fieldType) {
             case "array":
@@ -369,12 +368,6 @@ export default class Inibase {
                     : UtilsServer.hashPassword(String(value));
             case "number":
                 return Utils.isNumber(value) ? Number(value) : null;
-            case "date": {
-                if (Utils.isNumber(value))
-                    return value;
-                const dateToTimestamp = Date.parse(value);
-                return Number.isNaN(dateToTimestamp) ? null : dateToTimestamp;
-            }
             case "id":
                 return Utils.isNumber(value)
                     ? value
@@ -404,7 +397,7 @@ export default class Inibase {
                 continue;
             const [searchResult, totalLines] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), Array.isArray(values) ? "=" : "[]", values, undefined, field.type, field.children, 1, undefined, false, this.salt);
             if (searchResult && totalLines > 0)
-                throw this.throwError("FIELD_UNIQUE", [
+                throw this.Error("FIELD_UNIQUE", [
                     field.key,
                     Array.isArray(values) ? values.join(", ") : values,
                 ]);
@@ -702,13 +695,6 @@ export default class Inibase {
                         if (item !== null && item !== undefined)
                             RETURN[index][field.key] = item;
                     }
-                // else
-                // 	RETURN = Object.fromEntries(
-                // 		Object.entries(RETURN).map(([index, data]) => [
-                // 			index,
-                // 			{ ...data, [field.key]: this.getDefaultValue(field) },
-                // 		]),
-                // 	);
             }
         }
         return RETURN;
@@ -871,7 +857,7 @@ export default class Inibase {
         let RETURN;
         let schema = (await this.getTable(tableName)).schema;
         if (!schema)
-            throw this.throwError("NO_SCHEMA", tableName);
+            throw this.Error("NO_SCHEMA", tableName);
         if (!(await File.isExists(join(tablePath, `id${this.getFileExtension(tableName)}`))))
             return null;
         if (options.columns?.length)
@@ -1085,11 +1071,12 @@ export default class Inibase {
             };
         const tablePath = join(this.databasePath, tableName), schema = (await this.getTable(tableName)).schema;
         if (!schema)
-            throw this.throwError("NO_SCHEMA", tableName);
+            throw this.Error("NO_SCHEMA", tableName);
         if (!returnPostedData)
             returnPostedData = false;
-        let RETURN;
         const keys = UtilsServer.hashString(Object.keys(Array.isArray(data) ? data[0] : data).join("."));
+        // Skip Id and (created|updated)At
+        this.validateData(data, schema.slice(1, -2));
         let lastId = 0, renameList = [];
         try {
             await File.lock(join(tablePath, ".tmp"), keys);
@@ -1107,25 +1094,24 @@ export default class Inibase {
             else
                 this.totalItems[`${tableName}-*`] = 0;
             if (Utils.isArrayOfObjects(data))
-                RETURN = data.map(({ id, updatedAt, createdAt, ...rest }) => ({
-                    id: ++lastId,
-                    ...rest,
-                    createdAt: Date.now(),
-                }));
-            else
-                RETURN = (({ id, updatedAt, createdAt, ...rest }) => ({
-                    id: ++lastId,
-                    ...rest,
-                    createdAt: Date.now(),
-                }))(data);
-            this.validateData(RETURN, schema);
+                for (let index = 0; index < data.length; index++) {
+                    const element = data[index];
+                    element.id = ++lastId;
+                    element.createdAt = Date.now();
+                    element.updatedAt = undefined;
+                }
+            else {
+                data.id = ++lastId;
+                data.createdAt = Date.now();
+                data.updatedAt = undefined;
+            }
             await this.checkUnique(tableName, schema);
-            RETURN = this.formatData(RETURN, schema);
+            data = this.formatData(data, schema);
             const pathesContents = this.joinPathesContents(tableName, this.tables[tableName].config.prepend
-                ? Array.isArray(RETURN)
-                    ? RETURN.toReversed()
-                    : RETURN
-                : RETURN);
+                ? Array.isArray(data)
+                    ? data.toReversed()
+                    : data
+                : data);
             await Promise.all(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(this.tables[tableName].config.prepend
                 ? await File.prepend(path, content)
                 : await File.append(path, content))));
@@ -1133,17 +1119,19 @@ export default class Inibase {
             renameList = [];
             if (this.tables[tableName].config.cache)
                 await this.clearCache(tableName);
-            this.totalItems[`${tableName}-*`] += Array.isArray(RETURN)
-                ? RETURN.length
+            this.totalItems[`${tableName}-*`] += Array.isArray(data)
+                ? data.length
                 : 1;
             await writeFile(join(tablePath, ".cache", ".pagination"), `${lastId},${this.totalItems[`${tableName}-*`]}`);
             if (returnPostedData)
                 return this.get(tableName, this.tables[tableName].config.prepend
-                    ? Array.isArray(RETURN)
-                        ? RETURN.map((_, index) => index + 1).toReversed()
+                    ? Array.isArray(data)
+                        ? data.map((_, index) => index + 1).toReversed()
                         : 1
-                    : Array.isArray(RETURN)
-                        ? RETURN.map((_, index) => this.totalItems[`${tableName}-*`] - index).toReversed()
+                    : Array.isArray(data)
+                        ? data
+                            .map((_, index) => this.totalItems[`${tableName}-*`] - index)
+                            .toReversed()
                         : this.totalItems[`${tableName}-*`], options, !Utils.isArrayOfObjects(data));
         }
         finally {
@@ -1163,12 +1151,12 @@ export default class Inibase {
         if (!where) {
             if (Utils.isArrayOfObjects(data)) {
                 if (!data.every((item) => Object.hasOwn(item, "id") && Utils.isValidID(item.id)))
-                    throw this.throwError("INVALID_ID");
+                    throw this.Error("INVALID_ID");
                 return this.put(tableName, data, data.map(({ id }) => id), options, returnUpdatedData || undefined);
             }
             if (Object.hasOwn(data, "id")) {
                 if (!Utils.isValidID(data.id))
-                    throw this.throwError("INVALID_ID", data.id);
+                    throw this.Error("INVALID_ID", data.id);
                 return this.put(tableName, data, data.id, options, returnUpdatedData || undefined);
             }
             let totalItems;
@@ -1251,7 +1239,7 @@ export default class Inibase {
             return this.put(tableName, data, lineNumbers, options, returnUpdatedData || undefined);
         }
         else
-            throw this.throwError("INVALID_PARAMETERS");
+            throw this.Error("INVALID_PARAMETERS");
     }
     /**
      * Delete item(s) in a table
@@ -1314,7 +1302,7 @@ export default class Inibase {
             return this.delete(tableName, lineNumbers);
         }
         else
-            throw this.throwError("INVALID_PARAMETERS");
+            throw this.Error("INVALID_PARAMETERS");
         return false;
     }
     async sum(tableName, columns, where) {

package/dist/utils.d.ts

@@ -125,7 +125,7 @@ export declare const isPassword: (input: any) => input is string;
  * @param input - The input to be checked, can be of any type.
  * @returns A boolean indicating whether the input is a valid date.
  */
-export declare const isDate: (input: any) => boolean;
+export declare function isDate(input?: any): boolean;
 /**
  * Checks if the input is a valid ID.
  *

package/dist/utils.js

@@ -34,8 +34,8 @@ export const isArrayOfNulls = (input) => input.every((_input) => Array.isArray(_
  * Note: Checks if the input is non-null and either has 'Object' as its constructor name or is of type 'object' without being an array.
  */
 export const isObject = (obj) => obj != null &&
-    (obj.constructor.name === "Object" ||
-        (typeof obj === "object" && !Array.isArray(obj)));
+    ((typeof obj === "object" && !Array.isArray(obj)) ||
+        obj.constructor?.name === "Object");
 /**
  * Recursively merges properties from a source object into a target object. If a property exists in both, the source's value overwrites the target's.
  *
@@ -152,9 +152,20 @@ export const isPassword = (input) => typeof input === "string" && input.length =
  * @param input - The input to be checked, can be of any type.
  * @returns A boolean indicating whether the input is a valid date.
  */
-export const isDate = (input) => !Number.isNaN(new Date(input).getTime()) ||
-    !Number.isNaN(Date.parse(input)) ||
-    !!input.match(/\b\d{2}[/.-]\d{2}[/.-]\d{4}\b/);
+export function isDate(input) {
+    // Check if the input is null, undefined, or an empty string
+    if (input == null || input === "")
+        return false;
+    // Convert to number and check if it's a valid number
+    const numTimestamp = Number(input);
+    // Check if the converted number is NaN or not finite
+    if (Number.isNaN(numTimestamp) || !Number.isFinite(numTimestamp))
+        return false;
+    // Create a Date object from the timestamp
+    const date = new Date(numTimestamp);
+    // Check if the date is valid
+    return date.getTime() === numTimestamp;
+}
 /**
  * Checks if the input is a valid ID.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.95",
+  "version": "1.0.0-rc.97",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",