inibase 1.1.11 → 1.1.13

package/dist/cli.js

@@ -102,7 +102,7 @@ rl.on("line", async (input) => {
                         const configName = splitedInput[index].toLocaleLowerCase();
                         if (["true", "false"].includes(configName))
                             continue;
-                        if (!["compression", "cache", "prepend"].includes(configName)) {
+                        if (!["compression", "cache", "prepend", "decodeID"].includes(configName)) {
                             console.log(`${textRed("  Err:")} '${configName}' is not a valid config`);
                             break;
                         }

package/dist/index.js

@@ -641,7 +641,8 @@ export default class Inibase {
         return RETURN;
     }
     joinPathesContents(tableName, data) {
-        const tablePath = join(this.databasePath, tableName), combinedData = this._CombineData(data);
+        const tablePath = join(this.databasePath, tableName);
+        const combinedData = this._CombineData(data);
         const newCombinedData = {};
         for (const [key, value] of Object.entries(combinedData))
             newCombinedData[join(tablePath, `${key}${this.getFileExtension(tableName)}`)] = value;
@@ -948,7 +949,9 @@ export default class Inibase {
             for await (const [key, value] of Object.entries(criteria)) {
                 const field = Utils.getField(key, this.tablesMap.get(tableName).schema);
                 index++;
-                let searchOperator = undefined, searchComparedAtValue = undefined, searchLogicalOperator = undefined;
+                let searchOperator = undefined;
+                let searchComparedAtValue = undefined;
+                let searchLogicalOperator = undefined;
                 if (Utils.isObject(value)) {
                     if (value?.or &&
                         Array.isArray(value?.or)) {
@@ -1002,7 +1005,9 @@ export default class Inibase {
                     searchOperator = "=";
                     searchComparedAtValue = value;
                 }
-                const [searchResult, totalLines, linesNumbers] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, allTrue ? searchIn : undefined, field?.type, field?.children, options.perPage, (options.page - 1) * options.perPage + 1, true, this.salt);
+                const [searchResult, totalLines, linesNumbers] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, allTrue ? searchIn : undefined, field?.type, field?.children, options.perPage, (options.page - 1) * options.perPage + 1, true, field.key === "id" && this.tablesMap.get(tableName).config.decodeID
+                    ? undefined
+                    : this.salt);
                 if (searchResult) {
                     const formatedSearchResult = Object.fromEntries(Object.entries(searchResult).map(([id, value]) => {
                         const nestedObj = {};
@@ -1104,7 +1109,8 @@ export default class Inibase {
                 (Utils.isObject(where) && !Object.keys(where).length)))
             where = undefined;
         if (options.sort) {
-            let sortArray, awkCommand = "";
+            let sortArray;
+            let awkCommand = "";
             if (Utils.isObject(options.sort) && !Array.isArray(options.sort)) {
                 // {name: "ASC", age: "DESC"}
                 sortArray = Object.entries(options.sort).map(([key, value]) => [
@@ -1133,14 +1139,16 @@ export default class Inibase {
                     1)
                     .map((lineNumber) => `NR==${lineNumber}`)
                     .join(" || ")}'`;
-            const filesPathes = [["id", true], ...sortArray].map((column) => join(tablePath, `${column[0]}${this.getFileExtension(tableName)}`));
+            const filesPathes = (sortArray.find(([key]) => key === "id")
+                ? sortArray
+                : [["id", true], ...sortArray]).map((column) => join(tablePath, `${column[0]}${this.getFileExtension(tableName)}`));
             for await (const path of filesPathes.slice(1))
                 if (!(await File.isExists(path)))
                     return null;
             // Construct the paste command to merge files and filter lines by IDs
             const pasteCommand = `paste '${filesPathes.join("' '")}'`;
             // Construct the sort command dynamically based on the number of files for sorting
-            const index = 2;
+            const index = 1;
             const sortColumns = sortArray
                 .map(([key, ascending], i) => {
                 const field = Utils.getField(key, schema);
@@ -1178,8 +1186,13 @@ export default class Inibase {
                     // Extract values for each file, including `id${this.getFileExtension(tableName)}`
                     filesPathes.forEach((fileName, index) => {
                         const field = Utils.getField(parse(fileName).name, schema);
-                        if (field)
-                            outputObject[field.key] = File.decode(splitedFileColumns[index], field?.type, field?.children, this.salt);
+                        if (field) {
+                            if (field.key === "id" &&
+                                this.tablesMap.get(tableName).config.decodeID)
+                                outputObject[field.key] = splitedFileColumns[index];
+                            else
+                                outputObject[field.key] = File.decode(splitedFileColumns[index], field?.type, field?.children, this.salt);
+                        }
                     });
                     return outputObject;
                 });
@@ -1187,7 +1200,7 @@ export default class Inibase {
                 return restOfColumns
                     ? outputArray.map((item) => ({
                         ...item,
-                        ...restOfColumns.find(({ id }) => id === item.id),
+                        ...restOfColumns.find(({ id }) => id === (Utils.isNumber(item.id) ? Number(item.id) : item.id)),
                     }))
                     : outputArray;
             }
@@ -1271,7 +1284,8 @@ export default class Inibase {
                     return onlyOne
                         ? linesNumbers.values().next().value
                         : Array.from(linesNumbers);
-                const alreadyExistsColumns = Object.keys(Object.values(LineNumberDataMap)[0]), alreadyExistsColumnsIDs = Utils.flattenSchema(schema)
+                const alreadyExistsColumns = Object.keys(Object.values(LineNumberDataMap)[0]);
+                const alreadyExistsColumnsIDs = Utils.flattenSchema(schema)
                     .filter(({ key }) => alreadyExistsColumns.includes(key))
                     .map(({ id }) => id);
                 RETURN = Object.values(Utils.deepMerge(LineNumberDataMap, await this.processSchemaData(tableName, Utils.filterSchema(schema, ({ id, type, children }) => !alreadyExistsColumnsIDs.includes(id) ||
@@ -1295,15 +1309,6 @@ export default class Inibase {
             totalPages: Math.ceil(greatestTotalItems / options.perPage),
             total: greatestTotalItems,
         };
-        // if (this.tablesMap.get(tableName).config.decodeID) {
-        // 	if (Array.isArray(RETURN)) {
-        // 		for (let index = 0; index < RETURN.length; index++)
-        // 			RETURN[index].id = UtilsServer.decodeID(
-        // 				RETURN[index].id as string,
-        // 				this.salt,
-        // 			);
-        // 	} else RETURN.id = UtilsServer.decodeID(RETURN.id as string, this.salt);
-        // }
         return onlyOne && Array.isArray(RETURN) ? RETURN[0] : RETURN;
     }
     async post(tableName, data, options, returnPostedData) {
@@ -1469,7 +1474,8 @@ export default class Inibase {
             (Array.isArray(where) && where.every(Utils.isValidID)) ||
             Utils.isValidID(where)) {
             const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
-            return this.put(tableName, clonedData, lineNumbers, options, false, true);
+            if (lineNumbers)
+                return this.put(tableName, clonedData, lineNumbers, options, returnUpdatedData, true);
         }
         else if (Utils.isObject(where)) {
             const lineNumbers = await this.get(tableName, where, undefined, undefined, true);

package/dist/utils.server.js

@@ -221,6 +221,9 @@ export const isEqual = (originalValue, comparedValue, fieldType) => {
             // If both are null-like, treat as equivalent
             if (isOriginalNullLike && isComparedNullLike)
                 return true;
+            // If both are number-like
+            if (isNumber(originalValue) && isNumber(comparedValue))
+                return Number(originalValue) === Number(comparedValue);
             // Direct equality check for other cases
             return originalValue === comparedValue;
         }

package/package.json

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