npm - inibase - Versions diffs - 1.0.0-rc.97 → 1.0.0-rc.99 - Mend

inibase 1.0.0-rc.97 → 1.0.0-rc.99

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/file.js CHANGED Viewed

@@ -89,7 +89,7 @@ const secureString = (input) => {
         decodedInput = decodeURIComponent(input.replace(/%(?![0-9][0-9a-fA-F]+)/g, ""));
     }
     // Replace characters using a single regular expression.
-    return decodedInput.replace(/\\n/g, "\n").replace(/\n/g, "\\n");
+    return decodedInput.replace(/\r\n|\r|\n/g, "\\n");
 };
 /**
  * Encodes the input using 'secureString' and 'Inison.stringify' functions.

package/dist/index.js CHANGED Viewed

@@ -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 CHANGED Viewed

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