inibase 1.0.0-rc.22 → 1.0.0-rc.24

package/dist/index.js

@@ -1,6 +1,7 @@
 import { unlink, rename, readFile, writeFile, mkdir, readdir, } from "node:fs/promises";
-import { join, parse } from "node:path";
-import { scryptSync } from "node:crypto";
+import { existsSync, appendFileSync } from "node:fs";
+import { join } from "node:path";
+import { scryptSync, randomBytes } from "node:crypto";
 import File from "./file.js";
 import Utils from "./utils.js";
 import UtilsServer from "./utils.server.js";
@@ -19,7 +20,13 @@ export default class Inibase {
         this.cache = new Map();
         this.totalItems = {};
         this.pageInfo = { page: 1, per_page: 15 };
-        this.salt = scryptSync(process.env.INIBASE_SECRET ?? "inibase", (process.env.INIBASE_SECRET ?? "inibase") + "_salt", 32);
+        if (!existsSync(".env") || !process.env.INIBASE_SECRET) {
+            this.salt = scryptSync(randomBytes(16), randomBytes(16), 32);
+            appendFileSync(".env", `INIBASE_SECRET=${this.salt.toString("hex")}\n`);
+        }
+        else {
+            this.salt = Buffer.from(process.env.INIBASE_SECRET, "hex");
+        }
     }
     throwError(code, variable, language = "en") {
         const errorMessages = {
@@ -50,7 +57,7 @@ export default class Inibase {
         const decodeIdFromSchema = (schema) => schema.map((field) => {
             if (field.children && Utils.isArrayOfObjects(field.children))
                 field.children = decodeIdFromSchema(field.children);
-            if (!Utils.isNumber(field.id))
+            if (field.id && !Utils.isNumber(field.id))
                 field.id = UtilsServer.decodeID(field.id, this.salt);
             return field;
         });
@@ -72,7 +79,7 @@ export default class Inibase {
                         RETURN[UtilsServer.decodeID(field.id, this.salt)] =
                             (prefix ?? "") + field.key + ".inib";
                 return RETURN;
-            }, replaceOldPathes = Utils.findChangedProperties(schemaToIdsPath(await this.getTableSchema(tableName)), schemaToIdsPath(schema));
+            }, replaceOldPathes = Utils.findChangedProperties(schemaToIdsPath((await this.getTableSchema(tableName)) ?? []), schemaToIdsPath(schema));
             if (replaceOldPathes)
                 for await (const [oldPath, newPath] of Object.entries(replaceOldPathes))
                     if (await File.isExists(join(TablePath, oldPath)))
@@ -88,7 +95,7 @@ export default class Inibase {
             this.cache.set(TableSchemaPath, await readFile(TableSchemaPath, "utf8"));
         if (!this.cache.get(TableSchemaPath))
             return undefined;
-        const schema = JSON.parse(this.cache.get(TableSchemaPath)), lastIdNumber = UtilsServer.findLastIdNumber(schema, this.salt);
+        const schema = JSON.parse(this.cache.get(TableSchemaPath) ?? ""), lastIdNumber = UtilsServer.findLastIdNumber(schema, this.salt);
         return [
             {
                 id: UtilsServer.encodeID(0, this.salt),
@@ -149,7 +156,7 @@ export default class Inibase {
                     throw this.throwError("FIELD_REQUIRED", key);
                 if (data.hasOwnProperty(key) &&
                     !Utils.validateFieldType(data[key], type, children && !Utils.isArrayOfObjects(children) ? children : undefined))
-                    throw this.throwError("INVALID_TYPE", key);
+                    throw this.throwError("INVALID_TYPE", key + " " + type + " " + data[key]);
                 if ((type === "array" || type === "object") &&
                     children &&
                     Utils.isArrayOfObjects(children))
@@ -157,85 +164,87 @@ export default class Inibase {
             }
         }
     }
-    formatData(data, schema, formatOnlyAvailiableKeys) {
-        this.validateData(data, schema, formatOnlyAvailiableKeys);
-        const formatField = (value, field) => {
-            if (Array.isArray(field.type))
-                field.type = Utils.detectFieldType(value, field.type);
-            switch (field.type) {
-                case "array":
-                    if (!Array.isArray(value))
-                        value = [value];
-                    if (typeof field.children === "string") {
-                        if (field.type === "array" && field.children === "table") {
-                            if (Array.isArray(value)) {
-                                if (Utils.isArrayOfObjects(value)) {
-                                    if (value.every((item) => item.hasOwnProperty("id") &&
-                                        (Utils.isValidID(item.id) || Utils.isNumber(item.id))))
-                                        value.map((item) => Utils.isNumber(item.id)
+    formatField(value, field, formatOnlyAvailiableKeys) {
+        if (Array.isArray(field.type))
+            field.type = Utils.detectFieldType(value, field.type) ?? field.type[0];
+        switch (field.type) {
+            case "array":
+                if (!Array.isArray(value))
+                    value = [value];
+                if (typeof field.children === "string") {
+                    if (field.type === "array" && field.children === "table") {
+                        if (Array.isArray(value)) {
+                            if (Utils.isArrayOfObjects(value)) {
+                                if (value.every((item) => item.hasOwnProperty("id") &&
+                                    (Utils.isValidID(item.id) || Utils.isNumber(item.id))))
+                                    value.map((item) => item.id
+                                        ? Utils.isNumber(item.id)
                                             ? Number(item.id)
-                                            : UtilsServer.decodeID(item.id, this.salt));
-                                }
-                                else if (value.every(Utils.isValidID) ||
-                                    value.every(Utils.isNumber))
-                                    return value.map((item) => Utils.isNumber(item)
-                                        ? Number(item)
-                                        : UtilsServer.decodeID(item, this.salt));
+                                            : UtilsServer.decodeID(item.id, this.salt)
+                                        : null);
                             }
-                            else if (Utils.isValidID(value))
-                                return [UtilsServer.decodeID(value, this.salt)];
-                            else if (Utils.isNumber(value))
-                                return [Number(value)];
+                            else if (value.every(Utils.isValidID) ||
+                                value.every(Utils.isNumber))
+                                return value.map((item) => Utils.isNumber(item)
+                                    ? Number(item)
+                                    : UtilsServer.decodeID(item, this.salt));
                         }
-                        else if (data.hasOwnProperty(field.key))
-                            return value;
-                    }
-                    else if (Utils.isArrayOfObjects(field.children))
-                        return this.formatData(value, field.children, formatOnlyAvailiableKeys);
-                    else if (Array.isArray(field.children))
-                        return Array.isArray(value) ? value : [value];
-                    break;
-                case "object":
-                    if (Utils.isArrayOfObjects(field.children))
-                        return this.formatData(value, field.children, formatOnlyAvailiableKeys);
-                    break;
-                case "table":
-                    if (Array.isArray(value))
-                        value = value[0];
-                    if (Utils.isObject(value)) {
-                        if (value.hasOwnProperty("id") &&
-                            (Utils.isValidID(value.id) ||
-                                Utils.isNumber(value.id)))
-                            return Utils.isNumber(value.id)
-                                ? Number(value.id)
-                                : UtilsServer.decodeID(value.id, this.salt);
+                        else if (Utils.isValidID(value))
+                            return [UtilsServer.decodeID(value, this.salt)];
+                        else if (Utils.isNumber(value))
+                            return [Number(value)];
                     }
-                    else if (Utils.isValidID(value) || Utils.isNumber(value))
-                        return Utils.isNumber(value)
-                            ? Number(value)
-                            : UtilsServer.decodeID(value, this.salt);
-                    break;
-                case "password":
-                    if (Array.isArray(value))
-                        value = value[0];
-                    return typeof value === "string" && value.length === 161
-                        ? value
-                        : UtilsServer.hashPassword(String(value));
-                case "number":
-                    if (Array.isArray(value))
-                        value = value[0];
-                    return Utils.isNumber(value) ? Number(value) : null;
-                case "id":
-                    if (Array.isArray(value))
-                        value = value[0];
+                    else if (value.hasOwnProperty(field.key))
+                        return value;
+                }
+                else if (Utils.isArrayOfObjects(field.children))
+                    return this.formatData(value, field.children, formatOnlyAvailiableKeys);
+                else if (Array.isArray(field.children))
+                    return Array.isArray(value) ? value : [value];
+                break;
+            case "object":
+                if (Utils.isArrayOfObjects(field.children))
+                    return this.formatData(value, field.children, formatOnlyAvailiableKeys);
+                break;
+            case "table":
+                if (Array.isArray(value))
+                    value = value[0];
+                if (Utils.isObject(value)) {
+                    if (value.hasOwnProperty("id") &&
+                        (Utils.isValidID(value.id) ||
+                            Utils.isNumber(value.id)))
+                        return Utils.isNumber(value.id)
+                            ? Number(value.id)
+                            : UtilsServer.decodeID(value.id, this.salt);
+                }
+                else if (Utils.isValidID(value) || Utils.isNumber(value))
                     return Utils.isNumber(value)
-                        ? value
+                        ? Number(value)
                         : UtilsServer.decodeID(value, this.salt);
-                default:
-                    return value;
-            }
-            return null;
-        };
+                break;
+            case "password":
+                if (Array.isArray(value))
+                    value = value[0];
+                return typeof value === "string" && value.length === 161
+                    ? value
+                    : UtilsServer.hashPassword(String(value));
+            case "number":
+                if (Array.isArray(value))
+                    value = value[0];
+                return Utils.isNumber(value) ? Number(value) : null;
+            case "id":
+                if (Array.isArray(value))
+                    value = value[0];
+                return Utils.isNumber(value)
+                    ? value
+                    : UtilsServer.decodeID(value, this.salt);
+            default:
+                return value;
+        }
+        return null;
+    }
+    formatData(data, schema, formatOnlyAvailiableKeys) {
+        this.validateData(data, schema, formatOnlyAvailiableKeys);
         if (Utils.isArrayOfObjects(data))
             return data.map((single_data) => this.formatData(single_data, schema, formatOnlyAvailiableKeys));
         else if (Utils.isObject(data)) {
@@ -247,7 +256,7 @@ export default class Inibase {
                     RETURN[field.key] = this.getDefaultValue(field);
                     continue;
                 }
-                RETURN[field.key] = formatField(data[field.key], field);
+                RETURN[field.key] = this.formatField(data[field.key], field, formatOnlyAvailiableKeys);
             }
             return RETURN;
         }
@@ -382,22 +391,24 @@ export default class Inibase {
                             .map((column) => column.replace(`${field.key}.`, ""));
                     const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field.children, this.salt);
                     this.totalItems[tableName + "-" + field.key] = total_lines;
-                    for await (const [index, item] of Object.entries(items)) {
-                        if (!RETURN[index])
-                            RETURN[index] = {};
-                        RETURN[index][field.key] = item
-                            ? await this.get(field.key, item, options)
-                            : this.getDefaultValue(field);
-                    }
+                    if (items)
+                        for await (const [index, item] of Object.entries(items)) {
+                            if (!RETURN[index])
+                                RETURN[index] = {};
+                            RETURN[index][field.key] = item
+                                ? await this.get(field.key, item, options)
+                                : this.getDefaultValue(field);
+                        }
                 }
                 else if (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))) {
                     const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
                     this.totalItems[tableName + "-" + field.key] = total_lines;
-                    for (const [index, item] of Object.entries(items)) {
-                        if (!RETURN[index])
-                            RETURN[index] = {};
-                        RETURN[index][field.key] = item ?? this.getDefaultValue(field);
-                    }
+                    if (items)
+                        for (const [index, item] of Object.entries(items)) {
+                            if (!RETURN[index])
+                                RETURN[index] = {};
+                            RETURN[index][field.key] = item ?? this.getDefaultValue(field);
+                        }
                 }
             }
             else if (field.type === "object") {
@@ -424,23 +435,30 @@ export default class Inibase {
                             .map((column) => column.replace(`${field.key}.`, ""));
                     const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, "number", undefined, this.salt);
                     this.totalItems[tableName + "-" + field.key] = total_lines;
-                    for await (const [index, item] of Object.entries(items)) {
-                        if (!RETURN[index])
-                            RETURN[index] = {};
-                        RETURN[index][field.key] = item
-                            ? await this.get(field.key, item, options)
-                            : this.getDefaultValue(field);
-                    }
+                    if (items)
+                        for await (const [index, item] of Object.entries(items)) {
+                            if (!RETURN[index])
+                                RETURN[index] = {};
+                            RETURN[index][field.key] = item
+                                ? await this.get(field.key, item, options)
+                                : this.getDefaultValue(field);
+                        }
                 }
             }
             else if (await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))) {
                 const [items, total_lines] = await File.get(join(path, (prefix ?? "") + field.key + ".inib"), linesNumber, field.type, field?.children, this.salt);
                 this.totalItems[tableName + "-" + field.key] = total_lines;
-                for (const [index, item] of Object.entries(items)) {
-                    if (!RETURN[index])
-                        RETURN[index] = {};
-                    RETURN[index][field.key] = item ?? this.getDefaultValue(field);
-                }
+                if (items)
+                    for (const [index, item] of Object.entries(items)) {
+                        if (!RETURN[index])
+                            RETURN[index] = {};
+                        RETURN[index][field.key] = item ?? this.getDefaultValue(field);
+                    }
+                else
+                    RETURN = Object.fromEntries(Object.entries(RETURN).map(([index, data]) => [
+                        index,
+                        { ...data, [field.key]: this.getDefaultValue(field) },
+                    ]));
             }
         }
         return RETURN;
@@ -528,8 +546,8 @@ export default class Inibase {
                 let searchOperator = undefined, searchComparedAtValue = undefined, searchLogicalOperator = undefined;
                 if (Utils.isObject(value)) {
                     if (value?.or &&
-                        Array.isArray(value.or)) {
-                        const searchCriteria = value.or
+                        Array.isArray(value?.or)) {
+                        const searchCriteria = (value?.or)
                             .map((single_or) => typeof single_or === "string"
                             ? this.FormatObjectCriteriaValue(single_or)
                             : ["=", single_or])
@@ -539,11 +557,11 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_or) => single_or[1]);
                             searchLogicalOperator = "or";
                         }
-                        delete value.or;
+                        delete value?.or;
                     }
                     if (value?.and &&
-                        Array.isArray(value.and)) {
-                        const searchCriteria = value.and
+                        Array.isArray(value?.and)) {
+                        const searchCriteria = (value?.and)
                             .map((single_and) => typeof single_and === "string"
                             ? this.FormatObjectCriteriaValue(single_and)
                             : ["=", single_and])
@@ -553,7 +571,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_and) => single_and[1]);
                             searchLogicalOperator = "and";
                         }
-                        delete value.and;
+                        delete value?.and;
                     }
                 }
                 else if (Array.isArray(value)) {
@@ -579,9 +597,14 @@ export default class Inibase {
                     searchOperator = "=";
                     searchComparedAtValue = value;
                 }
-                const [searchResult, total_lines] = await File.search(join(this.folder, this.database, tableName, key + ".inib"), searchOperator, searchComparedAtValue, searchLogicalOperator, field?.type, field?.children, options.per_page, options.page - 1 * options.per_page + 1, true, this.salt);
+                const [searchResult, total_lines] = await File.search(join(this.folder, this.database, tableName, key + ".inib"), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, field?.type, field?.children, options.per_page, options.page - 1 * options.per_page + 1, true, this.salt);
                 if (searchResult) {
-                    RETURN = Utils.deepMerge(RETURN, searchResult);
+                    RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).map(([id, value]) => [
+                        id,
+                        {
+                            [key]: value,
+                        },
+                    ])));
                     this.totalItems[tableName + "-" + key] = total_lines;
                 }
                 if (allTrue && index > 0) {
@@ -599,12 +622,13 @@ export default class Inibase {
         page: 1,
         per_page: 15,
     }, onlyOne, onlyLinesNumbers) {
-        if (!options.columns)
-            options.columns = [];
-        else if (!Array.isArray(options.columns))
-            options.columns = [options.columns];
-        if (options.columns.length && !options.columns.includes("id"))
-            options.columns.push("id");
+        if (options.columns) {
+            if (!Array.isArray(options.columns))
+                options.columns = [options.columns];
+            if (options.columns.length &&
+                !options.columns.includes("id"))
+                options.columns.push("id");
+        }
         if (!options.page)
             options.page = 1;
         if (!options.per_page)
@@ -635,7 +659,7 @@ export default class Inibase {
             return null;
         })
             .filter((i) => i);
-        if (options.columns.length)
+        if (options.columns && options.columns.length)
             schema = filterSchemaByColumns(schema, options.columns);
         if (!where) {
             // Display all data
@@ -658,7 +682,7 @@ export default class Inibase {
                     ? Object.keys(lineNumbers).map(Number)
                     : null;
             RETURN = Object.values((await this.getItemsFromSchema(tableName, schema, Object.keys(lineNumbers).map(Number), options)) ?? {});
-            if (RETURN.length && !Array.isArray(where))
+            if (RETURN && RETURN.length && !Array.isArray(where))
                 RETURN = RETURN[0];
         }
         else if (Utils.isObject(where)) {
@@ -667,7 +691,7 @@ export default class Inibase {
             if (RETURN) {
                 if (onlyLinesNumbers)
                     return Object.keys(RETURN).map(Number);
-                const alreadyExistsColumns = Object.keys(Object.values(RETURN)[0]).map((key) => parse(key).name);
+                const alreadyExistsColumns = Object.keys(Object.values(RETURN)[0]);
                 RETURN = Object.values(Utils.deepMerge(RETURN, await this.getItemsFromSchema(tableName, schema.filter((field) => !alreadyExistsColumns.includes(field.key)), Object.keys(RETURN).map(Number), options)));
             }
         }
@@ -685,10 +709,14 @@ export default class Inibase {
         };
         return onlyOne && Array.isArray(RETURN) ? RETURN[0] : RETURN;
     }
-    async post(tableName, data, options = {
-        page: 1,
-        per_page: 15,
-    }, returnPostedData = true) {
+    async post(tableName, data, options, returnPostedData) {
+        if (!options)
+            options = {
+                page: 1,
+                per_page: 15,
+            };
+        if (!returnPostedData)
+            returnPostedData = false;
         const schema = await this.getTableSchema(tableName);
         let RETURN;
         if (!schema)
@@ -696,7 +724,7 @@ export default class Inibase {
         const idFilePath = join(this.folder, this.database, tableName, "id.inib");
         let [last_line_number, last_id] = (await File.isExists(idFilePath))
             ? Object.entries((await File.get(idFilePath, -1, "number", undefined, this.salt))[0] ??
-                {})[0]?.map(Number) ?? [0, 0]
+                {})[0].map(Number) ?? [0, 0]
             : [0, 0];
         if (Utils.isArrayOfObjects(data))
             RETURN = data.map(({ id, updatedAt, createdAt, ...rest }) => ({
@@ -716,10 +744,17 @@ export default class Inibase {
         const pathesContents = this.joinPathesContents(join(this.folder, this.database, tableName), RETURN);
         last_line_number += 1;
         for await (const [path, content] of Object.entries(pathesContents))
-            await File.append(path, content, last_line_number);
+            await File.append(path, 
+            // Array.isArray(content)
+            //   ? content.reduce((obj, value, index) => {
+            //       obj[last_line_number + index] = value;
+            //       return obj;
+            //     }, {})
+            //   : { [last_line_number]: content }
+            content, last_line_number);
         if (returnPostedData)
             return this.get(tableName, Utils.isArrayOfObjects(RETURN)
-                ? RETURN.map((data) => data.id)
+                ? RETURN.map((data) => Number(data.id))
                 : RETURN.id, options, !Utils.isArrayOfObjects(data) // return only one item if data is not array of objects
             );
     }
@@ -738,7 +773,9 @@ export default class Inibase {
             if (Utils.isArrayOfObjects(data)) {
                 if (!data.every((item) => item.hasOwnProperty("id") && Utils.isValidID(item.id)))
                     throw this.throwError("INVALID_ID");
-                return this.put(tableName, data, data.map((item) => item.id));
+                return this.put(tableName, data, data
+                    .filter((item) => item.id !== undefined)
+                    .map((item) => item.id));
             }
             else if (data.hasOwnProperty("id")) {
                 if (!Utils.isValidID(data.id))
@@ -821,6 +858,8 @@ export default class Inibase {
             if ((Array.isArray(where) && where.every(Utils.isValidID)) ||
                 Utils.isValidID(where)) {
                 const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+                if (!lineNumbers)
+                    return null;
                 return this.delete(tableName, lineNumbers, where);
             }
             else if ((Array.isArray(where) && where.every(Utils.isNumber)) ||
@@ -829,7 +868,7 @@ export default class Inibase {
                 const files = (await readdir(join(this.folder, this.database, tableName)))?.filter((fileName) => fileName.endsWith(".inib"));
                 if (files.length) {
                     if (!_id)
-                        _id = Object.values((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0] ?? {}).map((id) => UtilsServer.encodeID(Number(id), this.salt));
+                        _id = Object.entries((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0] ?? {}).map(([_key, id]) => UtilsServer.encodeID(Number(id), this.salt));
                     if (!_id.length)
                         throw this.throwError("NO_ITEMS", tableName);
                     for await (const file of files)
@@ -849,7 +888,7 @@ export default class Inibase {
         return null;
     }
     async sum(tableName, columns, where) {
-        let RETURN;
+        let RETURN = {};
         const schema = await this.getTableSchema(tableName);
         if (!schema)
             throw this.throwError("NO_SCHEMA", tableName);
@@ -862,7 +901,9 @@ export default class Inibase {
             if (await File.isExists(columnPath)) {
                 if (where) {
                     const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
-                    RETURN[column] = await File.sum(columnPath, lineNumbers);
+                    RETURN[column] = lineNumbers
+                        ? await File.sum(columnPath, lineNumbers)
+                        : 0;
                 }
                 else
                     RETURN[column] = await File.sum(columnPath);
@@ -871,7 +912,7 @@ export default class Inibase {
         return Array.isArray(columns) ? RETURN : Object.values(RETURN)[0];
     }
     async max(tableName, columns, where) {
-        let RETURN;
+        let RETURN = {};
         const schema = await this.getTableSchema(tableName);
         if (!schema)
             throw this.throwError("NO_SCHEMA", tableName);
@@ -884,7 +925,9 @@ export default class Inibase {
             if (await File.isExists(columnPath)) {
                 if (where) {
                     const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
-                    RETURN[column] = await File.max(columnPath, lineNumbers);
+                    RETURN[column] = lineNumbers
+                        ? await File.max(columnPath, lineNumbers)
+                        : 0;
                 }
                 else
                     RETURN[column] = await File.max(columnPath);
@@ -893,7 +936,7 @@ export default class Inibase {
         return RETURN;
     }
     async min(tableName, columns, where) {
-        let RETURN;
+        let RETURN = {};
         const schema = await this.getTableSchema(tableName);
         if (!schema)
             throw this.throwError("NO_SCHEMA", tableName);
@@ -906,7 +949,9 @@ export default class Inibase {
             if (await File.isExists(columnPath)) {
                 if (where) {
                     const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
-                    RETURN[column] = await File.min(columnPath, lineNumbers);
+                    RETURN[column] = lineNumbers
+                        ? await File.min(columnPath, lineNumbers)
+                        : 0;
                 }
                 else
                     RETURN[column] = await File.min(columnPath);

package/dist/utils.d.ts

@@ -2,7 +2,7 @@ import { type FieldType } from "./index.js";
 export declare const isArrayOfObjects: (input: any) => input is Record<any, any>[];
 export declare const isArrayOfArrays: (input: any) => input is any[][];
 export declare const isArrayOfNulls: (input: any) => input is null[] | null[][];
-export declare const isObject: (obj: any) => boolean;
+export declare const isObject: (obj: any) => obj is Record<any, any>;
 export declare const deepMerge: (target: any, source: any) => any;
 export declare const combineObjects: (arr: Record<string, any>[]) => Record<string, any>;
 export declare const isNumber: (input: any) => input is number;
@@ -21,7 +21,7 @@ export declare const validateFieldType: (value: any, fieldType: FieldType | Fiel
 export declare const objectToDotNotation: (input: Record<string, any>) => Record<string, string | number | (string | number)[]>;
 export default class Utils {
     static isNumber: (input: any) => input is number;
-    static isObject: (obj: any) => boolean;
+    static isObject: (obj: any) => obj is Record<any, any>;
     static isEmail: (input: any) => boolean;
     static isDate: (input: any) => boolean;
     static isURL: (input: any) => boolean;
@@ -30,14 +30,14 @@ export default class Utils {
     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>;
-    static detectFieldType: (input: any, availableTypes: FieldType[]) => FieldType;
+    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[]) => boolean;
+    static validateFieldType: (value: any, fieldType: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | undefined) => boolean;
     static objectToDotNotation: (input: Record<string, any>) => Record<string, string | number | (string | number)[]>;
     static isArrayOfNulls: (input: any) => input is null[] | null[][];
 }

package/dist/utils.js

@@ -54,12 +54,10 @@ export const isEmail = (input) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(String(input
 export const isURL = (input) => {
     if (typeof input !== "string")
         return false;
-    if (input[0] === "#" ||
+    if ((input[0] === "#" && !input.includes(" ")) ||
         input.startsWith("tel:") ||
         input.startsWith("mailto:"))
         return true;
-    else if ("canParse" in URL)
-        return URL.canParse(input);
     else {
         var pattern = new RegExp("^(https?:\\/\\/)?" + // protocol
             "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
@@ -72,13 +70,7 @@ export const isURL = (input) => {
 };
 export const isHTML = (input) => /<\/?\s*[a-z-][^>]*\s*>|(\&(?:[\w\d]+|#\d+|#x[a-f\d]+);)/g.test(input);
 export const isString = (input) => Object.prototype.toString.call(input) === "[object String]" &&
-    !isNumber(input) &&
-    !isBoolean(input) &&
-    !isEmail(input) &&
-    !isDate(input) &&
-    !isURL(input) &&
-    !isIP(input) &&
-    !isHTML(input);
+    [isNumber, isBoolean, isEmail, isURL, isIP].every((fn) => !fn(input));
 export const isIP = (input) => /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/.test(input);
 export const isBoolean = (input) => typeof input === "boolean" ||
     input === "true" ||
@@ -86,8 +78,7 @@ export const isBoolean = (input) => typeof input === "boolean" ||
     input === true ||
     input === false;
 export const isPassword = (input) => input.length === 161;
-export const isDate = (input) => (isNumber(input) && new Date(input).getTime() > 0) ||
-    (!isNaN(Date.parse(String(input))) && Date.parse(String(input)) >= 0);
+export const isDate = (input) => !isNaN(new Date(input).getTime()) || !isNaN(Date.parse(input));
 export const isValidID = (input) => {
     return typeof input === "string" && input.length === 32;
 };

package/dist/utils.server.d.ts

@@ -5,12 +5,12 @@ export declare const comparePassword: (hashedPassword: string, inputPassword: st
 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 findLastIdNumber: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => number;
-export declare const addIdToSchema: (schema: Schema, oldIndex: number, secretKeyOrSalt: string | number | Buffer) => import("./index.js").Field[];
+export declare const addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer) => import("./index.js").Field[];
 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, secretKeyOrSalt: string | number | Buffer) => import("./index.js").Field[];
+    static addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer) => import("./index.js").Field[];
 }