inibase 1.0.0-rc.68 → 1.0.0-rc.69

package/dist/index.js

@@ -850,11 +850,9 @@ export default class Inibase {
             if (await File.isExists(join(tablePath, ".pagination")))
                 this.totalItems[`${tableName}-*`] = Number((await readFile(join(tablePath, ".pagination"), "utf8")).split(",")[1]);
             else {
-                let [lastId, totalItems] = await File.get(join(tablePath, `id${this.getFileExtension(tableName)}`), -1, "number", undefined, this.salt, true);
-                if (lastId)
-                    lastId = Number(Object.keys(lastId)?.[0] ?? 0);
-                this.totalItems[`${tableName}-*`] = totalItems;
-                await writeFile(join(tablePath, ".pagination"), `${lastId},${totalItems}`);
+                const lastId = Number(Object.keys((await File.get(join(tablePath, `id${this.getFileExtension(tableName)}`), -1, "number", undefined, this.salt, true))?.[0] ?? 0));
+                this.totalItems[`${tableName}-*`] = await File.count(join(tablePath, `id${this.getFileExtension(tableName)}`));
+                await writeFile(join(tablePath, ".pagination"), `${lastId},${this.totalItems[`${tableName}-*`]}`);
             }
         }
         else if ((Array.isArray(where) && where.every(Utils.isNumber)) ||
@@ -945,19 +943,17 @@ export default class Inibase {
             returnPostedData = false;
         let RETURN;
         const keys = UtilsServer.hashString(Object.keys(Array.isArray(data) ? data[0] : data).join("."));
-        let lastId = 0, totalItems = 0, renameList = [];
+        let lastId = 0, renameList = [];
         try {
             await File.lock(join(tablePath, ".tmp"), keys);
             if (await File.isExists(join(tablePath, `id${this.getFileExtension(tableName)}`))) {
                 if (await File.isExists(join(tablePath, ".pagination")))
-                    [lastId, totalItems] = (await readFile(join(tablePath, ".pagination"), "utf8"))
+                    [lastId, this.totalItems[`${tableName}-*`]] = (await readFile(join(tablePath, ".pagination"), "utf8"))
                         .split(",")
                         .map(Number);
                 else {
-                    let lastIdObj = null;
-                    [lastIdObj, totalItems] = await File.get(join(tablePath, `id${this.getFileExtension(tableName)}`), -1, "number", undefined, this.salt, true);
-                    if (lastIdObj)
-                        lastId = Number(Object.keys(lastIdObj)?.[0] ?? 0);
+                    const lastId = Number(Object.keys((await File.get(join(tablePath, `id${this.getFileExtension(tableName)}`), -1, "number", undefined, this.salt, true))?.[0] ?? 0));
+                    this.totalItems[`${tableName}-*`] = await File.count(join(tablePath, `id${this.getFileExtension(tableName)}`));
                 }
             }
             if (Utils.isArrayOfObjects(data))
@@ -985,18 +981,20 @@ export default class Inibase {
                 : await File.append(path, content))));
             await Promise.all(renameList.map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
             renameList = [];
-            totalItems += Array.isArray(RETURN) ? RETURN.length : 1;
+            this.totalItems[`${tableName}-*`] += Array.isArray(RETURN)
+                ? RETURN.length
+                : 1;
             if (this.tables[tableName].config.cache)
                 await this.clearCache(tableName);
-            await writeFile(join(tablePath, ".pagination"), `${lastId},${totalItems}`);
+            await writeFile(join(tablePath, ".pagination"), `${lastId},${this.totalItems[`${tableName}-*`]}`);
             if (returnPostedData)
                 return this.get(tableName, this.tables[tableName].config.prepend
                     ? Array.isArray(RETURN)
                         ? RETURN.map((_, index) => index + 1)
                         : 1
                     : Array.isArray(RETURN)
-                        ? RETURN.map((_, index) => totalItems - index)
-                        : totalItems, options, !Utils.isArrayOfObjects(data));
+                        ? RETURN.map((_, index) => this.totalItems[`${tableName}-*`] - index)
+                        : this.totalItems[`${tableName}-*`], options, !Utils.isArrayOfObjects(data));
         }
         finally {
             if (renameList.length)

package/package.json

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