inibase 1.0.0-rc.97 → 1.0.0-rc.98

package/dist/index.js

@@ -605,15 +605,15 @@ export default class Inibase {
                         (await File.isExists(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`)))) {
                         const itemsIDs = await File.get(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`), linesNumber, field.type, field.children, this.salt);
                         if (itemsIDs) {
-                            const searchableIDs = {};
-                            for (const [index, item] of Object.entries(itemsIDs)) {
-                                if (!RETURN[index])
-                                    RETURN[index] = {};
-                                if (item !== null && item !== undefined)
-                                    searchableIDs[index] = item;
+                            const searchableIDs = new Map();
+                            for (const [lineNumber, lineContent] of Object.entries(itemsIDs)) {
+                                if (!RETURN[lineNumber])
+                                    RETURN[lineNumber] = {};
+                                if (lineContent !== null && lineContent !== undefined)
+                                    searchableIDs.set(lineNumber, lineContent);
                             }
-                            if (Object.keys(searchableIDs).length) {
-                                const items = await this.get(field.table, [].concat(...Object.values(searchableIDs)), {
+                            if (searchableIDs.size) {
+                                const items = await this.get(field.table, Array.from(new Set(Array.from(searchableIDs.values()).flat())), {
                                     ...options,
                                     perPage: Number.POSITIVE_INFINITY,
                                     columns: options.columns
@@ -621,10 +621,10 @@ export default class Inibase {
                                         .map((column) => column.replace(`${field.key}.`, "")),
                                 });
                                 if (items) {
-                                    let cursor = 0;
-                                    for (const [index, Ids] of Object.entries(searchableIDs)) {
-                                        RETURN[index][field.key] = items.slice(cursor, cursor + Ids.length);
-                                        cursor += Ids.length;
+                                    for (const [lineNumber, lineContent,] of searchableIDs.entries()) {
+                                        const foundedItems = items.filter(({ id }) => lineContent.includes(id));
+                                        if (foundedItems)
+                                            RETURN[lineNumber][field.key] = foundedItems;
                                     }
                                 }
                             }
@@ -660,15 +660,15 @@ export default class Inibase {
                     (await File.isExists(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`)))) {
                     const itemsIDs = await File.get(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`), linesNumber, field.type, field.children, this.salt);
                     if (itemsIDs) {
-                        const searchableIDs = {};
-                        for (const [index, item] of Object.entries(itemsIDs)) {
-                            if (!RETURN[index])
-                                RETURN[index] = {};
-                            if (item !== null && item !== undefined)
-                                searchableIDs[index] = item;
+                        const searchableIDs = new Map();
+                        for (const [lineNumber, lineContent] of Object.entries(itemsIDs)) {
+                            if (!RETURN[lineNumber])
+                                RETURN[lineNumber] = {};
+                            if (lineContent !== null && lineContent !== undefined)
+                                searchableIDs.set(lineNumber, lineContent);
                         }
-                        if (Object.keys(searchableIDs).length) {
-                            const items = await this.get(field.table, Object.values(searchableIDs), {
+                        if (searchableIDs.size) {
+                            const items = await this.get(field.table, Array.from(new Set(searchableIDs.values())), {
                                 ...options,
                                 perPage: Number.POSITIVE_INFINITY,
                                 columns: options.columns
@@ -676,10 +676,10 @@ export default class Inibase {
                                     .map((column) => column.replace(`${field.key}.`, "")),
                             });
                             if (items) {
-                                let cursor = 0;
-                                for (const [index] of Object.entries(searchableIDs)) {
-                                    RETURN[index][field.key] = items[cursor];
-                                    cursor++;
+                                for (const [lineNumber, lineContent,] of searchableIDs.entries()) {
+                                    const foundedItem = items.find(({ id }) => id === lineContent);
+                                    if (foundedItem)
+                                        RETURN[lineNumber][field.key] = foundedItem;
                                 }
                             }
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.97",
+  "version": "1.0.0-rc.98",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",