inibase 1.0.0-rc.50 → 1.0.0-rc.51

package/dist/utils.d.ts

@@ -181,29 +181,4 @@ export declare function FormatObjectCriteriaValue(value: string, isParentArray?:
 type ValidKey = number | string;
 export declare const swapKeyValue: <K extends ValidKey, V extends ValidKey>(object: Record<K, V>) => Record<V, K>;
 export declare function getField(keyPath: string, schema: Schema): Field | null;
-export default class Utils {
-    static isNumber: (input: any) => input is number;
-    static isObject: (obj: any) => obj is Record<any, any>;
-    static isEmail: (input: any) => boolean;
-    static isDate: (input: any) => boolean;
-    static isURL: (input: any) => boolean;
-    static isValidID: (input: any) => input is string;
-    static isPassword: (input: any) => input is string;
-    static deepMerge: (target: any, source: any) => any;
-    static combineObjects: (arr: Record<string, any>[]) => Record<string, any>;
-    static isArrayOfObjects: (input: any) => input is Record<any, any>[];
-    static findChangedProperties: (obj1: Record<string, string>, obj2: Record<string, string>) => Record<string, string> | null;
-    static detectFieldType: (input: any, availableTypes: FieldType[]) => FieldType | undefined;
-    static isArrayOfArrays: (input: any) => input is any[][];
-    static isBoolean: (input: any) => input is boolean;
-    static isString: (input: any) => input is string;
-    static isHTML: (input: any) => boolean;
-    static isIP: (input: any) => boolean;
-    static validateFieldType: (value: any, fieldType: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | undefined) => boolean;
-    static isArrayOfNulls: (input: any) => input is null[] | null[][];
-    static FormatObjectCriteriaValue: typeof FormatObjectCriteriaValue;
-    static swapKeyValue: <K extends ValidKey, V extends ValidKey>(object: Record<K, V>) => Record<V, K>;
-    static getField: typeof getField;
-    static isJSON: (str: string) => boolean;
-}
 export {};

package/dist/utils.js

@@ -47,7 +47,7 @@ export const isObject = (obj) => obj != null &&
  */
 export const deepMerge = (target, source) => {
     for (const key in source) {
-        if (source.hasOwnProperty(key)) {
+        if (Object.hasOwn(source, key)) {
             if (isObject(source[key]) && isObject(target[key]))
                 target[key] = deepMerge(target[key], source[key]);
             else
@@ -68,7 +68,7 @@ export const combineObjects = (arr) => {
     const result = {};
     for (const obj of arr) {
         for (const key in obj) {
-            if (obj.hasOwnProperty(key)) {
+            if (Object.hasOwn(obj, key)) {
                 const existingValue = result[key];
                 const newValue = obj[key];
                 if (isObject(existingValue) &&
@@ -106,7 +106,7 @@ export const combineObjects = (arr) => {
  *
  * Note: Validates that the input can be parsed as a float and that subtracting zero results in a number, ensuring it's a numeric value.
  */
-export const isNumber = (input) => !isNaN(parseFloat(input)) && !isNaN(input - 0);
+export const isNumber = (input) => !Number.isNaN(Number.parseFloat(input)) && !Number.isNaN(input - 0);
 /**
  * Checks if the input is a valid email format.
  *
@@ -132,16 +132,14 @@ export const isURL = (input) => {
         input.startsWith("tel:") ||
         input.startsWith("mailto:"))
         return true;
-    else {
-        var pattern = new RegExp("^(https?:\\/\\/)?" + // protocol
-            "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
-            "localhost|" + // OR localhost
-            "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
-            "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
-            "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
-            "(\\#[-a-z\\d_]*)?$", "i"); // fragment locator
-        return !!pattern.test(input);
-    }
+    const pattern = new RegExp("^(https?:\\/\\/)?" + // protocol
+        "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
+        "localhost|" + // OR localhost
+        "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
+        "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
+        "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
+        "(\\#[-a-z\\d_]*)?$", "i"); // fragment locator
+    return !!pattern.test(input);
 };
 /**
  * Checks if the input contains HTML tags or entities.
@@ -200,7 +198,7 @@ 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) => !isNaN(new Date(input).getTime()) || !isNaN(Date.parse(input));
+export const isDate = (input) => !Number.isNaN(new Date(input).getTime()) || !Number.isNaN(Date.parse(input));
 /**
  * Checks if the input is a valid ID.
  *
@@ -227,7 +225,7 @@ export const isJSON = (str) => str === "null" || str === "undefined" || str[0] =
 export const findChangedProperties = (obj1, obj2) => {
     const result = {};
     for (const key1 in obj1)
-        if (obj2.hasOwnProperty(key1) && obj1[key1] !== obj2[key1])
+        if (Object.hasOwn(obj2, key1) && obj1[key1] !== obj2[key1])
             result[obj1[key1]] = obj2[key1];
     return Object.keys(result).length ? result : null;
 };
@@ -247,12 +245,12 @@ export const detectFieldType = (input, availableTypes) => {
                 input === "false") &&
                 availableTypes.includes("boolean"))
                 return "boolean";
-            else if (isNumber(input)) {
+            if (isNumber(input)) {
                 if (availableTypes.includes("table"))
                     return "table";
-                else if (availableTypes.includes("date"))
+                if (availableTypes.includes("date"))
                     return "date";
-                else if (availableTypes.includes("number"))
+                if (availableTypes.includes("number"))
                     return "number";
             }
             else if (availableTypes.includes("table") && isValidID(input))
@@ -322,15 +320,14 @@ export const validateFieldType = (value, fieldType, fieldChildrenType) => {
             // feat: check if id exists
             if (Array.isArray(value))
                 return ((isArrayOfObjects(value) &&
-                    value.every((element) => element.hasOwnProperty("id") &&
+                    value.every((element) => Object.hasOwn(element, "id") &&
                         (isValidID(element.id) || isNumber(element.id)))) ||
                     value.every(isNumber) ||
                     isValidID(value));
-            else if (isObject(value))
-                return (value.hasOwnProperty("id") &&
+            if (isObject(value))
+                return (Object.hasOwn(value, "id") &&
                     (isValidID(value.id) || isNumber(value.id)));
-            else
-                return isNumber(value) || isValidID(value);
+            return isNumber(value) || isValidID(value);
         case "id":
             return isNumber(value) || isValidID(value);
         case "json":
@@ -371,7 +368,7 @@ export function FormatObjectCriteriaValue(value, isParentArray = false) {
                         value.slice(3),
                     ]
                     : [
-                        (value.slice(0, 1) + "="),
+                        `${value.slice(0, 1)}=`,
                         value.slice(1),
                     ];
         case "=":
@@ -382,7 +379,7 @@ export function FormatObjectCriteriaValue(value, isParentArray = false) {
                 ]
                 : [
                     value.slice(0, 1),
-                    (value.slice(1) + ","),
+                    `${value.slice(1)},`,
                 ];
         case "*":
             return [
@@ -393,7 +390,7 @@ export function FormatObjectCriteriaValue(value, isParentArray = false) {
             return ["=", value];
     }
 }
-export const swapKeyValue = (object) => Object.entries(object).reduce((swapped, [key, value]) => ({ ...swapped, [value]: key }), {});
+export const swapKeyValue = (object) => Object.entries(object).reduce((swapped, [key, value]) => Object.assign(swapped, { [value]: key }), {});
 export function getField(keyPath, schema) {
     let RETURN = null;
     const keyPathSplited = keyPath.split(".");
@@ -412,28 +409,3 @@ export function getField(keyPath, schema) {
         return null;
     return isArrayOfObjects(RETURN) ? RETURN[0] : RETURN;
 }
-export default class Utils {
-    static isNumber = isNumber;
-    static isObject = isObject;
-    static isEmail = isEmail;
-    static isDate = isDate;
-    static isURL = isURL;
-    static isValidID = isValidID;
-    static isPassword = isPassword;
-    static deepMerge = deepMerge;
-    static combineObjects = combineObjects;
-    static isArrayOfObjects = isArrayOfObjects;
-    static findChangedProperties = findChangedProperties;
-    static detectFieldType = detectFieldType;
-    static isArrayOfArrays = isArrayOfArrays;
-    static isBoolean = isBoolean;
-    static isString = isString;
-    static isHTML = isHTML;
-    static isIP = isIP;
-    static validateFieldType = validateFieldType;
-    static isArrayOfNulls = isArrayOfNulls;
-    static FormatObjectCriteriaValue = FormatObjectCriteriaValue;
-    static swapKeyValue = swapKeyValue;
-    static getField = getField;
-    static isJSON = isJSON;
-}

package/dist/utils.server.d.ts

@@ -51,7 +51,7 @@ export declare const findLastIdNumber: (schema: Schema, secretKeyOrSalt: string
  * @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, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer, encodeIDs?: boolean) => import("./index.js").Field[];
+export declare const addIdToSchema: (schema: Schema, oldIndex: number, secretKeyOrSalt: string | number | Buffer, encodeIDs?: boolean) => import("./index.js").Field[];
 export declare const encodeSchemaID: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => Schema;
 export declare const hashString: (str: string) => string;
 /**
@@ -92,18 +92,3 @@ export declare const isArrayEqual: (originalValue: string | number | boolean | n
  * @returns boolean - Result of the wildcard pattern matching.
  */
 export declare const isWildcardMatch: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[]) => boolean;
-export default class UtilsServer {
-    static encodeID: (id: string | number, secretKeyOrSalt: string | number | Buffer) => string;
-    static decodeID: (input: string, secretKeyOrSalt: string | number | Buffer) => number;
-    static hashPassword: (password: string) => string;
-    static comparePassword: (hashedPassword: string, inputPassword: string) => boolean;
-    static findLastIdNumber: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => number;
-    static addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer, encodeIDs?: boolean | undefined) => import("./index.js").Field[];
-    static hashString: (str: string) => string;
-    static exec: typeof execAsync.__promisify__;
-    static compare: (operator: ComparisonOperator, originalValue: string | number | boolean | (string | number | boolean | null)[] | null, comparedAtValue: string | number | boolean | (string | number | boolean | null)[] | null, fieldType?: FieldType | FieldType[] | undefined, fieldChildrenType?: FieldType | FieldType[] | undefined) => boolean;
-    static isEqual: (originalValue: string | number | boolean | (string | number | boolean | null)[] | null, comparedAtValue: string | number | boolean | (string | number | boolean | null)[] | null, fieldType?: FieldType | FieldType[] | undefined) => boolean;
-    static isArrayEqual: (originalValue: string | number | boolean | (string | number | boolean | null)[] | null, comparedAtValue: string | number | boolean | (string | number | boolean | null)[] | null) => boolean;
-    static isWildcardMatch: (originalValue: string | number | boolean | (string | number | boolean | null)[] | null, comparedAtValue: string | number | boolean | (string | number | boolean | null)[] | null) => boolean;
-    static encodeSchemaID: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => Schema;
-}

package/dist/utils.server.js

@@ -42,7 +42,7 @@ export const encodeID = (id, secretKeyOrSalt) => {
     if (Buffer.isBuffer(secretKeyOrSalt))
         cipher = createCipheriv("aes-256-cbc", secretKeyOrSalt, secretKeyOrSalt.subarray(0, 16));
     else {
-        const salt = scryptSync(secretKeyOrSalt.toString(), (process.env.INIBASE_SECRET ?? "inibase") + "_salt", 32);
+        const salt = scryptSync(secretKeyOrSalt.toString(), `${process.env.INIBASE_SECRET ?? "inibase"}_salt`, 32);
         cipher = createCipheriv("aes-256-cbc", salt, salt.subarray(0, 16));
     }
     return cipher.update(id.toString(), "utf8", "hex") + cipher.final("hex");
@@ -59,7 +59,7 @@ export const decodeID = (input, secretKeyOrSalt) => {
     if (Buffer.isBuffer(secretKeyOrSalt))
         decipher = createDecipheriv("aes-256-cbc", secretKeyOrSalt, secretKeyOrSalt.subarray(0, 16));
     else {
-        const salt = scryptSync(secretKeyOrSalt.toString(), (process.env.INIBASE_SECRET ?? "inibase") + "_salt", 32);
+        const salt = scryptSync(secretKeyOrSalt.toString(), `${process.env.INIBASE_SECRET ?? "inibase"}_salt`, 32);
         decipher = createDecipheriv("aes-256-cbc", salt, salt.subarray(0, 16));
     }
     return Number(decipher.update(input, "hex", "utf8") + decipher.final("utf8"));
@@ -94,7 +94,7 @@ export const findLastIdNumber = (schema, secretKeyOrSalt) => Math.max(..._flatte
  * @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, oldIndex = 0, secretKeyOrSalt, encodeIDs) => schema.map((field) => {
+export const addIdToSchema = (schema, oldIndex, secretKeyOrSalt, encodeIDs) => schema.map((field) => {
     if (!field.id) {
         oldIndex++;
         field.id = encodeIDs ? encodeID(oldIndex, secretKeyOrSalt) : oldIndex;
@@ -251,21 +251,6 @@ export const isArrayEqual = (originalValue, comparedAtValue) => {
 export const isWildcardMatch = (originalValue, comparedAtValue) => {
     const wildcardPattern = `^${(String(comparedAtValue).includes("%")
         ? String(comparedAtValue)
-        : "%" + String(comparedAtValue) + "%").replace(/%/g, ".*")}$`;
+        : `%${String(comparedAtValue)}%`).replace(/%/g, ".*")}$`;
     return new RegExp(wildcardPattern, "i").test(String(originalValue));
 };
-export default class UtilsServer {
-    static encodeID = encodeID;
-    static decodeID = decodeID;
-    static hashPassword = hashPassword;
-    static comparePassword = comparePassword;
-    static findLastIdNumber = findLastIdNumber;
-    static addIdToSchema = addIdToSchema;
-    static hashString = hashString;
-    static exec = exec;
-    static compare = compare;
-    static isEqual = isEqual;
-    static isArrayEqual = isArrayEqual;
-    static isWildcardMatch = isWildcardMatch;
-    static encodeSchemaID = encodeSchemaID;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.50",
+  "version": "1.0.0-rc.51",
   "author": {
     "name": "Karim Amahtil",
     "email": "karim.amahtil@gmail.com"