inibase 1.0.0-rc.48 → 1.0.0-rc.49

package/README.md

@@ -108,7 +108,8 @@ Ps: Testing by default with `user` table, with username, email, password fields
   - [x] JSON
 - [ ] TO-DO:
   - [x] Improve caching
-  - [x] Commenting the code
+  - [ ] Commenting the code
+  - [ ] 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/file.js

@@ -107,7 +107,11 @@ const secureString = (input) => {
  * @param input - A value or array of values (string, number, boolean, null).
  * @returns The secured and/or joined string.
  */
-export const encode = (input) => Array.isArray(input) ? Inison.stringify(input) : secureString(input);
+export const encode = (input) => Array.isArray(input)
+    ? input.every((_input) => typeof _input === "string" && isJSON(_input))
+        ? `[${input.join(",")}]`
+        : Inison.stringify(input)
+    : secureString(input);
 /**
  * Reverses the encoding done by 'secureString'. Replaces encoded characters with their original symbols.
  *

package/dist/index.js

@@ -8,6 +8,7 @@ import Utils from "./utils.js";
 import UtilsServer from "./utils.server.js";
 import Config from "./config.js";
 import { inspect } from "node:util";
+import Inison from "inison";
 export default class Inibase {
     folder;
     database;
@@ -261,6 +262,10 @@ export default class Inibase {
                 return Utils.isNumber(value)
                     ? value
                     : UtilsServer.decodeID(value, this.salt);
+            case "json":
+                return typeof value !== "string" || !Utils.isJSON(value)
+                    ? Inison.stringify(value)
+                    : value;
             default:
                 return value;
         }
@@ -323,12 +328,12 @@ export default class Inibase {
                 result[key].push(value);
         return result;
     }, {});
-    _CombineData = (_data, prefix) => {
+    _CombineData = (data, prefix) => {
         let RETURN = {};
-        if (Utils.isArrayOfObjects(_data))
-            RETURN = this._combineObjectsToArray(_data.map((single_data) => this._CombineData(single_data)));
+        if (Utils.isArrayOfObjects(data))
+            RETURN = this._combineObjectsToArray(data.map((single_data) => this._CombineData(single_data)));
         else
-            for (const [key, value] of Object.entries(_data)) {
+            for (const [key, value] of Object.entries(data)) {
                 if (Utils.isObject(value))
                     Object.assign(RETURN, this._CombineData(value, `${key}.`));
                 else if (Utils.isArrayOfObjects(value)) {
@@ -431,16 +436,21 @@ export default class Inibase {
                                     RETURN[index][field.key] = item;
                                 else {
                                     RETURN[index][field.key] = [];
-                                    Object.entries(item).forEach(([key, value]) => {
-                                        for (let _i = 0; _i < value.length; _i++) {
-                                            if (value[_i] === null ||
-                                                (Array.isArray(value[_i]) &&
-                                                    Utils.isArrayOfNulls(value[_i])))
-                                                continue;
-                                            if (!RETURN[index][field.key][_i])
-                                                RETURN[index][field.key][_i] = {};
-                                            RETURN[index][field.key][_i][key] = value[_i];
+                                    Object.entries(item).forEach(([key, value], _ind) => {
+                                        if (!Array.isArray(value)) {
+                                            RETURN[index][field.key][_ind] = {};
+                                            RETURN[index][field.key][_ind][key] = value;
                                         }
+                                        else
+                                            for (let _i = 0; _i < value.length; _i++) {
+                                                if (value[_i] === null ||
+                                                    (Array.isArray(value[_i]) &&
+                                                        Utils.isArrayOfNulls(value[_i])))
+                                                    continue;
+                                                if (!RETURN[index][field.key][_i])
+                                                    RETURN[index][field.key][_i] = {};
+                                                RETURN[index][field.key][_i][key] = value[_i];
+                                            }
                                     });
                                 }
                             }

package/dist/utils.d.ts

@@ -204,5 +204,6 @@ export default class Utils {
     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

@@ -435,4 +435,5 @@ export default class Utils {
     static FormatObjectCriteriaValue = FormatObjectCriteriaValue;
     static swapKeyValue = swapKeyValue;
     static getField = getField;
+    static isJSON = isJSON;
 }

package/package.json

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