inibase 1.5.4 → 1.5.6

package/dist/cli.js

@@ -197,12 +197,12 @@ rl.on("line", async (input) => {
                 console.log(`${textRed("  Err:")} Please specify table name`);
                 break;
             }
-            let where = undefined;
-            let page = undefined;
-            let perPage = undefined;
-            let columns = undefined;
-            let sort = undefined;
-            let data = undefined;
+            let where;
+            let page;
+            let perPage;
+            let columns;
+            let sort;
+            let data;
             if (splitedInput.toSpliced(0, 1).length) {
                 const parsedArgs = parseArgs({
                     args: splitedInput.toSpliced(0, table ? 1 : 2),

package/dist/index.d.ts

@@ -151,8 +151,8 @@ export default class Inibase {
     get<TData extends Record<string, any> & Partial<Data>>(tableName: string, where: string | number | (string | number)[] | Criteria | undefined, options: Options | undefined, onlyOne: true, onlyLinesNumbers?: false, _whereIsLinesNumbers?: boolean): Promise<(Data & TData) | null>;
     get<TData extends Record<string, any> & Partial<Data>>(tableName: string, where: string | number, options?: Options, onlyOne?: boolean, onlyLinesNumbers?: false, _whereIsLinesNumbers?: boolean): Promise<(Data & TData) | null>;
     get<TData extends Record<string, any> & Partial<Data>>(tableName: string, where?: string | number | (string | number)[] | Criteria, options?: Options, onlyOne?: boolean, onlyLinesNumbers?: false, _whereIsLinesNumbers?: boolean): Promise<(Data & TData)[] | null>;
-    get<TData extends Record<string, any> & Partial<Data>>(tableName: string, where: string | number | (string | number)[] | Criteria | undefined, options: Options | undefined, onlyOne: false | undefined, onlyLinesNumbers: true, _whereIsLinesNumbers?: boolean): Promise<number[] | null>;
-    get<TData extends Record<string, any> & Partial<Data>>(tableName: string, where: string | number | (string | number)[] | Criteria | undefined, options: Options | undefined, onlyOne: true, onlyLinesNumbers: true, _whereIsLinesNumbers?: boolean): Promise<number | null>;
+    get<_TData extends Record<string, any> & Partial<Data>>(tableName: string, where: string | number | (string | number)[] | Criteria | undefined, options: Options | undefined, onlyOne: false | undefined, onlyLinesNumbers: true, _whereIsLinesNumbers?: boolean): Promise<number[] | null>;
+    get<_TData extends Record<string, any> & Partial<Data>>(tableName: string, where: string | number | (string | number)[] | Criteria | undefined, options: Options | undefined, onlyOne: true, onlyLinesNumbers: true, _whereIsLinesNumbers?: boolean): Promise<number | null>;
     /**
      * Create new item(s) in a table
      *

package/dist/index.js

@@ -1,7 +1,7 @@
 import "dotenv/config";
 import { randomBytes, scryptSync } from "node:crypto";
 import { appendFileSync, existsSync, readFileSync } from "node:fs";
-import { glob, mkdir, readFile, readdir, rename, rm, unlink, writeFile, } from "node:fs/promises";
+import { glob, mkdir, readdir, readFile, rename, rm, unlink, writeFile, } from "node:fs/promises";
 import { join, parse } from "node:path";
 import { inspect } from "node:util";
 import Inison from "inison";
@@ -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;
@@ -1149,6 +1149,7 @@ export default class Inibase {
         options.columns = options.columns || [];
         options.page = options.page || 1;
         options.perPage = options.perPage || 15;
+        let total;
         let RETURN;
         let schema = structuredClone((await this.getTable(tableName)).schema);
         if (!schema)
@@ -1345,6 +1346,12 @@ export default class Inibase {
                     .map(({ id }) => id);
                 RETURN = Object.values(Utils.deepMerge(LineNumberDataObj, await this.processSchemaData(tableName, Utils.filterSchema(schema, (field) => !alreadyExistsColumnsIDs.includes(field.id) ||
                     Utils.isFieldType(field, "table")), Object.keys(LineNumberDataObj).map(Number), options)));
+                total = Math.min(...[...this.totalItems.entries()]
+                    .filter(([k]) => k.startsWith(`${tableName}-`))
+                    .map(([, v]) => v));
+                for (const [key] of this.totalItems)
+                    if (key.startsWith(`${tableName}-`) && key !== `${tableName}-id`)
+                        this.totalItems.delete(key);
                 if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
                     await writeFile(cachedFilePath, Object.keys(LineNumberDataObj).join(","));
             }
@@ -1353,18 +1360,17 @@ 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()]
-                .filter(([k]) => k.startsWith(`${tableName}-`))
-                .map(([, v]) => v));
+        if (total === undefined)
+            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,
         };
         return onlyOne && Array.isArray(RETURN) ? RETURN[0] : RETURN;
     }

package/dist/utils.js

@@ -64,7 +64,7 @@ export const isNumber = (input) => {
     return false;
 };
 // As a literal (no double-escaping).
-const emailPattern = /^[A-Za-z0-9!#%&'*+\/=?^_`{|}~-]+(?:\.[A-Za-z0-9!#%&'*+\/=?^_`{|}~-]+)*@(?:[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?\.)+[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?$/;
+const emailPattern = /^[A-Za-z0-9!#%&'*+/=?^_`{|}~-]+(?:\.[A-Za-z0-9!#%&'*+/=?^_`{|}~-]+)*@(?:[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?\.)+[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?$/;
 /**
  * Checks if the input is a valid email format.
  *
@@ -566,7 +566,7 @@ export const unsetField = (keyPath, schema) => {
 export function toDotNotation(obj, skipKeys, currentPath = "") {
     const result = {};
     for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        if (Object.hasOwn(obj, key)) {
             const value = obj[key];
             const newKey = currentPath ? `${currentPath}.${key}` : key;
             if (skipKeys?.includes(key.toLowerCase())) {

package/dist/utils.server.js

@@ -3,10 +3,10 @@ import { execFile as execFileSync, exec as execSync } from "node:child_process";
 import { createCipheriv, createDecipheriv, createHash, randomBytes, scryptSync, } from "node:crypto";
 import { promisify } from "node:util";
 import { gunzip as gunzipSync, gzip as gzipSync } from "node:zlib";
+import Inison from "inison";
 import RE2 from "re2";
 import { globalConfig } from "./index.js";
 import { detectFieldType, isNumber, isPassword } from "./utils.js";
-import Inison from "inison";
 export const exec = promisify(execSync);
 export const execFile = promisify(execFileSync);
 export const gzip = promisify(gzipSync);

package/package.json

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