inibase 1.0.0-rc.27 → 1.0.0-rc.28

package/dist/file.d.ts

@@ -43,7 +43,7 @@ export declare const decode: (input: string | null | number, fieldType?: FieldTy
  *   1. Record of line numbers and their decoded content or null if no lines are read.
  *   2. Total count of lines processed.
  */
-export declare function get(filePath: string, lineNumbers?: number | number[], fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[], secretKey?: string | Buffer): Promise<Record<number, string | number | boolean | null | (string | number | boolean | (string | number | boolean)[] | null)[]> | null>;
+export declare function get(filePath: string, lineNumbers?: number | number[], fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[], secretKey?: string | Buffer, readWholeFile?: false): Promise<Record<number, string | number | boolean | null | (string | number | boolean | (string | number | boolean)[] | null)[]> | null>;
 export declare function get(filePath: string, lineNumbers: undefined | number | number[], fieldType: undefined | FieldType | FieldType[], fieldChildrenType: undefined | FieldType | FieldType[], secretKey: undefined | string | Buffer, readWholeFile: true): Promise<[
     Record<number, string | number | boolean | null | (string | number | boolean | (string | number | boolean)[] | null)[]> | null,
     number

package/dist/file.js

@@ -187,46 +187,29 @@ const reverseJoinMultidimensionalArray = (joinedString) => {
  * @returns Decoded value, transformed according to the specified field type(s).
  */
 const decodeHelper = (value, fieldType, fieldChildrenType, secretKey) => {
-    // Use a stack-based approach for efficient processing without recursion.
-    const stack = [{ value }];
-    while (stack.length > 0) {
-        // Explicitly check if stack.pop() is not undefined.
-        const stackItem = stack.pop();
-        if (!stackItem) {
-            // Skip the rest of the loop if the stack item is undefined.
-            continue;
-        }
-        const { value } = stackItem;
-        if (Array.isArray(value) && fieldType !== "array") {
-            // If the value is an array and the fieldType is not 'array', process each element.
-            stack.push(...value.map((v) => ({ value: v })));
-        }
-        else {
-            switch (fieldType) {
-                // Handle different field types with appropriate decoding logic.
-                case "table":
-                case "number":
-                    return isNumber(value) ? Number(value) : null;
-                case "boolean":
-                    return typeof value === "string" ? value === "true" : Boolean(value);
-                case "array":
-                    if (!Array.isArray(value))
-                        return [value];
-                    if (fieldChildrenType)
-                        // Decode each element in the array based on the specified fieldChildrenType.
-                        return fieldChildrenType
-                            ? value.map((v) => decode(v, Array.isArray(fieldChildrenType)
-                                ? detectFieldType(v, fieldChildrenType)
-                                : fieldChildrenType, undefined, secretKey))
-                            : value;
-                case "id":
-                    return isNumber(value) && secretKey
-                        ? encodeID(value, secretKey)
-                        : value;
-                default:
-                    return value;
-            }
-        }
+    if (Array.isArray(value) && fieldType !== "array")
+        return value.map((v) => decodeHelper(v, fieldType, fieldChildrenType, secretKey));
+    switch (fieldType) {
+        case "table":
+        case "number":
+            return isNumber(value) ? Number(value) : null;
+        case "boolean":
+            return typeof value === "string" ? value === "true" : Boolean(value);
+        case "array":
+            if (!Array.isArray(value))
+                return [value];
+            if (fieldChildrenType)
+                return fieldChildrenType
+                    ? value.map((v) => decode(v, Array.isArray(fieldChildrenType)
+                        ? detectFieldType(v, fieldChildrenType)
+                        : fieldChildrenType, undefined, secretKey))
+                    : value;
+        case "id":
+            return isNumber(value) && secretKey
+                ? encodeID(value, secretKey)
+                : value;
+        default:
+            return value;
     }
 };
 /**
@@ -254,7 +237,7 @@ export const decode = (input, fieldType, fieldChildrenType, secretKey) => {
             : unSecureString(input)
         : input, fieldType, fieldChildrenType, secretKey);
 };
-export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, secretKey, readWholeFile) {
+export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, secretKey, readWholeFile = false) {
     let fileHandle, rl;
     try {
         fileHandle = await open(filePath, "r");
@@ -303,32 +286,49 @@ export async function get(filePath, lineNumbers, fieldType, fieldChildrenType, s
  * Note: If the file doesn't exist and replacements is an object, it creates a new file with the specified replacements.
  */
 export const replace = async (filePath, replacements) => {
-    let fileHandle, fileTempHandle, rl;
     const fileTempPath = filePath.replace(/([^/]+)\/?$/, `.tmp/${Date.now()}-$1`);
-    try {
-        let linesCount = 0;
-        fileHandle = await open(filePath, "r");
-        fileTempHandle = await open(fileTempPath, "w");
-        rl = readLineInternface(fileHandle);
-        await _pipeline(rl, fileTempHandle.createWriteStream(), new Transform({
-            transform(line, encoding, callback) {
-                linesCount++;
-                const replacement = isObject(replacements)
-                    ? replacements.hasOwnProperty(linesCount)
-                        ? replacements[linesCount]
-                        : line
-                    : replacements;
-                callback(null, replacement + "\n");
-            },
-        }));
-        return [fileTempPath, filePath];
+    if (await isExists(filePath)) {
+        let fileHandle, fileTempHandle, rl;
+        try {
+            let linesCount = 0;
+            fileHandle = await open(filePath, "r");
+            fileTempHandle = await open(fileTempPath, "w");
+            rl = readLineInternface(fileHandle);
+            await _pipeline(rl, fileTempHandle.createWriteStream(), new Transform({
+                transform(line, encoding, callback) {
+                    linesCount++;
+                    const replacement = isObject(replacements)
+                        ? replacements.hasOwnProperty(linesCount)
+                            ? replacements[linesCount]
+                            : line
+                        : replacements;
+                    return callback(null, replacement + "\n");
+                },
+            }));
+            return [fileTempPath, filePath];
+        }
+        finally {
+            // Ensure that file handles are closed, even if an error occurred
+            rl?.close();
+            await fileHandle?.close();
+            await fileTempHandle?.close();
+        }
     }
-    finally {
-        // Ensure that file handles are closed, even if an error occurred
-        rl?.close();
-        await fileHandle?.close();
-        await fileTempHandle?.close();
+    else if (isObject(replacements)) {
+        let replacementsKeys = Object.keys(replacements)
+            .map(Number)
+            .toSorted((a, b) => a - b);
+        await write(fileTempPath, "\n".repeat(replacementsKeys[0] - 1) +
+            replacementsKeys
+                .map((lineNumber, index) => index === 0 || lineNumber - replacementsKeys[index - 1] - 1 === 0
+                ? replacements[lineNumber]
+                : "\n".repeat(lineNumber - replacementsKeys[index - 1] - 1) +
+                    replacements[lineNumber])
+                .join("\n") +
+            "\n");
+        return [fileTempPath, filePath];
     }
+    return [];
 };
 /**
  * Asynchronously appends data to the beginning of a file.
@@ -351,10 +351,10 @@ export const append = async (filePath, data) => {
                 transform(line, encoding, callback) {
                     if (!isAppended) {
                         isAppended = true;
-                        callback(null, `${Array.isArray(data) ? data.join("\n") : data}\n${line}\n`);
+                        return callback(null, `${Array.isArray(data) ? data.join("\n") : data}\n${line}\n`);
                     }
                     else
-                        callback(null, `${line}\n`);
+                        return callback(null, `${line}\n`);
                 },
             }));
         }
@@ -386,9 +386,9 @@ export const remove = async (filePath, linesToDelete) => {
     await _pipeline(rl, fileTempHandle.createWriteStream(), new Transform({
         transform(line, encoding, callback) {
             linesCount++;
-            if (!linesToDeleteArray.has(linesCount))
-                callback(null, `${line}\n`);
-            callback();
+            return !linesToDeleteArray.has(linesCount)
+                ? callback(null, `${line}\n`)
+                : callback();
         },
     }));
     await fileTempHandle.close();

package/dist/index.d.ts

@@ -13,23 +13,25 @@ type FieldDefault = {
 };
 type FieldStringType = {
     type: Exclude<FieldType, "array" | "object">;
+    children?: never;
 };
 type FieldStringArrayType = {
-    type: Exclude<FieldType, "array" | "object">[];
+    type: Array<Exclude<FieldType, "array" | "object">>;
+    children?: never;
 };
 type FieldArrayType = {
     type: "array";
     children: Exclude<FieldType, "array"> | Exclude<FieldType, "array">[] | Schema;
 };
 type FieldArrayArrayType = {
-    type: ["array", ...Exclude<FieldType, "array" | "object">[]];
+    type: Array<"array" | Exclude<FieldType, "array" | "object">>;
     children: Exclude<FieldType, "array" | "object"> | Exclude<FieldType, "array" | "object">[];
 };
 type FieldObjectType = {
     type: "object";
     children: Schema;
 };
-export type Field = FieldDefault & (FieldStringType | FieldStringArrayType | FieldObjectType | FieldArrayType | FieldArrayArrayType);
+export type Field = FieldDefault & (FieldStringType | (FieldStringArrayType & FieldArrayArrayType) | FieldObjectType | FieldArrayType);
 export type Schema = Field[];
 export interface Options {
     page?: number;
@@ -66,7 +68,7 @@ export default class Inibase {
     private throwError;
     setTableSchema(tableName: string, schema: Schema): Promise<void>;
     getTableSchema(tableName: string): Promise<Schema | undefined>;
-    getField(keyPath: string, schema: Schema): Field | null;
+    getField(keyPath: string, schema: Schema): (FieldDefault & FieldStringType) | (FieldDefault & FieldObjectType) | (FieldDefault & FieldArrayType) | null;
     private validateData;
     private formatField;
     private formatData;

package/dist/index.js

@@ -303,7 +303,9 @@ export default class Inibase {
         const path = join(this.folder, this.database, tableName);
         let RETURN = {};
         for await (const field of schema) {
-            if (field.type === "array" && field.children) {
+            if ((field.type === "array" ||
+                (Array.isArray(field.type) && field.type.includes("array"))) &&
+                field.children) {
                 if (Utils.isArrayOfObjects(field.children)) {
                     if (field.children.filter((children) => children.type === "array" &&
                         Utils.isArrayOfObjects(children.children)).length) {
@@ -380,6 +382,7 @@ export default class Inibase {
                     });
                 }
                 else if (field.children === "table" ||
+                    (Array.isArray(field.type) && field.type.includes("table")) ||
                     (Array.isArray(field.children) && field.children.includes("table"))) {
                     if (options.columns)
                         options.columns = options.columns
@@ -731,7 +734,7 @@ export default class Inibase {
                     if (onlyLinesNumbers)
                         return Object.keys(RETURN).map(Number);
                     const alreadyExistsColumns = Object.keys(Object.values(RETURN)[0]);
-                    RETURN = Object.values(Utils.deepMerge(RETURN, await this.getItemsFromSchema(tableName, schema.filter((field) => !alreadyExistsColumns.includes(field.key)), Object.keys(RETURN).map(Number), options)));
+                    RETURN = Object.values(Utils.deepMerge(RETURN, await this.getItemsFromSchema(tableName, schema.filter(({ key }) => !alreadyExistsColumns.includes(key)), Object.keys(RETURN).map(Number), options)));
                     if (Config.isCacheEnabled)
                         await File.write(cachedFilePath, Array.from(linesNumbers).join(","), true);
                 }

package/dist/utils.server.d.ts

@@ -47,7 +47,28 @@ export declare const findLastIdNumber: (schema: Schema, secretKeyOrSalt: string
  * @param secretKeyOrSalt - The secret key or salt for encoding IDs, can be a string, number, or Buffer.
  * @returns The updated schema with encoded IDs.
  */
-export declare const addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer) => import("./index.js").Field[];
+export declare const addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer) => (({
+    id?: string | number | undefined;
+    key: string;
+    required?: boolean | undefined;
+} & {
+    type: "string" | "number" | "boolean" | "id" | "url" | "html" | "table" | "email" | "date" | "password" | "ip";
+    children?: undefined;
+}) | ({
+    id?: string | number | undefined;
+    key: string;
+    required?: boolean | undefined;
+} & {
+    type: "object";
+    children: Schema;
+}) | ({
+    id?: string | number | undefined;
+    key: string;
+    required?: boolean | undefined;
+} & {
+    type: "array";
+    children: "string" | "number" | "boolean" | "object" | "id" | "url" | "html" | "table" | "email" | "date" | "password" | "ip" | Schema | ("string" | "number" | "boolean" | "object" | "id" | "url" | "html" | "table" | "email" | "date" | "password" | "ip")[];
+}))[];
 export declare const hashObject: (obj: any) => string;
 export default class UtilsServer {
     static encodeID: (id: string | number, secretKeyOrSalt: string | number | Buffer) => string;
@@ -55,6 +76,27 @@ export default class UtilsServer {
     static hashPassword: (password: string) => string;
     static comparePassword: (hashedPassword: string, inputPassword: string) => boolean;
     static findLastIdNumber: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => number;
-    static addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer) => import("./index.js").Field[];
+    static addIdToSchema: (schema: Schema, oldIndex: number | undefined, secretKeyOrSalt: string | number | Buffer) => (({
+        id?: string | number | undefined;
+        key: string;
+        required?: boolean | undefined;
+    } & {
+        type: "string" | "number" | "boolean" | "id" | "url" | "html" | "table" | "email" | "date" | "password" | "ip";
+        children?: undefined;
+    }) | ({
+        id?: string | number | undefined;
+        key: string;
+        required?: boolean | undefined;
+    } & {
+        type: "object";
+        children: Schema;
+    }) | ({
+        id?: string | number | undefined;
+        key: string;
+        required?: boolean | undefined;
+    } & {
+        type: "array";
+        children: "string" | "number" | "boolean" | "object" | "id" | "url" | "html" | "table" | "email" | "date" | "password" | "ip" | Schema | ("string" | "number" | "boolean" | "object" | "id" | "url" | "html" | "table" | "email" | "date" | "password" | "ip")[];
+    }))[];
     static hashObject: (obj: any) => string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.27",
+  "version": "1.0.0-rc.28",
   "author": {
     "name": "Karim Amahtil",
     "email": "karim.amahtil@gmail.com"