inibase 1.5.4 → 1.5.5

package/dist/index.js

@@ -195,7 +195,7 @@ export default class Inibase {
             await writeFile(join(tablePath, "0.schema"), "");
         await writeFile(join(tablePath, "0-0.pagination"), "");
     }
-    // Function to replace the string in one schema.json file
+    // Function to replace the string in one schema file
     async replaceStringInFile(filePath, targetString, replaceString) {
         const data = await readFile(filePath, "utf8");
         if (data.includes(targetString)) {
@@ -223,7 +223,7 @@ export default class Inibase {
                 value: schemaIdFilePath ? Number(parse(schemaIdFilePath).name) : 0,
             };
             schema = Utils.addIdToSchema(schema, lastSchemaID);
-            // if schema.json exists, update columns files names based on field id
+            // if schema file exists, update columns files names based on field id
             if ((await File.isExists(join(tablePath, `schema.${this.schemaFileExtension}`))) &&
                 table.schema?.length) {
                 const replaceOldPathes = Utils.findChangedProperties(this.schemaToIdsPath(tableName, table.schema), this.schemaToIdsPath(tableName, schema));
@@ -333,7 +333,7 @@ export default class Inibase {
             throw this.createError("TABLE_NOT_EXISTS", tableName);
         if (!globalConfig[this.databasePath].tables.has(tableName) ||
             globalConfig[this.databasePath].tables.get(tableName).timestamp !==
-                (await File.getFileDate(join(tablePath, "schema.json"))))
+                (await File.getFileDate(join(tablePath, `schema.${this.schemaFileExtension}`))))
             globalConfig[this.databasePath].tables.set(tableName, {
                 schema: await this.getTableSchema(tableName),
                 config: {
@@ -342,7 +342,7 @@ export default class Inibase {
                     prepend: await File.isExists(join(tablePath, ".prepend.config")),
                     decodeID: await File.isExists(join(tablePath, ".decodeID.config")),
                 },
-                timestamp: await File.getFileDate(join(tablePath, "schema.json")),
+                timestamp: await File.getFileDate(join(tablePath, `schema.${this.schemaFileExtension}`)),
             });
         return globalConfig[this.databasePath].tables.get(tableName);
     }
@@ -1018,9 +1018,9 @@ export default class Inibase {
                     else if (allTrue)
                         return null;
                 }
-                let searchOperator = undefined;
-                let searchComparedAtValue = undefined;
-                let searchLogicalOperator = undefined;
+                let searchOperator;
+                let searchComparedAtValue;
+                let searchLogicalOperator;
                 if (Utils.isObject(value)) {
                     /* nested object with .and / .or inside */
                     const nestedAnd = value.and;
@@ -1353,18 +1353,22 @@ export default class Inibase {
             (Utils.isObject(RETURN) && !Object.keys(RETURN).length) ||
             (Array.isArray(RETURN) && !RETURN.length))
             return null;
-        const greatestTotalItems = this.totalItems.has(`${tableName}-*`)
-            ? this.totalItems.get(`${tableName}-*`)
-            : Math.max(...[...this.totalItems.entries()]
+        let total;
+        if (Utils.isObject(where))
+            total = Math.min(...[...this.totalItems.entries()]
                 .filter(([k]) => k.startsWith(`${tableName}-`))
                 .map(([, v]) => v));
+        else
+            total = this.totalItems.has(`${tableName}-*`)
+                ? this.totalItems.get(`${tableName}-*`)
+                : Math.max(...[...this.totalItems.entries()]
+                    .filter(([k]) => k.startsWith(`${tableName}-`))
+                    .map(([, v]) => v));
         this.pageInfo[tableName] = {
             ...(({ columns, ...restOfOptions }) => restOfOptions)(options),
             perPage: Array.isArray(RETURN) ? RETURN.length : 1,
-            totalPages: options.perPage < 0
-                ? 1
-                : Math.ceil(greatestTotalItems / options.perPage),
-            total: greatestTotalItems,
+            totalPages: options.perPage < 0 ? 1 : Math.ceil(total / options.perPage),
+            total: total,
         };
         return onlyOne && Array.isArray(RETURN) ? RETURN[0] : RETURN;
     }

package/package.json

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