inibase 1.0.0-rc.51 → 1.0.0-rc.53

package/dist/index.d.ts

@@ -57,7 +57,7 @@ export default class Inibase {
     private _schemaToIdsPath;
     setTableSchema(tableName: string, schema: Schema): Promise<void>;
     getTableSchema(tableName: string, encodeIDs?: boolean): Promise<Schema | undefined>;
-    getSchemaWhenTableNotEmpty(tableName: string, schema?: Schema): Promise<never | Schema>;
+    private getSchemaWhenTableNotEmpty;
     private validateData;
     private formatField;
     private checkUnique;
@@ -66,9 +66,7 @@ export default class Inibase {
     private _combineObjectsToArray;
     private _CombineData;
     private _addPathToKeys;
-    joinPathesContents(mainPath: string, data: Data | Data[]): {
-        [key: string]: string[];
-    };
+    private joinPathesContents;
     private _getItemsFromSchemaHelper;
     private getItemsFromSchema;
     private applyCriteria;

package/dist/index.js

@@ -343,29 +343,28 @@ export default class Inibase {
     }
     _combineObjectsToArray = (input) => input.reduce((result, current) => {
         for (const [key, value] of Object.entries(current))
-            if (!result[key])
-                result[key] = [value];
-            else
+            if (Object.hasOwn(result, key) && Array.isArray(result[key]))
                 result[key].push(value);
+            else
+                result[key] = [value];
         return result;
     }, {});
     _CombineData = (data, prefix) => {
-        let RETURN = {};
         if (Utils.isArrayOfObjects(data))
-            RETURN = this._combineObjectsToArray(data.map((single_data) => this._CombineData(single_data)));
-        else
-            for (const [key, value] of Object.entries(data)) {
-                if (Utils.isObject(value))
-                    Object.assign(RETURN, this._CombineData(value, `${key}.`));
-                else if (Utils.isArrayOfObjects(value)) {
-                    Object.assign(RETURN, this._CombineData(this._combineObjectsToArray(value), `${(prefix ?? "") + key}.`));
-                }
-                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);
+            return this._combineObjectsToArray(data.map((single_data) => this._CombineData(single_data)));
+        const RETURN = {};
+        for (const [key, value] of Object.entries(data)) {
+            if (Utils.isObject(value))
+                Object.assign(RETURN, this._CombineData(value, `${key}.`));
+            else if (Utils.isArrayOfObjects(value)) {
+                Object.assign(RETURN, this._CombineData(this._combineObjectsToArray(value), `${(prefix ?? "") + key}.`));
             }
+            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);
+        }
         return RETURN;
     };
     _addPathToKeys = (obj, path) => {
@@ -573,7 +572,7 @@ export default class Inibase {
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).length ===
                     Object.keys(criteria.and ?? {}).length)));
-                criteria.and = undefined;
+                delete criteria.and;
                 RETURN_LineNumbers = lineNumbers;
             }
             else
@@ -581,7 +580,7 @@ export default class Inibase {
         }
         if (criteria.or && Utils.isObject(criteria.or)) {
             const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.or, false);
-            criteria.or = undefined;
+            delete criteria.or;
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, searchResult);
                 RETURN_LineNumbers = lineNumbers;
@@ -608,7 +607,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_or) => single_or[1]);
                             searchLogicalOperator = "or";
                         }
-                        value.or = undefined;
+                        delete value.or;
                     }
                     if (value?.and &&
                         Array.isArray(value?.and)) {
@@ -622,7 +621,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_and) => single_and[1]);
                             searchLogicalOperator = "and";
                         }
-                        value.and = undefined;
+                        delete value.and;
                     }
                 }
                 else if (Array.isArray(value)) {

package/dist/utils.js

@@ -253,24 +253,26 @@ export const detectFieldType = (input, availableTypes) => {
                 if (availableTypes.includes("number"))
                     return "number";
             }
-            else if (availableTypes.includes("table") && isValidID(input))
-                return "table";
-            else if (input.startsWith("[") && availableTypes.includes("array"))
-                return "array";
-            else if (availableTypes.includes("email") && isEmail(input))
-                return "email";
-            else if (availableTypes.includes("url") && isURL(input))
-                return "url";
-            else if (availableTypes.includes("password") && isPassword(input))
-                return "password";
-            else if (availableTypes.includes("json") && isJSON(input))
-                return "json";
-            else if (availableTypes.includes("json") && isDate(input))
-                return "json";
-            else if (availableTypes.includes("string") && isString(input))
-                return "string";
-            else if (availableTypes.includes("ip") && isIP(input))
-                return "ip";
+            else if (typeof input === "string") {
+                if (availableTypes.includes("table") && isValidID(input))
+                    return "table";
+                if (input.startsWith("[") && availableTypes.includes("array"))
+                    return "array";
+                if (availableTypes.includes("email") && isEmail(input))
+                    return "email";
+                if (availableTypes.includes("url") && isURL(input))
+                    return "url";
+                if (availableTypes.includes("password") && isPassword(input))
+                    return "password";
+                if (availableTypes.includes("json") && isJSON(input))
+                    return "json";
+                if (availableTypes.includes("json") && isDate(input))
+                    return "json";
+                if (availableTypes.includes("string") && isString(input))
+                    return "string";
+                if (availableTypes.includes("ip") && isIP(input))
+                    return "ip";
+            }
         }
         else
             return "array";

package/package.json

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