inibase 1.1.22 → 1.1.24

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 { isStringified, isNumber, setField, unsetField } from "./utils.js";
+import { isNumber, isStringified, 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`;
@@ -197,7 +197,12 @@ rl.on("line", async (input) => {
                 console.log(`${textRed("  Err:")} Please specify table name`);
                 break;
             }
-            let where = undefined, page = undefined, perPage = undefined, columns = undefined, sort = undefined, data = undefined;
+            let where = undefined;
+            let page = undefined;
+            let perPage = undefined;
+            let columns = undefined;
+            let sort = undefined;
+            let data = undefined;
             if (splitedInput.toSpliced(0, 1).length) {
                 const parsedArgs = parseArgs({
                     args: splitedInput.toSpliced(0, table ? 1 : 2),

package/dist/file.js

@@ -133,7 +133,6 @@ const unSecureString = (input) => {
  *
  * @param value - The value to be decoded, can be string, number, or array.
  * @param field - Field object config.
- * @param fieldChildrenType - Optional type for children elements, used for arrays.
  * @returns Decoded value, transformed according to the specified field type(s).
  */
 const decodeHelper = (value, field) => {
@@ -159,7 +158,7 @@ const decodeHelper = (value, field) => {
             return isNumber(value) &&
                 (!field.table ||
                     !field.databasePath ||
-                    !globalConfig[field.databasePath].tables.get(field.table).config
+                    !globalConfig[field.databasePath].tables?.get(field.table)?.config
                         .decodeID)
                 ? encodeID(value)
                 : value;
@@ -217,7 +216,8 @@ export async function get(filePath, lineNumbers, field, readWholeFile = false) {
     let fileHandle = null;
     try {
         fileHandle = await open(filePath, "r");
-        const rl = createReadLineInternface(filePath, fileHandle), lines = {};
+        const rl = createReadLineInternface(filePath, fileHandle);
+        const lines = {};
         let linesCount = 0;
         if (!lineNumbers) {
             for await (const line of rl) {
@@ -229,7 +229,8 @@ export async function get(filePath, lineNumbers, field, readWholeFile = false) {
             const escapedFilePath = escapeShellPath(filePath);
             const command = filePath.endsWith(".gz")
                 ? `zcat ${escapedFilePath} | sed -n '$p'`
-                : `sed -n '$p' ${escapedFilePath}`, foundedLine = (await exec(command)).stdout.trimEnd();
+                : `sed -n '$p' ${escapedFilePath}`;
+            const foundedLine = (await exec(command)).stdout.trimEnd();
             if (foundedLine)
                 lines[linesCount] = decode(foundedLine, field);
         }
@@ -251,7 +252,8 @@ export async function get(filePath, lineNumbers, field, readWholeFile = false) {
             const escapedFilePath = escapeShellPath(filePath);
             const command = filePath.endsWith(".gz")
                 ? `zcat ${escapedFilePath} | sed -n '${_groupIntoRanges(lineNumbers)}'`
-                : `sed -n '${_groupIntoRanges(lineNumbers)}' ${escapedFilePath}`, foundedLines = (await exec(command)).stdout.trimEnd().split("\n");
+                : `sed -n '${_groupIntoRanges(lineNumbers)}' ${escapedFilePath}`;
+            const foundedLines = (await exec(command)).stdout.trimEnd().split("\n");
             let index = 0;
             for (const line of foundedLines) {
                 lines[lineNumbers[index]] = decode(line, field);
@@ -589,7 +591,8 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
  * Note: Decodes each line as a number using the 'decode' function. Non-numeric lines contribute 0 to the sum.
  */
 export const sum = async (filePath, lineNumbers) => {
-    let sum = 0, fileHandle = null;
+    let sum = 0;
+    let fileHandle = null;
     try {
         fileHandle = await open(filePath, "r");
         const rl = createReadLineInternface(filePath, fileHandle);
@@ -625,7 +628,9 @@ export const sum = async (filePath, lineNumbers) => {
  * Note: Decodes each line as a number using the 'decode' function. Considers only numerical values for determining the maximum.
  */
 export const max = async (filePath, lineNumbers) => {
-    let max = 0, fileHandle = null, rl = null;
+    let max = 0;
+    let fileHandle = null;
+    let rl = null;
     try {
         fileHandle = await open(filePath, "r");
         rl = createReadLineInternface(filePath, fileHandle);
@@ -666,7 +671,8 @@ export const max = async (filePath, lineNumbers) => {
  * Note: Decodes each line as a number using the 'decode' function. Considers only numerical values for determining the minimum.
  */
 export const min = async (filePath, lineNumbers) => {
-    let min = 0, fileHandle = null;
+    let min = 0;
+    let fileHandle = null;
     try {
         fileHandle = await open(filePath, "r");
         const rl = createReadLineInternface(filePath, fileHandle);

package/dist/index.d.ts

@@ -23,7 +23,7 @@ export interface Options {
     columns?: string[] | string;
     sort?: Record<string, 1 | -1 | "asc" | "ASC" | "desc" | "DESC"> | string[] | string;
 }
-export interface Config {
+export interface TableConfig {
     compression?: boolean;
     cache?: boolean;
     prepend?: boolean;
@@ -31,7 +31,7 @@ export interface Config {
 }
 export interface TableObject {
     schema?: Schema;
-    config: Config;
+    config: TableConfig;
 }
 export type ComparisonOperator = "=" | "!=" | ">" | "<" | ">=" | "<=" | "*" | "!*" | "[]" | "![]";
 export type pageInfo = {
@@ -70,7 +70,6 @@ export default class Inibase {
     constructor(database: string, mainFolder?: string, language?: ErrorLang);
     private static errorMessages;
     createError(name: ErrorCodes, variable?: string | number | (string | number)[]): Error;
-    clear(): void;
     private getFileExtension;
     private _schemaToIdsPath;
     /**
@@ -78,18 +77,18 @@ export default class Inibase {
      *
      * @param {string} tableName
      * @param {Schema} [schema]
-     * @param {Config} [config]
+     * @param {TableConfig} [config]
      */
-    createTable(tableName: string, schema?: Schema, config?: Config): Promise<void>;
+    createTable(tableName: string, schema?: Schema, config?: TableConfig): Promise<void>;
     private replaceStringInFile;
     /**
      * Update table schema or config
      *
      * @param {string} tableName
      * @param {Schema} [schema]
-     * @param {(Config&{name?: string})} [config]
+     * @param {(TableConfig&{name?: string})} [config]
      */
-    updateTable(tableName: string, schema?: Schema, config?: Config & {
+    updateTable(tableName: string, schema?: Schema, config?: TableConfig & {
         name?: string;
     }): Promise<void>;
     /**
@@ -99,7 +98,7 @@ export default class Inibase {
      * @return {*}  {Promise<TableObject>}
      */
     getTable(tableName: string, encodeIDs?: boolean): Promise<TableObject>;
-    getTableSchema(tableName: string, encodeIDs?: boolean): Promise<Schema | undefined>;
+    getTableSchema(tableName: string, encodeIDs?: boolean): Promise<Schema>;
     private throwErrorIfTableEmpty;
     private _validateData;
     private validateData;

package/dist/index.js

@@ -20,8 +20,12 @@ export default class Inibase {
     totalItems;
     constructor(database, mainFolder = ".", language = "en") {
         this.databasePath = join(mainFolder, database);
-        this.clear();
         this.language = language;
+        this.pageInfo = {};
+        this.totalItems = new Map();
+        this.uniqueMap = new Map();
+        if (!globalConfig[this.databasePath])
+            globalConfig[this.databasePath] = { tables: new Map() };
         if (!process.env.INIBASE_SECRET) {
             if (existsSync(".env") &&
                 readFileSync(".env").includes("INIBASE_SECRET="))
@@ -110,12 +114,6 @@ export default class Inibase {
         error.name = name;
         return error;
     }
-    clear() {
-        globalConfig[this.databasePath] = { tables: new Map() };
-        this.totalItems = new Map();
-        this.pageInfo = {};
-        this.uniqueMap = new Map();
-    }
     getFileExtension(tableName) {
         let mainExtension = this.fileExtension;
         // TODO: ADD ENCRYPTION
@@ -141,7 +139,7 @@ export default class Inibase {
      *
      * @param {string} tableName
      * @param {Schema} [schema]
-     * @param {Config} [config]
+     * @param {TableConfig} [config]
      */
     async createTable(tableName, schema, config) {
         const tablePath = join(this.databasePath, tableName);
@@ -187,7 +185,7 @@ export default class Inibase {
      *
      * @param {string} tableName
      * @param {Schema} [schema]
-     * @param {(Config&{name?: string})} [config]
+     * @param {(TableConfig&{name?: string})} [config]
      */
     async updateTable(tableName, schema, config) {
         const table = await this.getTable(tableName);
@@ -436,28 +434,30 @@ export default class Inibase {
         }, {});
         return Object.keys(cleanedObject).length > 0 ? cleanedObject : null;
     }
-    formatField(value, fieldType, fieldChildrenType, _formatOnlyAvailiableKeys) {
+    formatField(value, field, _formatOnlyAvailiableKeys) {
         if (value === null || value === undefined)
             return value;
-        if (Array.isArray(fieldType))
-            fieldType = Utils.detectFieldType(value, fieldType) ?? fieldType[0];
-        if (Array.isArray(value) && !["array", "json"].includes(fieldType))
+        if (Array.isArray(field.type))
+            field.type = Utils.detectFieldType(value, field.type) ?? field.type[0];
+        if (Array.isArray(value) && !["array", "json"].includes(field.type))
             value = value[0];
-        switch (fieldType) {
+        switch (field.type) {
             case "array":
-                if (!fieldChildrenType)
+                if (!field.children)
                     return null;
                 if (!Array.isArray(value))
                     value = [value];
-                if (Utils.isArrayOfObjects(fieldChildrenType)) {
-                    return this.formatData(value, fieldChildrenType, _formatOnlyAvailiableKeys);
-                }
+                if (Utils.isArrayOfObjects(field.children))
+                    return this.formatData(value, field.children, _formatOnlyAvailiableKeys);
                 if (!value.length)
                     return null;
-                return value.map((_value) => this.formatField(_value, fieldChildrenType));
+                return value.map((_value) => this.formatField(_value, {
+                    ...field,
+                    type: field.children,
+                }));
             case "object":
-                if (Utils.isArrayOfObjects(fieldChildrenType))
-                    return this.formatData(value, fieldChildrenType, _formatOnlyAvailiableKeys);
+                if (Utils.isArrayOfObjects(field.children))
+                    return this.formatData(value, field.children, _formatOnlyAvailiableKeys);
                 break;
             case "table":
                 if (Utils.isObject(value)) {
@@ -569,7 +569,7 @@ export default class Inibase {
                     RETURN[field.key] = this.getDefaultValue(field);
                     continue;
                 }
-                RETURN[field.key] = this.formatField(clonedData[field.key], field.type, field.children, formatOnlyAvailiableKeys);
+                RETURN[field.key] = this.formatField(clonedData[field.key], field, formatOnlyAvailiableKeys);
             }
             return RETURN;
         }

package/dist/utils.server.d.ts

@@ -49,8 +49,7 @@ export declare const hashString: (str: string) => string;
  * @param operator - The comparison operator (e.g., '=', '!=', '>', '<', '>=', '<=', '[]', '![]', '*', '!*').
  * @param originalValue - The value to compare, can be a single value or an array of values.
  * @param comparedValue - The value or values to compare against.
- * @param field - Field object config.
- * @param fieldChildrenType - Optional type for child elements in array inputs.
+ * @param fieldType - Optional type of the field.
  * @returns boolean - Result of the comparison operation.
  *
  * Note: Handles various data types and comparison logic, including special handling for passwords and regex patterns.

package/dist/utils.server.js

@@ -124,8 +124,7 @@ export const hashString = (str) => createHash("sha256").update(str).digest("hex"
  * @param operator - The comparison operator (e.g., '=', '!=', '>', '<', '>=', '<=', '[]', '![]', '*', '!*').
  * @param originalValue - The value to compare, can be a single value or an array of values.
  * @param comparedValue - The value or values to compare against.
- * @param field - Field object config.
- * @param fieldChildrenType - Optional type for child elements in array inputs.
+ * @param fieldType - Optional type of the field.
  * @returns boolean - Result of the comparison operation.
  *
  * Note: Handles various data types and comparison logic, including special handling for passwords and regex patterns.

package/package.json

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