inibase 1.1.27 → 1.1.29

package/dist/file.js

@@ -159,9 +159,9 @@ const decodeHelper = (value, field) => {
             return isNumber(value) &&
                 (!field.table ||
                     !field.databasePath ||
-                    field.key !== "id" ||
-                    !globalConfig[field.databasePath].tables?.get(field.table)?.config
-                        .decodeID)
+                    (!globalConfig[field.databasePath].tables?.get(field.table)?.config
+                        .decodeID &&
+                        field.key !== "id"))
                 ? encodeID(value)
                 : value;
         default:

package/dist/index.js

@@ -873,11 +873,12 @@ export default class Inibase {
             (await File.isExists(join(this.databasePath, field.table)))) {
             const fieldPath = join(this.databasePath, tableName, `${prefix ?? ""}${field.key}${this.getFileExtension(tableName)}`);
             if (await File.isExists(fieldPath)) {
+                // add table to globalConfig
+                await this.getTable(field.table);
                 const itemsIDs = (await File.get(fieldPath, linesNumber, {
                     ...field,
                     databasePath: this.databasePath,
                 }));
-                const isArrayField = this.isArrayField(field.type);
                 if (itemsIDs) {
                     const searchableIDs = new Map();
                     for (const [lineNumber, lineContent] of Object.entries(itemsIDs)) {
@@ -889,29 +890,33 @@ export default class Inibase {
                             searchableIDs.set(lineNumber, lineContent);
                     }
                     if (searchableIDs.size) {
-                        const items = await this.get(field.table, Array.from(new Set(isArrayField
-                            ? Array.from(searchableIDs.values()).flat()
-                            : searchableIDs.values())).flat(), {
+                        const items = await this.get(field.table, Array.from(new Set(Array.from(searchableIDs.values()).flat()))
+                            .flat()
+                            .filter((item) => item), {
                             ...options,
                             perPage: Number.POSITIVE_INFINITY,
                             columns: options.columns
                                 ?.filter((column) => column.includes(`${field.key}.`))
                                 .map((column) => column.replace(`${field.key}.`, "")),
                         });
-                        for (const [lineNumber, lineContent] of searchableIDs.entries())
-                            RETURN[lineNumber][field.key] = isArrayField
-                                ? Utils.isArrayOfArrays(lineContent)
-                                    ? lineContent.map((item) => items
-                                        ? items.filter(({ id }) => item.includes(id))
+                        const formatLineContent = (lineContent) => Array.isArray(lineContent)
+                            ? lineContent.map((singleContent) => singleContent
+                                ? Array.isArray(singleContent)
+                                    ? singleContent.map(formatLineContent)
+                                    : items
+                                        ? items.find(({ id }) => singleContent === id)
                                         : {
-                                            id: item,
-                                        })
-                                    : lineContent.flatMap((item) => items
-                                        ? items.find(({ id }) => item === id)
-                                        : { id: item })
-                                : (items?.find(({ id }) => id === lineContent) ?? {
-                                    id: lineContent,
-                                });
+                                            id: singleContent,
+                                        }
+                                : singleContent)
+                            : (items?.find(({ id }) => lineContent === id) ?? {
+                                id: lineContent,
+                            });
+                        for (const [lineNumber, lineContent] of searchableIDs.entries()) {
+                            if (!lineContent)
+                                continue;
+                            RETURN[lineNumber][field.key] = formatLineContent(lineContent);
+                        }
                     }
                 }
             }
@@ -948,6 +953,8 @@ export default class Inibase {
             let index = -1;
             for await (const [key, value] of Object.entries(criteria)) {
                 const field = Utils.getField(key, globalConfig[this.databasePath].tables.get(tableName).schema);
+                if (!field)
+                    continue;
                 index++;
                 let searchOperator = undefined;
                 let searchComparedAtValue = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",