inibase 1.0.0-rc.90 → 1.0.0-rc.92

package/dist/cli.js

@@ -7,7 +7,7 @@ import { parseArgs } from "node:util";
 import Inison from "inison";
 import { isExists } from "./file.js";
 import Inibase, {} from "./index.js";
-import { isJSON, isNumber, setField, unsetField } from "./utils.js";
+import { isStringified, isNumber, setField, unsetField } from "./utils.js";
 const textGreen = (input) => `\u001b[1;32m${input}\u001b[0m`;
 const textRed = (input) => `\u001b[1;31m${input}\u001b[0m`;
 const textBlue = (input) => `\u001b[1;34m${input}\u001b[0m`;
@@ -215,11 +215,11 @@ rl.on("line", async (input) => {
                         where = -1;
                     else if (isNumber(parsedArgs.where))
                         where = Number(parsedArgs.where);
-                    else if (isJSON(parsedArgs.where))
+                    else if (isStringified(parsedArgs.where))
                         where = Inison.unstringify(parsedArgs.where);
                 }
                 if (parsedArgs.sort) {
-                    if (isJSON(parsedArgs.sort))
+                    if (isStringified(parsedArgs.sort))
                         sort = Inison.unstringify(parsedArgs.sort);
                     else
                         sort = parsedArgs.sort;
@@ -227,7 +227,7 @@ rl.on("line", async (input) => {
                 page = Number(parsedArgs.page) ?? undefined;
                 perPage = Number(parsedArgs.perPage) ?? undefined;
                 columns = parsedArgs.columns;
-                if (parsedArgs.data && isJSON(parsedArgs.data))
+                if (parsedArgs.data && isStringified(parsedArgs.data))
                     data = Inison.unstringify(parsedArgs.data);
             }
             switch (splitedInput[0].toLocaleLowerCase()) {

package/dist/file.js

@@ -5,7 +5,7 @@ import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { createGunzip, createGzip } from "node:zlib";
 import Inison from "inison";
-import { detectFieldType, isArrayOfObjects, isJSON, isNumber, isObject, } from "./utils.js";
+import { detectFieldType, isArrayOfObjects, isStringified, isNumber, isObject, } from "./utils.js";
 import { compare, encodeID, exec, gunzip, gzip } from "./utils.server.js";
 export const lock = async (folderPath, prefix) => {
     let lockFile = null;
@@ -100,7 +100,7 @@ const secureString = (input) => {
  * @returns The secured and/or joined string.
  */
 export const encode = (input) => Array.isArray(input)
-    ? input.every((_input) => typeof _input === "string" && isJSON(_input))
+    ? input.every((_input) => typeof _input === "string" && isStringified(_input))
         ? `[${input.join(",")}]`
         : Inison.stringify(input)
     : secureString(input);
@@ -174,7 +174,7 @@ export const decode = (input, fieldType, fieldChildrenType, secretKey) => {
         fieldType = detectFieldType(String(input), fieldType);
     // Decode the input using the decodeHelper function.
     return decodeHelper(typeof input === "string"
-        ? isJSON(input)
+        ? isStringified(input)
             ? Inison.unstringify(input)
             : unSecureString(input)
         : input, fieldType, fieldChildrenType, secretKey);
@@ -194,7 +194,7 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
         else if (lineNumbers == -1) {
             const command = filePath.endsWith(".gz")
                 ? `zcat ${filePath} | sed -n '$p'`
-                : `sed -n '$p' ${filePath}`, foundedLine = (await exec(command)).stdout.trim();
+                : `sed -n '$p' ${filePath}`, foundedLine = (await exec(command)).stdout.trimEnd();
             if (foundedLine)
                 lines[linesCount] = decode(foundedLine, fieldType, fieldChildrenType, secretKey);
         }
@@ -215,7 +215,7 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
             }
             const command = filePath.endsWith(".gz")
                 ? `zcat ${filePath} | sed -n '${lineNumbers.join("p;")}p'`
-                : `sed -n '${lineNumbers.join("p;")}p' ${filePath}`, foundedLines = (await exec(command)).stdout.trim().split("\n");
+                : `sed -n '${lineNumbers.join("p;")}p' ${filePath}`, foundedLines = (await exec(command)).stdout.trimEnd().split("\n");
             let index = 0;
             for (const line of foundedLines) {
                 lines[lineNumbers[index]] = decode(line, fieldType, fieldChildrenType, secretKey);
@@ -461,7 +461,7 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
  * Note: Reads through the file line by line to count the total number of lines.
  */
 export const count = async (filePath) => {
-    // Number((await exec(`wc -l < ${filePath}`)).stdout.trim());
+    // Number((await exec(`wc -l < ${filePath}`)).stdout.trimEnd());
     let linesCount = 0;
     if (await isExists(filePath)) {
         let fileHandle = null;

package/dist/index.d.ts

@@ -93,6 +93,7 @@ export default class Inibase {
     getTableSchema(tableName: string, encodeIDs?: boolean): Promise<Schema | undefined>;
     private throwErrorIfTableEmpty;
     private validateData;
+    private cleanObject;
     private formatField;
     private checkUnique;
     private formatData;

package/dist/index.js

@@ -318,12 +318,22 @@ export default class Inibase {
             }
         }
     }
+    cleanObject(obj) {
+        const cleanedObject = Object.entries(obj).reduce((acc, [key, value]) => {
+            if (value !== undefined && value !== null && value !== "")
+                acc[key] = value;
+            return acc;
+        }, {});
+        return Object.keys(cleanedObject).length > 0 ? cleanedObject : null;
+    }
     formatField(value, fieldType, fieldChildrenType, _formatOnlyAvailiableKeys) {
         if (Array.isArray(fieldType))
             fieldType = (Utils.detectFieldType(value, fieldType) ??
                 fieldType[0]);
         if (!value)
             return null;
+        if (fieldType !== "array" && Array.isArray(value))
+            value = value[0];
         switch (fieldType) {
             case "array":
                 if (!fieldChildrenType)
@@ -332,16 +342,14 @@ export default class Inibase {
                     value = [value];
                 if (Utils.isArrayOfObjects(fieldChildrenType))
                     return this.formatData(value, fieldChildrenType, _formatOnlyAvailiableKeys);
+                if (!value.length)
+                    return null;
                 return value.map((_value) => this.formatField(_value, fieldChildrenType));
             case "object":
-                if (Array.isArray(value))
-                    value = value[0];
                 if (Utils.isArrayOfObjects(fieldChildrenType))
                     return this.formatData(value, fieldChildrenType, _formatOnlyAvailiableKeys);
                 break;
             case "table":
-                if (Array.isArray(value))
-                    value = value[0];
                 if (Utils.isObject(value)) {
                     if (Object.hasOwn(value, "id") &&
                         (Utils.isValidID(value.id) ||
@@ -356,33 +364,29 @@ export default class Inibase {
                         : UtilsServer.decodeID(value, this.salt);
                 break;
             case "password":
-                if (Array.isArray(value))
-                    value = value[0];
                 return Utils.isPassword(value)
                     ? value
                     : UtilsServer.hashPassword(String(value));
             case "number":
-                if (Array.isArray(value))
-                    value = value[0];
                 return Utils.isNumber(value) ? Number(value) : null;
             case "date": {
-                if (Array.isArray(value))
-                    value = value[0];
                 if (Utils.isNumber(value))
                     return value;
                 const dateToTimestamp = Date.parse(value);
                 return Number.isNaN(dateToTimestamp) ? null : dateToTimestamp;
             }
             case "id":
-                if (Array.isArray(value))
-                    value = value[0];
                 return Utils.isNumber(value)
                     ? value
                     : UtilsServer.decodeID(value, this.salt);
-            case "json":
-                return typeof value !== "string" || !Utils.isJSON(value)
-                    ? Inison.stringify(value)
-                    : value;
+            case "json": {
+                if (typeof value === "string" && Utils.isStringified(value))
+                    return value;
+                const cleanedObject = this.cleanObject(value);
+                if (cleanedObject)
+                    return Inison.stringify(cleanedObject);
+                return null;
+            }
             default:
                 return value;
         }
@@ -602,19 +606,32 @@ export default class Inibase {
                     if (field.table &&
                         (await File.isExists(join(this.databasePath, field.table))) &&
                         (await File.isExists(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`)))) {
-                        const items = await File.get(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`), linesNumber, field.type, field.children, this.salt);
-                        if (items)
-                            for await (const [index, item] of Object.entries(items)) {
+                        const itemsIDs = await File.get(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`), linesNumber, field.type, field.children, this.salt);
+                        if (itemsIDs) {
+                            const searchableIDs = {};
+                            for (const [index, item] of Object.entries(itemsIDs)) {
                                 if (!RETURN[index])
                                     RETURN[index] = {};
                                 if (item !== null && item !== undefined)
-                                    RETURN[index][field.key] = await this.get(field.table, item, {
-                                        ...options,
-                                        columns: options.columns
-                                            ?.filter((column) => column.includes(`${field.key}.`))
-                                            .map((column) => column.replace(`${field.key}.`, "")),
-                                    });
+                                    searchableIDs[index] = item;
+                            }
+                            if (Object.keys(searchableIDs).length) {
+                                const items = await this.get(field.table, [].concat(...Object.values(searchableIDs)), {
+                                    ...options,
+                                    perPage: Number.POSITIVE_INFINITY,
+                                    columns: options.columns
+                                        ?.filter((column) => column.includes(`${field.key}.`))
+                                        .map((column) => column.replace(`${field.key}.`, "")),
+                                });
+                                if (items) {
+                                    let cursor = 0;
+                                    for (const [index, Ids] of Object.entries(searchableIDs)) {
+                                        RETURN[index][field.key] = items.slice(cursor, cursor + Ids.length);
+                                        cursor += Ids.length;
+                                    }
+                                }
                             }
+                        }
                     }
                 }
                 else if (await File.isExists(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`))) {
@@ -644,19 +661,32 @@ export default class Inibase {
                 if (field.table &&
                     (await File.isExists(join(this.databasePath, field.table))) &&
                     (await File.isExists(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`)))) {
-                    const items = await File.get(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`), linesNumber, "number", undefined, this.salt);
-                    if (items)
-                        for await (const [index, item] of Object.entries(items)) {
+                    const itemsIDs = await File.get(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`), linesNumber, field.type, field.children, this.salt);
+                    if (itemsIDs) {
+                        const searchableIDs = {};
+                        for (const [index, item] of Object.entries(itemsIDs)) {
                             if (!RETURN[index])
                                 RETURN[index] = {};
                             if (item !== null && item !== undefined)
-                                RETURN[index][field.key] = await this.get(field.table, UtilsServer.encodeID(item, this.salt), {
-                                    ...options,
-                                    columns: options.columns
-                                        ?.filter((column) => column.includes(`${field.key}.`))
-                                        .map((column) => column.replace(`${field.key}.`, "")),
-                                });
+                                searchableIDs[index] = item;
+                        }
+                        if (Object.keys(searchableIDs).length) {
+                            const items = await this.get(field.table, Object.values(searchableIDs), {
+                                ...options,
+                                perPage: Number.POSITIVE_INFINITY,
+                                columns: options.columns
+                                    ?.filter((column) => column.includes(`${field.key}.`))
+                                    .map((column) => column.replace(`${field.key}.`, "")),
+                            });
+                            if (items) {
+                                let cursor = 0;
+                                for (const [index] of Object.entries(searchableIDs)) {
+                                    RETURN[index][field.key] = items[cursor];
+                                    cursor++;
+                                }
+                            }
                         }
+                    }
                 }
             }
             else if (await File.isExists(join(tablePath, `${(prefix ?? "") + field.key}${this.getFileExtension(tableName)}`))) {
@@ -906,7 +936,7 @@ export default class Inibase {
                     : `${pasteCommand} | ${sortCommand} | ${awkCommand}`, {
                     encoding: "utf-8",
                 })).stdout
-                    .trim()
+                    .trimEnd()
                     .split("\n");
                 if (where)
                     lines = lines.slice((options.page - 1) * options.perPage, options.page * options.perPage);
@@ -1130,7 +1160,6 @@ export default class Inibase {
             if (Utils.isArrayOfObjects(data)) {
                 if (!data.every((item) => Object.hasOwn(item, "id") && Utils.isValidID(item.id)))
                     throw this.throwError("INVALID_ID");
-                // TODO: Reduce I/O
                 return this.put(tableName, data, data.map(({ id }) => id), options, returnUpdatedData || undefined);
             }
             if (Object.hasOwn(data, "id")) {

package/dist/utils.d.ts

@@ -139,7 +139,7 @@ export declare const isValidID: (input: any) => input is string;
  * @param {string} str - The string to be checked.
  * @returns {boolean} Returns true if the string is valid JSON, otherwise false.
  */
-export declare const isJSON: (str: string) => boolean;
+export declare const isStringified: (str: string) => boolean;
 /**
  * Identifies and returns properties that have changed between two objects.
  *

package/dist/utils.js

@@ -170,7 +170,7 @@ export const isValidID = (input) => {
  * @param {string} str - The string to be checked.
  * @returns {boolean} Returns true if the string is valid JSON, otherwise false.
  */
-export const isJSON = (str) => str === "null" || str === "undefined" || str[0] === "{" || str[0] === "[";
+export const isStringified = (str) => str === "null" || str === "undefined" || str[0] === "{" || str[0] === "[";
 /**
  * Identifies and returns properties that have changed between two objects.
  *
@@ -222,7 +222,7 @@ export const detectFieldType = (input, availableTypes) => {
                     return "url";
                 if (availableTypes.includes("password") && isPassword(input))
                     return "password";
-                if (availableTypes.includes("json") && isJSON(input))
+                if (availableTypes.includes("json") && isStringified(input))
                     return "json";
                 if (availableTypes.includes("json") && isDate(input))
                     return "json";
@@ -355,7 +355,7 @@ export const validateFieldType = (value, fieldType, fieldChildrenType) => {
         case "id":
             return isNumber(value) || isValidID(value);
         case "json":
-            return isJSON(value) || Array.isArray(value) || isObject(value);
+            return isStringified(value) || Array.isArray(value) || isObject(value);
         default:
             return false;
     }

package/package.json

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