inibase 1.0.0-rc.113 → 1.0.0-rc.115

package/dist/file.d.ts

@@ -107,7 +107,7 @@ export declare const remove: (filePath: string, linesToDelete: number | number[]
  *
  * Note: Decodes each line for comparison and can handle complex queries with multiple conditions.
  */
-export declare const search: (filePath: string, operator: ComparisonOperator | ComparisonOperator[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[], logicalOperator?: "and" | "or", fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | Schema, limit?: number, offset?: number, readWholeFile?: boolean, secretKey?: string | Buffer) => Promise<[Record<number, string | number | boolean | null | (string | number | boolean | null)[]> | null, number, Set<number> | null]>;
+export declare const search: (filePath: string, operator: ComparisonOperator | ComparisonOperator[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[], logicalOperator?: "and" | "or", searchIn?: Set<number>, fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[] | Schema, limit?: number, offset?: number, readWholeFile?: boolean, secretKey?: string | Buffer) => Promise<[Record<number, string | number | boolean | null | (string | number | boolean | null)[]> | null, number, Set<number> | null]>;
 /**
  * Asynchronously calculates the sum of numerical values from specified lines in a file.
  *

package/dist/file.js

@@ -505,7 +505,7 @@ export const remove = async (filePath, linesToDelete) => {
  *
  * Note: Decodes each line for comparison and can handle complex queries with multiple conditions.
  */
-export const search = async (filePath, operator, comparedAtValue, logicalOperator, fieldType, fieldChildrenType, limit, offset, readWholeFile, secretKey) => {
+export const search = async (filePath, operator, comparedAtValue, logicalOperator, searchIn, fieldType, fieldChildrenType, limit, offset, readWholeFile, secretKey) => {
     // Initialize a Map to store the matching lines with their line numbers.
     const matchingLines = {};
     // Initialize counters for line number, found items, and processed items.
@@ -521,6 +521,9 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
         for await (const line of rl) {
             // Increment the line count for each line.
             linesCount++;
+            // Search only in provided linesNumbers
+            if (searchIn && !searchIn.has(linesCount))
+                continue;
             // Decode the line for comparison.
             const decodedLine = decode(line, fieldType, fieldChildrenType, secretKey);
             // Check if the line meets the specified conditions based on comparison and logical operators.

package/dist/index.js

@@ -401,7 +401,7 @@ export default class Inibase {
             const field = Utils.getField(key, schema);
             if (!field)
                 continue;
-            const [searchResult, totalLines] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), Array.isArray(values) ? "=" : "[]", values, undefined, field.type, field.children, 1, undefined, false, this.salt);
+            const [searchResult, totalLines] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), Array.isArray(values) ? "=" : "[]", values, undefined, undefined, field.type, field.children, 1, undefined, false, this.salt);
             if (searchResult && totalLines > 0)
                 throw this.Error("FIELD_UNIQUE", [
                     field.key,
@@ -411,19 +411,21 @@ export default class Inibase {
         this.checkIFunique = {};
     }
     formatData(data, schema, formatOnlyAvailiableKeys) {
-        if (Utils.isArrayOfObjects(data))
-            return data.map((single_data) => this.formatData(single_data, schema, formatOnlyAvailiableKeys));
-        if (Utils.isObject(data)) {
+        const clonedData = JSON.parse(JSON.stringify(data));
+        if (Utils.isArrayOfObjects(clonedData))
+            return clonedData.map((singleData) => this.formatData(singleData, schema, formatOnlyAvailiableKeys));
+        if (Utils.isObject(clonedData)) {
+            const RETURN = {};
             for (const field of schema) {
-                if (!Object.hasOwn(data, field.key)) {
+                if (!Object.hasOwn(clonedData, field.key)) {
                     if (formatOnlyAvailiableKeys)
                         continue;
-                    data[field.key] = this.getDefaultValue(field);
+                    RETURN[field.key] = this.getDefaultValue(field);
                     continue;
                 }
-                data[field.key] = this.formatField(data[field.key], field.type, field.children, formatOnlyAvailiableKeys);
+                RETURN[field.key] = this.formatField(clonedData[field.key], field.type, field.children, formatOnlyAvailiableKeys);
             }
-            return data;
+            return RETURN;
         }
         return [];
     }
@@ -741,30 +743,24 @@ export default class Inibase {
             }
         }
     }
-    async applyCriteria(tableName, schema, options, criteria, allTrue) {
+    async applyCriteria(tableName, schema, options, criteria, allTrue, searchIn) {
         const tablePath = join(this.databasePath, tableName);
-        let RETURN = {}, RETURN_LineNumbers = null;
+        let RETURN = {};
         if (!criteria)
             return [null, null];
         if (criteria.and && Utils.isObject(criteria.and)) {
-            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.and, true);
+            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.and, true, searchIn);
             if (searchResult) {
-                RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).length ===
-                    Object.keys(criteria.and ?? {}).length)));
+                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;
-                RETURN_LineNumbers = lineNumbers;
+                searchIn = lineNumbers;
             }
             else
                 return [null, null];
         }
-        if (criteria.or && Utils.isObject(criteria.or)) {
-            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.or, false);
+        const criteriaOR = criteria.or;
+        if (criteriaOR)
             delete criteria.or;
-            if (searchResult) {
-                RETURN = Utils.deepMerge(RETURN, searchResult);
-                RETURN_LineNumbers = lineNumbers;
-            }
-        }
         if (Object.keys(criteria).length > 0) {
             if (allTrue === undefined)
                 allTrue = true;
@@ -826,7 +822,7 @@ export default class Inibase {
                     searchOperator = "=";
                     searchComparedAtValue = value;
                 }
-                const [searchResult, totalLines, linesNumbers] = await File.search(join(tablePath, `${key}${this.getFileExtension(tableName)}`), searchOperator ?? "=", searchComparedAtValue ?? null, searchLogicalOperator, 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, this.salt);
                 if (searchResult) {
                     RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).map(([id, value]) => [
                         id,
@@ -835,18 +831,32 @@ export default class Inibase {
                         },
                     ])));
                     this.totalItems[`${tableName}-${key}`] = totalLines;
-                    RETURN_LineNumbers = linesNumbers;
-                }
-                if (allTrue && index > 0) {
-                    if (!Object.keys(RETURN).length)
-                        RETURN = {};
-                    RETURN = Object.fromEntries(Object.entries(RETURN).filter(([_index, item]) => Object.keys(item).length > index));
-                    if (!Object.keys(RETURN).length)
-                        RETURN = {};
+                    if (linesNumbers?.size) {
+                        if (searchIn) {
+                            for (const lineNumber of linesNumbers)
+                                searchIn.add(lineNumber);
+                        }
+                        else
+                            searchIn = linesNumbers;
+                    }
                 }
+                else if (allTrue)
+                    return [null, null];
+            }
+        }
+        if (criteriaOR && Utils.isObject(criteriaOR)) {
+            const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteriaOR, false, searchIn);
+            if (searchResult) {
+                RETURN = Utils.deepMerge(RETURN, searchResult);
+                if (!Object.keys(RETURN).length)
+                    RETURN = {};
+                RETURN = Object.fromEntries(Object.entries(RETURN).filter(([_index, item]) => Object.keys(item).filter((key) => Object.keys(criteriaOR).includes(key)).length));
+                if (!Object.keys(RETURN).length)
+                    RETURN = {};
+                searchIn = lineNumbers;
             }
         }
-        return [Object.keys(RETURN).length ? RETURN : null, RETURN_LineNumbers];
+        return [Object.keys(RETURN).length ? RETURN : null, searchIn];
     }
     _filterSchemaByColumns(schema, columns) {
         return schema
@@ -947,7 +957,7 @@ export default class Inibase {
                 if (!(await File.isExists(path)))
                     return null;
             // Construct the paste command to merge files and filter lines by IDs
-            const pasteCommand = `paste ${filesPathes.join(" ")}`;
+            const pasteCommand = `paste '${filesPathes.join("' '")}'`;
             // Construct the sort command dynamically based on the number of files for sorting
             const index = 2;
             const sortColumns = sortArray
@@ -960,15 +970,15 @@ export default class Inibase {
                 return "";
             })
                 .join(" ");
-            const sortCommand = `sort ${sortColumns} -T=${join(tablePath, ".tmp")}`;
+            const sortCommand = `sort ${sortColumns} -T='${join(tablePath, ".tmp")}'`;
             try {
                 if (cacheKey)
                     await File.lock(join(tablePath, ".tmp"), cacheKey);
                 // Combine && Execute the commands synchronously
                 let lines = (await UtilsServer.exec(this.tables[tableName].config.cache
                     ? (await File.isExists(join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)))
-                        ? `${awkCommand} ${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}`
-                        : `${pasteCommand} | ${sortCommand} -o ${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)} && ${awkCommand} ${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}`
+                        ? `${awkCommand} '${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}'`
+                        : `${pasteCommand} | ${sortCommand} -o '${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}' && ${awkCommand} '${join(tablePath, ".cache", `${cacheKey}${this.fileExtension}`)}'`
                     : `${pasteCommand} | ${sortCommand} | ${awkCommand}`, {
                     encoding: "utf-8",
                 })).stdout
@@ -1033,7 +1043,7 @@ export default class Inibase {
             let Ids = where;
             if (!Array.isArray(Ids))
                 Ids = [Ids];
-            const [lineNumbers, countItems] = await File.search(join(tablePath, `id${this.getFileExtension(tableName)}`), "[]", Ids.map((id) => Utils.isNumber(id) ? Number(id) : UtilsServer.decodeID(id, this.salt)), undefined, "number", undefined, Ids.length, 0, !this.totalItems[`${tableName}-*`], this.salt);
+            const [lineNumbers, countItems] = await File.search(join(tablePath, `id${this.getFileExtension(tableName)}`), "[]", Ids.map((id) => Utils.isNumber(id) ? Number(id) : UtilsServer.decodeID(id, this.salt)), undefined, undefined, "number", undefined, Ids.length, 0, !this.totalItems[`${tableName}-*`], this.salt);
             if (!lineNumbers)
                 return null;
             if (!this.totalItems[`${tableName}-*`])
@@ -1195,7 +1205,7 @@ export default class Inibase {
             // Skip ID and (created|updated)At
             this.validateData(data, schema.slice(1, -2), true);
             await this.checkUnique(tableName, schema);
-            this.formatData(data, schema, true);
+            data = this.formatData(data, schema, true);
             const pathesContents = this.joinPathesContents(tableName, {
                 ...(({ id, ...restOfData }) => restOfData)(data),
                 updatedAt: Date.now(),
@@ -1233,7 +1243,7 @@ export default class Inibase {
             // "where" in this case, is the line(s) number(s) and not id(s)
             this.validateData(data, schema.slice(1, -2), true);
             await this.checkUnique(tableName, schema.slice(1, -2));
-            this.formatData(data, schema, true);
+            data = this.formatData(data, schema, true);
             const pathesContents = Object.fromEntries(Object.entries(this.joinPathesContents(tableName, Utils.isArrayOfObjects(data)
                 ? data.map((item) => ({
                     ...item,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.113",
+  "version": "1.0.0-rc.115",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",