inibase 1.1.24 → 1.1.26

package/dist/file.js

@@ -155,15 +155,15 @@ const decodeHelper = (value, field) => {
                 }));
             break;
         case "table":
+        case "id":
             return isNumber(value) &&
                 (!field.table ||
                     !field.databasePath ||
+                    field.key !== "id" ||
                     !globalConfig[field.databasePath].tables?.get(field.table)?.config
                         .decodeID)
                 ? encodeID(value)
                 : value;
-        case "id":
-            return isNumber(value) ? encodeID(value) : value;
         default:
             return value;
     }

package/dist/index.js

@@ -935,16 +935,9 @@ export default class Inibase {
         let RETURN = {};
         if (!criteria)
             return [null, null];
-        if (criteria.and && Utils.isObject(criteria.and)) {
-            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, options, criteria.and, true, searchIn);
-            if (searchResult) {
-                RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).filter((key) => Object.keys(criteria.and).includes(key)).length)));
-                delete criteria.and;
-                searchIn = lineNumbers;
-            }
-            else
-                return [null, null];
-        }
+        const criteriaAND = criteria.and;
+        if (criteriaAND)
+            delete criteria.and;
         const criteriaOR = criteria.or;
         if (criteriaOR)
             delete criteria.or;
@@ -1012,7 +1005,11 @@ 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, databasePath: this.databasePath }, options.perPage, (options.page - 1) * options.perPage + 1, true);
+                const [searchResult, totalLines, linesNumbers] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, searchIn, {
+                    ...field,
+                    databasePath: this.databasePath,
+                    table: field.table ?? tableName,
+                }, options.perPage, (options.page - 1) * options.perPage + 1, true);
                 if (searchResult) {
                     const formatedSearchResult = Object.fromEntries(Object.entries(searchResult).map(([id, value]) => {
                         const nestedObj = {};
@@ -1023,20 +1020,23 @@ export default class Inibase {
                         ? formatedSearchResult
                         : Utils.deepMerge(RETURN, formatedSearchResult);
                     this.totalItems.set(`${tableName}-${key}`, totalLines);
-                    if (linesNumbers?.size) {
-                        if (searchIn && !allTrue)
-                            for (const lineNumber of linesNumbers)
-                                searchIn.add(lineNumber);
-                        else
-                            searchIn = linesNumbers;
-                    }
+                    if (linesNumbers?.size && allTrue)
+                        searchIn = linesNumbers;
                 }
                 else if (allTrue)
-                    return [null, null];
+                    return null;
             }
         }
+        if (criteriaAND && Utils.isObject(criteriaAND)) {
+            const searchResult = await this.applyCriteria(tableName, options, criteriaAND, true, searchIn);
+            if (searchResult) {
+                RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).filter((key) => Object.keys(criteriaAND).includes(key)).length)));
+            }
+            else
+                return null;
+        }
         if (criteriaOR && Utils.isObject(criteriaOR)) {
-            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, options, criteriaOR, false, searchIn);
+            const searchResult = await this.applyCriteria(tableName, options, criteriaOR, false, searchIn);
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, searchResult);
                 if (!Object.keys(RETURN).length)
@@ -1045,10 +1045,9 @@ export default class Inibase {
                     Object.keys(criteriaOR).some((criteriaKey) => criteriaKey.startsWith(`${key}.`))).length));
                 if (!Object.keys(RETURN).length)
                     RETURN = {};
-                searchIn = lineNumbers;
             }
         }
-        return [Object.keys(RETURN).length ? RETURN : null, searchIn];
+        return Object.keys(RETURN).length ? RETURN : null;
     }
     _filterSchemaByColumns(schema, columns) {
         return schema
@@ -1282,22 +1281,22 @@ export default class Inibase {
                         .map(Number), options, onlyOne, undefined, true);
                 }
             }
-            const [LineNumberDataMap, linesNumbers] = await this.applyCriteria(tableName, options, where);
-            if (LineNumberDataMap && linesNumbers?.size) {
+            const LineNumberDataObj = await this.applyCriteria(tableName, options, where);
+            if (LineNumberDataObj) {
                 if (!this.totalItems.has(`${tableName}-*`))
-                    this.totalItems.set(`${tableName}-*`, linesNumbers.size);
+                    this.totalItems.set(`${tableName}-*`, Object.keys(LineNumberDataObj).length);
                 if (onlyLinesNumbers)
                     return onlyOne
-                        ? linesNumbers.values().next().value
-                        : Array.from(linesNumbers);
-                const alreadyExistsColumns = Object.keys(Object.values(LineNumberDataMap)[0]);
+                        ? Number(Object.keys(LineNumberDataObj)[0])
+                        : Object.keys(LineNumberDataObj).map(Number);
+                const alreadyExistsColumns = Object.keys(Object.values(LineNumberDataObj)[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, (field) => !alreadyExistsColumnsIDs.includes(field.id) ||
-                    Utils.isFieldType(field, "table")), Object.keys(LineNumberDataMap).map(Number), options)));
+                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)));
                 if (globalConfig[this.databasePath].tables.get(tableName).config.cache)
-                    await writeFile(cachedFilePath, Array.from(linesNumbers).join(","));
+                    await writeFile(cachedFilePath, Object.keys(LineNumberDataObj).join(","));
             }
         }
         if (!RETURN ||

package/package.json

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