inibase 1.2.14 → 1.2.16

package/dist/index.d.ts

@@ -68,7 +68,7 @@ export default class Inibase {
     fileExtension: string;
     private databasePath;
     private uniqueMap;
-    private totalItems;
+    totalItems: Map<string, number>;
     constructor(database: string, mainFolder?: string, language?: ErrorLang);
     private static errorMessages;
     createError(name: ErrorCodes, variable?: string | number | (string | number)[]): Error;

package/dist/index.js

@@ -908,7 +908,7 @@ export default class Inibase {
                             ? lineContent
                                 .map((singleContent) => singleContent
                                 ? Array.isArray(singleContent)
-                                    ? singleContent.map(formatLineContent)
+                                    ? singleContent.map(formatLineContent).filter(Boolean)
                                     : items?.find(({ id }) => singleContent === id)
                                 : singleContent)
                                 .filter(Boolean)
@@ -1037,8 +1037,10 @@ export default class Inibase {
         }
         if (criteriaAND && Utils.isObject(criteriaAND)) {
             const searchResult = await this.applyCriteria(tableName, options, criteriaAND, true, searchIn);
-            if (searchResult)
+            if (searchResult) {
+                searchIn = new Set(Object.keys(searchResult).map(Number));
                 RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).filter((key) => Object.keys(criteriaAND).includes(key)).length)));
+            }
             else
                 return null;
         }
@@ -1230,8 +1232,7 @@ export default class Inibase {
                 : Array.from({ length: options.perPage }, (_, index) => (options.page - 1) * options.perPage +
                     index +
                     1), options));
-            if (!this.totalItems.has(`${tableName}-*`))
-                this.totalItems.set(`${tableName}-*`, pagination[1]);
+            this.totalItems.set(`${tableName}-id`, pagination[1]);
         }
         else if (((Array.isArray(where) && where.every(Utils.isNumber)) ||
             Utils.isNumber(where)) &&
@@ -1241,8 +1242,7 @@ export default class Inibase {
             let lineNumbers = where;
             if (!Array.isArray(lineNumbers))
                 lineNumbers = [lineNumbers];
-            if (!this.totalItems.has(`${tableName}-*`))
-                this.totalItems.set(`${tableName}-*`, lineNumbers.length);
+            this.totalItems.set(`${tableName}-id`, lineNumbers.length);
             // useless
             if (onlyLinesNumbers)
                 return lineNumbers;
@@ -1259,11 +1259,10 @@ export default class Inibase {
             let Ids = where;
             if (!Array.isArray(Ids))
                 Ids = [Ids];
-            const [lineNumbers, countItems] = await File.search(join(tablePath, `id${this.getFileExtension(tableName)}`), "[]", Ids.map((id) => Utils.isNumber(id) ? Number(id) : UtilsServer.decodeID(id)), undefined, undefined, { key: "BLABLA", type: "number" }, Ids.length, 0, !this.totalItems.has(`${tableName}-*`));
+            const [lineNumbers, countItems] = await File.search(join(tablePath, `id${this.getFileExtension(tableName)}`), "[]", Ids.map((id) => Utils.isNumber(id) ? Number(id) : UtilsServer.decodeID(id)), undefined, undefined, { key: "BLABLA", type: "number" }, Ids.length, 0, !this.totalItems.has(`${tableName}-id`));
             if (!lineNumbers)
                 return null;
-            if (!this.totalItems.has(`${tableName}-*`))
-                this.totalItems.set(`${tableName}-*`, countItems);
+            this.totalItems.set(`${tableName}-id`, countItems);
             if (onlyLinesNumbers)
                 return Object.keys(lineNumbers).length
                     ? Object.keys(lineNumbers).map(Number)
@@ -1293,10 +1292,9 @@ export default class Inibase {
                         .map(Number), options, onlyOne, undefined, true);
                 }
             }
-            const LineNumberDataObj = await this.applyCriteria(tableName, options, where);
+            const LineNumberDataObj = await this.applyCriteria(tableName, options, structuredClone(where));
             if (LineNumberDataObj) {
-                if (!this.totalItems.has(`${tableName}-*`))
-                    this.totalItems.set(`${tableName}-*`, Object.keys(LineNumberDataObj).length);
+                this.totalItems.set(`${tableName}-*`, Object.keys(LineNumberDataObj).length);
                 if (onlyLinesNumbers)
                     return onlyOne
                         ? Number(Object.keys(LineNumberDataObj)[0])
@@ -1309,7 +1307,6 @@ export default class Inibase {
                     Utils.isFieldType(field, "table")), Object.keys(LineNumberDataObj).map(Number), options)));
                 if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                     await writeFile(cachedFilePath, Object.keys(LineNumberDataObj).join(","));
-                this.totalItems.delete(`${tableName}-*`);
             }
         }
         if (!RETURN ||
@@ -1324,7 +1321,9 @@ export default class Inibase {
         this.pageInfo[tableName] = {
             ...(({ columns, ...restOfOptions }) => restOfOptions)(options),
             perPage: Array.isArray(RETURN) ? RETURN.length : 1,
-            totalPages: Math.ceil(greatestTotalItems / options.perPage),
+            totalPages: options.perPage < 0
+                ? undefined
+                : Math.ceil(greatestTotalItems / options.perPage),
             total: greatestTotalItems,
         };
         return onlyOne && Array.isArray(RETURN) ? RETURN[0] : RETURN;

package/package.json

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