inibase 1.0.0-rc.67 → 1.0.0-rc.69

package/dist/index.d.ts

@@ -33,7 +33,7 @@ export interface TableObject {
     config: Config;
 }
 export type ComparisonOperator = "=" | "!=" | ">" | "<" | ">=" | "<=" | "*" | "!*" | "[]" | "![]";
-type pageInfo = {
+export type pageInfo = {
     total?: number;
     totalPages?: number;
 } & Options;
@@ -201,4 +201,3 @@ export default class Inibase {
      */
     sort(tableName: string, columns: string | string[] | Record<string, 1 | -1 | "asc" | "ASC" | "desc" | "DESC">, where?: string | number | (string | number)[] | Criteria, options?: Options): Promise<any[]>;
 }
-export {};

package/dist/index.js

@@ -689,7 +689,7 @@ export default class Inibase {
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).length ===
                     Object.keys(criteria.and ?? {}).length)));
-                delete criteria.and;
+                criteria.and = undefined;
                 RETURN_LineNumbers = lineNumbers;
             }
             else
@@ -697,7 +697,7 @@ export default class Inibase {
         }
         if (criteria.or && Utils.isObject(criteria.or)) {
             const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.or, false);
-            delete criteria.or;
+            criteria.or = undefined;
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, searchResult);
                 RETURN_LineNumbers = lineNumbers;
@@ -724,7 +724,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_or) => single_or[1]);
                             searchLogicalOperator = "or";
                         }
-                        delete value.or;
+                        value.or = undefined;
                     }
                     if (value?.and &&
                         Array.isArray(value?.and)) {
@@ -738,7 +738,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_and) => single_and[1]);
                             searchLogicalOperator = "and";
                         }
-                        delete value.and;
+                        value.and = undefined;
                     }
                 }
                 else if (Array.isArray(value)) {
@@ -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.67",
+  "version": "1.0.0-rc.69",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",
@@ -69,16 +69,17 @@
   },
   "devDependencies": {
     "@types/node": "^20.12.11",
-    "tinybench": "^2.6.0"
+    "tinybench": "^2.6.0",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "dotenv": "^16.4.5",
     "inison": "^1.0.0-rc.2"
   },
   "scripts": {
-    "build": "tsc",
-    "benchmark": "tsx ./benchmark/index",
-    "benchmark:single": "tsx --expose-gc ./benchmark/single",
-    "benchmark:bulk": "tsx --expose-gc ./benchmark/bulk"
+    "build": "npx tsc",
+    "benchmark": "npx tsx ./benchmark/index",
+    "benchmark:single": "npx tsx --expose-gc ./benchmark/single",
+    "benchmark:bulk": "npx tsx --expose-gc ./benchmark/bulk"
   }
 }