inibase 1.0.0-rc.3 → 1.0.0-rc.5

package/index.ts

@@ -9,12 +9,9 @@ import {
   renameSync,
 } from "fs";
 import { join, parse } from "path";
-import { createDecipheriv, createCipheriv, scryptSync } from "crypto";
 import Utils from "./utils";
 import File from "./file";
 
-export { File, Utils };
-
 export type Data = {
   id?: number | string;
   [key: string]: any;
@@ -33,31 +30,45 @@ export type FieldType =
   | "object"
   | "array"
   | "password";
-type Field = {
+type FieldDefault = {
   id?: string | number | null | undefined;
   key: string;
   required?: boolean;
-} & (
-  | {
-      type: Exclude<FieldType, "array" | "object">;
-      required?: boolean;
-    }
-  | {
-      type: "array";
-      children: FieldType | FieldType[] | Schema;
-    }
-  | {
-      type: "object";
-      children: Schema;
-    }
-);
+};
+type FieldStringType = {
+  type: Exclude<FieldType, "array" | "object">;
+};
+type FieldStringArrayType = {
+  type: Exclude<FieldType, "array" | "object">[];
+};
+type FieldArrayType = {
+  type: "array";
+  children: FieldType | FieldType[] | Schema;
+};
+type FieldArrayArrayType = {
+  type: ["array", ...FieldType[]];
+  children: FieldType | FieldType[];
+};
+type FieldObjectType = {
+  type: "object";
+  children: Schema;
+};
+// if "type" is array, make "array" at first place, and "number" & "string" at last place of the array
+type Field = FieldDefault &
+  (
+    | FieldStringType
+    | FieldStringArrayType
+    | FieldObjectType
+    | FieldArrayType
+    | FieldArrayArrayType
+  );
 
 export type Schema = Field[];
 
 export interface Options {
   page?: number;
   per_page?: number;
-  columns?: string[];
+  columns?: string[] | string;
 }
 
 export type ComparisonOperator =
@@ -79,13 +90,23 @@ type pageInfo = {
 
 export type Criteria =
   | {
-      [logic in "and" | "or"]?: Criteria;
+      [logic in "and" | "or"]?: Criteria | (string | number | boolean | null)[];
     }
   | {
       [key: string]: string | number | boolean | Criteria;
     }
   | null;
 
+declare global {
+  type Entries<T> = {
+    [K in keyof T]: [K, T[K]];
+  }[keyof T][];
+
+  interface ObjectConstructor {
+    entries<T extends object>(o: T): Entries<T>;
+  }
+}
+
 export default class Inibase {
   public database: string;
   public databasePath: string;
@@ -93,7 +114,7 @@ export default class Inibase {
   public pageInfoArray: Record<string, Record<string, number>>;
   public pageInfo: pageInfo;
 
-  constructor(databaseName: string, mainFolder: string = "/") {
+  constructor(databaseName: string, mainFolder: string = ".") {
     this.database = databaseName;
     this.databasePath = join(mainFolder, databaseName);
     this.cache = new Map<string, any>();
@@ -112,14 +133,14 @@ export default class Inibase {
   ): Error {
     const errorMessages: Record<string, Record<string, string>> = {
       en: {
+        FIELD_REQUIRED: "REQUIRED: {variable}",
         NO_SCHEMA: "NO_SCHEMA: {variable}",
         NO_ITEMS: "NO_ITEMS: {variable}",
+        NO_DATA: "NO_DATA: {variable}",
         INVALID_ID: "INVALID_ID: {variable}",
         INVALID_TYPE: "INVALID_TYPE: {variable}",
-        REQUIRED: "REQUIRED: {variable}",
-        NO_DATA: "NO_DATA: {variable}",
         INVALID_OPERATOR: "INVALID_OPERATOR: {variable}",
-        PARAMETERS: "PARAMETERS: {variable}",
+        INVALID_PARAMETERS: "PARAMETERS: {variable}",
       },
       // Add more languages and error messages as needed
     };
@@ -147,131 +168,6 @@ export default class Inibase {
     return new Error(errorMessage);
   }
 
-  public encodeID(id: number, secretKey?: string | number): string {
-    if (!secretKey) secretKey = this.databasePath;
-
-    const salt = scryptSync(secretKey.toString(), "salt", 32),
-      cipher = createCipheriv("aes-256-cbc", salt, salt.subarray(0, 16));
-
-    return cipher.update(id.toString(), "utf8", "hex") + cipher.final("hex");
-  }
-
-  public decodeID(input: string, secretKey?: string | number): number {
-    if (!secretKey) secretKey = this.databasePath;
-    const salt = scryptSync(secretKey.toString(), "salt", 32),
-      decipher = createDecipheriv("aes-256-cbc", salt, salt.subarray(0, 16));
-    return Number(
-      decipher.update(input as string, "hex", "utf8") + decipher.final("utf8")
-    );
-  }
-
-  public isValidID(input: any): boolean {
-    return Array.isArray(input)
-      ? input.every(this.isValidID)
-      : typeof input === "string" && input.length === 32;
-  }
-
-  public validateData(
-    data: Data | Data[],
-    schema: Schema,
-    skipRequiredField: boolean = false
-  ): void {
-    if (Utils.isArrayOfObjects(data))
-      for (const single_data of data as Data[])
-        this.validateData(single_data, schema, skipRequiredField);
-    else if (!Array.isArray(data)) {
-      const validateFieldType = (
-        value: any,
-        field: Field | FieldType | FieldType[]
-      ): boolean => {
-        if (Array.isArray(field))
-          return field.some((item) => validateFieldType(value, item));
-        switch (typeof field === "string" ? field : field.type) {
-          case "string":
-            return value === null || typeof value === "string";
-          case "number":
-            return value === null || typeof value === "number";
-          case "boolean":
-            return (
-              value === null ||
-              typeof value === "boolean" ||
-              value === "true" ||
-              value === "false"
-            );
-          case "date":
-            return value === null || value instanceof Date;
-          case "object":
-            return (
-              value === null ||
-              (typeof value === "object" &&
-                !Array.isArray(value) &&
-                value !== null)
-            );
-          case "array":
-            return (
-              value === null ||
-              (Array.isArray(value) &&
-                value.every((item) => validateFieldType(item, field)))
-            );
-          case "email":
-            return (
-              value === null ||
-              (typeof value === "string" &&
-                /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value))
-            );
-          case "url":
-            return (
-              value === null ||
-              (typeof value === "string" &&
-                (value[0] === "#" ||
-                  /^((https?|www):\/\/)?[a-z0-9-]+(\.[a-z0-9-]+)*\.[a-z]+(\/[^\s]*)?$/.test(
-                    value
-                  )))
-            );
-          case "table":
-            // feat: check if id exists
-            if (Array.isArray(value))
-              return (
-                typeof field !== "string" &&
-                field.type === "table" &&
-                ((Utils.isArrayOfObjects(value) &&
-                  value.every(
-                    (element) =>
-                      element.hasOwnProperty("id") &&
-                      this.isValidID((element as Data).id)
-                  )) ||
-                  value.every(Utils.isNumber) ||
-                  this.isValidID(value))
-              );
-            else if (Utils.isObject(value))
-              return (
-                value.hasOwnProperty("id") && this.isValidID((value as Data).id)
-              );
-            else return Utils.isNumber(value) || this.isValidID(value);
-          default:
-            return true;
-        }
-      };
-      for (const field of schema) {
-        if (data.hasOwnProperty(field.key)) {
-          if (!validateFieldType(data[field.key], field))
-            throw this.throwError("INVALID_TYPE", field.key);
-          if (
-            (field.type === "array" || field.type === "object") &&
-            field.children &&
-            Utils.isArrayOfObjects(field.children)
-          )
-            this.validateData(
-              data[field.key],
-              field.children as Schema,
-              skipRequiredField
-            );
-        } else if (field.required && !skipRequiredField)
-          throw this.throwError("REQUIRED", field.key);
-      }
-    }
-  }
-
   public setTableSchema(tableName: string, schema: Schema): void {
     const encodeSchema = (schema: Schema) => {
         let RETURN: any[][] = [],
@@ -279,7 +175,9 @@ export default class Inibase {
         for (const field of schema) {
           if (!RETURN[index]) RETURN[index] = [];
           RETURN[index].push(
-            field.id ? this.decodeID(field.id as string) : null
+            field.id
+              ? Utils.decodeID(field.id as string, this.databasePath)
+              : null
           );
           RETURN[index].push(field.key ?? null);
           RETURN[index].push(field.required ?? null);
@@ -303,14 +201,22 @@ export default class Inibase {
           ) {
             if (!field.id) {
               oldIndex++;
-              field = { ...field, id: this.encodeID(oldIndex) };
-            } else oldIndex = this.decodeID(field.id as string);
+              field = {
+                ...field,
+                id: Utils.encodeID(oldIndex, this.databasePath),
+              };
+            } else
+              oldIndex = Utils.decodeID(field.id as string, this.databasePath);
             field.children = addIdToSchema(field.children as Schema, oldIndex);
             oldIndex += field.children.length;
-          } else if (field.id) oldIndex = this.decodeID(field.id as string);
+          } else if (field.id)
+            oldIndex = Utils.decodeID(field.id as string, this.databasePath);
           else {
             oldIndex++;
-            field = { ...field, id: this.encodeID(oldIndex) };
+            field = {
+              ...field,
+              id: Utils.encodeID(oldIndex, this.databasePath),
+            };
           }
           return field;
         }),
@@ -322,8 +228,10 @@ export default class Inibase {
             Utils.isArrayOfObjects(lastField.children)
           )
             return findLastIdNumber(lastField.children as Schema);
-          else return this.decodeID(lastField.id as string);
-        } else return 0;
+          else if (lastField.id && Utils.isValidID(lastField.id))
+            return Utils.decodeID(lastField.id as string, this.databasePath);
+        }
+        return 0;
       };
 
     // remove id from schema
@@ -336,7 +244,7 @@ export default class Inibase {
       // update columns files names based on field id
       const schemaToIdsPath = (schema: any, prefix = "") => {
           let RETURN: any = {};
-          for (const field of schema) {
+          for (const field of schema)
             if (field.children && Utils.isArrayOfObjects(field.children)) {
               Utils.deepMerge(
                 RETURN,
@@ -347,37 +255,20 @@ export default class Inibase {
                     (field.type === "array" ? ".*." : ".")
                 )
               );
-            } else if (this.isValidID(field.id))
-              RETURN[this.decodeID(field.id)] = File.encodeFileName(
-                (prefix ?? "") + field.key,
-                "inib"
-              );
-          }
-          return RETURN;
-        },
-        findChangedProperties = (
-          obj1: Record<string, string>,
-          obj2: Record<string, string>
-        ): Record<string, string> | null => {
-          const result: Record<string, string> = {};
+            } else if (Utils.isValidID(field.id))
+              RETURN[Utils.decodeID(field.id, this.databasePath)] =
+                File.encodeFileName((prefix ?? "") + field.key, "inib");
 
-          for (const key1 in obj1) {
-            if (obj2.hasOwnProperty(key1) && obj1[key1] !== obj2[key1]) {
-              result[obj1[key1]] = obj2[key1];
-            }
-          }
-
-          return Object.keys(result).length ? result : null;
+          return RETURN;
         },
-        replaceOldPathes = findChangedProperties(
+        replaceOldPathes = Utils.findChangedProperties(
           schemaToIdsPath(this.getTableSchema(tableName)),
           schemaToIdsPath(schema)
         );
-      if (replaceOldPathes) {
+      if (replaceOldPathes)
         for (const [oldPath, newPath] of Object.entries(replaceOldPathes))
           if (existsSync(join(TablePath, oldPath)))
             renameSync(join(TablePath, oldPath), join(TablePath, newPath));
-      }
     }
 
     writeFileSync(
@@ -393,7 +284,7 @@ export default class Inibase {
             ? decodeSchema(field)
             : Object.fromEntries(
                 Object.entries({
-                  id: this.encodeID(field[0]),
+                  id: Utils.encodeID(field[0], this.databasePath),
                   key: field[1],
                   required: field[2],
                   type: field[3],
@@ -418,24 +309,156 @@ export default class Inibase {
       );
     }
     return [
-      { id: this.encodeID(0), key: "id", type: "number", required: true },
+      {
+        id: Utils.encodeID(0, this.databasePath),
+        key: "id",
+        type: "number",
+        required: true,
+      },
       ...(this.cache.get(TableSchemaPath) as unknown as Schema),
     ];
   }
 
-  public getField(keyPath: string, schema: Schema | Field): Field | null {
-    for (const key of keyPath.split(".")) {
+  public getField<Property extends keyof Field | "children">(
+    keyPath: string,
+    schema: Schema | Field,
+    property?: Property
+  ) {
+    const keyPathSplited = keyPath.split(".");
+    for (const [index, key] of keyPathSplited.entries()) {
       if (key === "*") continue;
       const foundItem = (schema as Schema).find((item) => item.key === key);
       if (!foundItem) return null;
-      schema =
+      if (index === keyPathSplited.length - 1) schema = foundItem;
+      if (
         (foundItem.type === "array" || foundItem.type === "object") &&
         foundItem.children &&
         Utils.isArrayOfObjects(foundItem.children)
-          ? (foundItem.children as Schema)
-          : foundItem;
+      )
+        schema = foundItem.children as Schema;
+    }
+    if (property) {
+      switch (property) {
+        case "type":
+          return (schema as Field).type;
+        case "children":
+          return (
+            schema as
+              | (Field & FieldObjectType)
+              | FieldArrayType
+              | FieldArrayArrayType
+          ).children;
+
+        default:
+          return (schema as Field)[property as keyof Field];
+      }
+    } else return schema as Field;
+  }
+
+  public validateData(
+    data: Data | Data[],
+    schema: Schema,
+    skipRequiredField: boolean = false
+  ): void {
+    const validateFieldType = (
+      value: any,
+      fieldType: FieldType | FieldType[],
+      fieldChildrenType?: FieldType | FieldType[]
+    ): boolean => {
+      if (value === null) return true;
+      if (Array.isArray(fieldType))
+        return Utils.detectFieldType(value, fieldType) !== undefined;
+      if (fieldType === "array" && fieldChildrenType && Array.isArray(value))
+        return value.some(
+          (v) =>
+            Utils.detectFieldType(
+              v,
+              Array.isArray(fieldChildrenType)
+                ? fieldChildrenType
+                : [fieldChildrenType]
+            ) !== undefined
+        );
+
+      switch (fieldType) {
+        case "string":
+          // TO-DO: and not email, url, password ...
+          return !Utils.isNumber(value);
+        case "password":
+          return !Utils.isNumber(value) && Utils.isPassword(value);
+        case "number":
+          return Utils.isNumber(value);
+        case "boolean":
+          return (
+            typeof value === "boolean" || value === "true" || value === "false"
+          );
+        case "date":
+          return Utils.isDate(value);
+        case "object":
+          return Utils.isObject(value);
+        case "array":
+          return Array.isArray(value);
+        case "email":
+          return Utils.isEmail(value);
+        case "url":
+          return Utils.isURL(value);
+        case "table":
+          // feat: check if id exists
+          if (Array.isArray(value))
+            return (
+              (Utils.isArrayOfObjects(value) &&
+                value.every(
+                  (element: Data) =>
+                    element.hasOwnProperty("id") &&
+                    (Utils.isValidID(element.id) || Utils.isNumber(element.id))
+                )) ||
+              value.every(Utils.isNumber) ||
+              Utils.isValidID(value)
+            );
+          else if (Utils.isObject(value))
+            return (
+              value.hasOwnProperty("id") &&
+              (Utils.isValidID((value as Data).id) ||
+                Utils.isNumber((value as Data).id))
+            );
+          else return Utils.isNumber(value) || Utils.isValidID(value);
+        default:
+          return false;
+      }
+    };
+    if (Utils.isArrayOfObjects(data))
+      for (const single_data of data as Data[])
+        this.validateData(single_data, schema, skipRequiredField);
+    else if (Utils.isObject(data)) {
+      for (const field of schema) {
+        if (
+          !data.hasOwnProperty(field.key) &&
+          field.required &&
+          !skipRequiredField
+        )
+          throw this.throwError("FIELD_REQUIRED", field.key);
+        if (
+          !validateFieldType(
+            data[field.key],
+            field.type,
+            (field as any)?.children &&
+              !Utils.isArrayOfObjects((field as any)?.children)
+              ? (field as any)?.children
+              : undefined
+          )
+        )
+          throw this.throwError("INVALID_TYPE", field.key);
+        if (
+          (field.type === "array" || field.type === "object") &&
+          field.children &&
+          Utils.isArrayOfObjects(field.children)
+        )
+          this.validateData(
+            data[field.key],
+            field.children as Schema,
+            skipRequiredField
+          );
+      }
     }
-    return schema as Field;
   }
 
   public formatData(
@@ -443,89 +466,111 @@ export default class Inibase {
     schema: Schema,
     formatOnlyAvailiableKeys?: boolean
   ): Data | Data[] {
-    if (Utils.isArrayOfObjects(data)) {
+    const formatField = (
+      value: any,
+      field: Field
+    ): Data | Data[] | number | string => {
+      if (Array.isArray(field.type))
+        field.type = Utils.detectFieldType(value, field.type);
+
+      switch (field.type) {
+        case "array":
+          if (typeof field.children === "string") {
+            if (field.type === "array" && field.children === "table") {
+              if (Array.isArray(data[field.key])) {
+                if (Utils.isArrayOfObjects(data[field.key])) {
+                  if (
+                    value.every(
+                      (item: any) =>
+                        item.hasOwnProperty("id") &&
+                        (Utils.isValidID(item.id) || Utils.isNumber(item.id))
+                    )
+                  )
+                    value.map((item: any) =>
+                      Utils.isNumber(item.id)
+                        ? Number(item.id)
+                        : Utils.decodeID(item.id, this.databasePath)
+                    );
+                } else if (Utils.isValidID(value) || Utils.isNumber(value))
+                  return value.map((item: number | string) =>
+                    Utils.isNumber(item)
+                      ? Number(item as string)
+                      : Utils.decodeID(item as string, this.databasePath)
+                  );
+              } else if (Utils.isValidID(value))
+                return [Utils.decodeID(value, this.databasePath)];
+              else if (Utils.isNumber(value)) return [Number(value)];
+            } else if (data.hasOwnProperty(field.key)) return value;
+          } else if (Utils.isArrayOfObjects(field.children))
+            return this.formatData(
+              value,
+              field.children as Schema,
+              formatOnlyAvailiableKeys
+            );
+          else if (Array.isArray(field.children))
+            return Array.isArray(value) ? value : [value];
+          break;
+        case "object":
+          if (Utils.isArrayOfObjects(field.children))
+            return this.formatData(
+              value,
+              field.children,
+              formatOnlyAvailiableKeys
+            );
+          break;
+        case "table":
+          if (Utils.isObject(value)) {
+            if (
+              value.hasOwnProperty("id") &&
+              (Utils.isValidID(value.id) || Utils.isNumber(value))
+            )
+              return Utils.isNumber(value.id)
+                ? Number(value.id)
+                : Utils.decodeID(value.id, this.databasePath);
+          } else if (Utils.isValidID(value) || Utils.isNumber(value))
+            return Utils.isNumber(value)
+              ? Number(value)
+              : Utils.decodeID(value, this.databasePath);
+          break;
+        case "password":
+          return value.length === 161 ? value : Utils.hashPassword(value);
+        case "number":
+          return Utils.isNumber(value) ? Number(value) : null;
+        default:
+          return value;
+      }
+      return null;
+    };
+    if (Utils.isArrayOfObjects(data))
       return data.map((single_data: Data) =>
-        this.formatData(single_data, schema)
+        this.formatData(single_data, schema, formatOnlyAvailiableKeys)
       );
-    } else if (!Array.isArray(data)) {
+    else if (Utils.isObject(data)) {
       let RETURN: Data = {};
       for (const field of schema) {
         if (!data.hasOwnProperty(field.key)) {
+          if (formatOnlyAvailiableKeys) continue;
           RETURN[field.key] = this.getDefaultValue(field);
           continue;
         }
-        if (formatOnlyAvailiableKeys && !data.hasOwnProperty(field.key))
-          continue;
-
-        if (field.type === "array" || field.type === "object") {
-          if (field.children)
-            if (typeof field.children === "string") {
-              if (field.type === "array" && field.children === "table") {
-                if (Array.isArray(data[field.key])) {
-                  if (Utils.isArrayOfObjects(data[field.key])) {
-                    if (
-                      data[field.key].every(
-                        (item: any) =>
-                          item.hasOwnProperty("id") &&
-                          (this.isValidID(item.id) || Utils.isNumber(item.id))
-                      )
-                    )
-                      data[field.key].map((item: any) =>
-                        Utils.isNumber(item.id)
-                          ? parseFloat(item.id)
-                          : this.decodeID(item.id)
-                      );
-                  } else if (
-                    this.isValidID(data[field.key]) ||
-                    Utils.isNumber(data[field.key])
-                  )
-                    RETURN[field.key] = data[field.key].map(
-                      (item: number | string) =>
-                        Utils.isNumber(item)
-                          ? parseFloat(item as string)
-                          : this.decodeID(item as string)
-                    );
-                } else if (this.isValidID(data[field.key]))
-                  RETURN[field.key] = [this.decodeID(data[field.key])];
-                else if (Utils.isNumber(data[field.key]))
-                  RETURN[field.key] = [parseFloat(data[field.key])];
-              } else if (data.hasOwnProperty(field.key))
-                RETURN[field.key] = data[field.key];
-            } else if (Utils.isArrayOfObjects(field.children))
-              RETURN[field.key] = this.formatData(
-                data[field.key],
-                field.children as Schema,
-                formatOnlyAvailiableKeys
-              );
-        } else if (field.type === "table") {
-          if (Utils.isObject(data[field.key])) {
-            if (
-              data[field.key].hasOwnProperty("id") &&
-              (this.isValidID(data[field.key].id) ||
-                Utils.isNumber(data[field.key]))
-            )
-              RETURN[field.key] = Utils.isNumber(data[field.key].id)
-                ? parseFloat(data[field.key].id)
-                : this.decodeID(data[field.key].id);
-          } else if (
-            this.isValidID(data[field.key]) ||
-            Utils.isNumber(data[field.key])
-          )
-            RETURN[field.key] = Utils.isNumber(data[field.key])
-              ? parseFloat(data[field.key])
-              : this.decodeID(data[field.key]);
-        } else if (field.type === "password")
-          RETURN[field.key] =
-            data[field.key].length === 161
-              ? data[field.key]
-              : Utils.hashPassword(data[field.key]);
-        else RETURN[field.key] = data[field.key];
+        RETURN[field.key] = formatField(data[field.key], field);
       }
       return RETURN;
     } else return [];
   }
 
   private getDefaultValue(field: Field): any {
+    if (Array.isArray(field.type))
+      return this.getDefaultValue({
+        ...field,
+        type: field.type.sort(
+          (a: FieldType, b: FieldType) =>
+            Number(b === "array") - Number(a === "array") ||
+            Number(a === "string") - Number(b === "string") ||
+            Number(a === "number") - Number(b === "number")
+        )[0],
+      } as Field);
+
     switch (field.type) {
       case "array":
         return Utils.isArrayOfObjects(field.children)
@@ -552,37 +597,54 @@ export default class Inibase {
     mainPath: string,
     data: Data | Data[]
   ): { [key: string]: string[] } {
-    const CombineData = (data: Data | Data[], prefix?: string) => {
+    const CombineData = (_data: Data | Data[], prefix?: string) => {
       let RETURN: Record<
         string,
         string | boolean | number | null | (string | boolean | number | null)[]
       > = {};
-
-      if (Utils.isArrayOfObjects(data))
-        RETURN = Utils.combineObjects(
-          (data as Data[]).map((single_data) => CombineData(single_data))
+      const combineObjectsToArray = (input: any[]) =>
+        input.reduce(
+          (r, c) => (
+            Object.keys(c).map((k) => (r[k] = [...(r[k] || []), c[k]])), r
+          ),
+          {}
+        );
+      if (Utils.isArrayOfObjects(_data))
+        RETURN = combineObjectsToArray(
+          (_data as Data[]).map((single_data) => CombineData(single_data))
         );
       else {
-        for (const [key, value] of Object.entries(data)) {
+        for (const [key, value] of Object.entries(_data as Data)) {
           if (Utils.isObject(value))
             Object.assign(RETURN, CombineData(value, `${key}.`));
           else if (Array.isArray(value)) {
-            if (Utils.isArrayOfObjects(value))
+            if (Utils.isArrayOfObjects(value)) {
               Object.assign(
                 RETURN,
                 CombineData(
-                  Utils.combineObjects(value),
+                  combineObjectsToArray(value),
+                  (prefix ?? "") + key + ".*."
+                )
+              );
+            } else if (
+              Utils.isArrayOfArrays(value) &&
+              value.every(Utils.isArrayOfObjects)
+            )
+              Object.assign(
+                RETURN,
+                CombineData(
+                  combineObjectsToArray(value.map(combineObjectsToArray)),
                   (prefix ?? "") + key + ".*."
                 )
               );
             else
-              RETURN[(prefix ?? "") + key] = Utils.encode(value) as
+              RETURN[(prefix ?? "") + key] = File.encode(value) as
                 | boolean
                 | number
                 | string
                 | null;
           } else
-            RETURN[(prefix ?? "") + key] = Utils.encode(value) as
+            RETURN[(prefix ?? "") + key] = File.encode(value) as
               | boolean
               | number
               | string
@@ -612,6 +674,8 @@ export default class Inibase {
     onlyLinesNumbers?: boolean
   ): Promise<Data | Data[] | number[] | null> {
     if (!options.columns) options.columns = [];
+    else if (!Array.isArray(options.columns))
+      options.columns = [options.columns];
     else if (
       options.columns.length &&
       !(options.columns as string[]).includes("id")
@@ -625,23 +689,35 @@ export default class Inibase {
     const filterSchemaByColumns = (schema: Schema, columns: string[]): Schema =>
       schema
         .map((field) => {
-          if (columns.includes(field.key)) return field;
+          if (columns.some((column) => column.startsWith("!")))
+            return columns.includes("!" + field.key) ? null : field;
+          if (columns.includes(field.key) || columns.includes("*"))
+            return field;
+
           if (
             (field.type === "array" || field.type === "object") &&
             Utils.isArrayOfObjects(field.children) &&
-            columns.filter((column) =>
-              column.startsWith(
-                field.key + (field.type === "array" ? ".*." : ".")
-              )
+            columns.filter(
+              (column) =>
+                column.startsWith(
+                  field.key + (field.type === "array" ? ".*." : ".")
+                ) ||
+                column.startsWith(
+                  "!" + field.key + (field.type === "array" ? ".*." : ".")
+                )
             ).length
           ) {
             field.children = filterSchemaByColumns(
               field.children as Schema,
               columns
-                .filter((column) =>
-                  column.startsWith(
-                    field.key + (field.type === "array" ? ".*." : ".")
-                  )
+                .filter(
+                  (column) =>
+                    column.startsWith(
+                      field.key + (field.type === "array" ? ".*." : ".")
+                    ) ||
+                    column.startsWith(
+                      "!" + field.key + (field.type === "array" ? ".*." : ".")
+                    )
                 )
                 .map((column) =>
                   column.replace(
@@ -667,10 +743,144 @@ export default class Inibase {
       let RETURN: Record<number, Data> = {};
       for (const field of schema) {
         if (
-          (field.type === "array" || field.type === "object") &&
-          field.children
+          (field.type === "array" ||
+            (Array.isArray(field.type) &&
+              (field.type as any).includes("array"))) &&
+          (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+            .children
         ) {
-          if (field.children === "table") {
+          if (
+            Utils.isArrayOfObjects(
+              (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                .children
+            )
+          ) {
+            if (
+              (
+                (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                  .children as Schema
+              ).filter(
+                (children) =>
+                  children.type === "array" &&
+                  Utils.isArrayOfObjects(children.children)
+              ).length
+            ) {
+              // one of children has array field type and has children array of object = Schema
+              Object.entries(
+                (await getItemsFromSchema(
+                  path,
+                  (
+                    (
+                      field as FieldDefault &
+                        (FieldArrayType | FieldArrayArrayType)
+                    ).children as Schema
+                  ).filter(
+                    (children) =>
+                      children.type === "array" &&
+                      Utils.isArrayOfObjects(children.children)
+                  ),
+                  linesNumber,
+                  (prefix ?? "") + field.key + ".*."
+                )) ?? {}
+              ).forEach(([index, item]) => {
+                if (Utils.isObject(item)) {
+                  if (!RETURN[index]) RETURN[index] = {};
+                  if (!RETURN[index][field.key]) RETURN[index][field.key] = [];
+                  for (const child_field of (
+                    (
+                      field as FieldDefault &
+                        (FieldArrayType | FieldArrayArrayType)
+                    ).children as Schema
+                  ).filter(
+                    (children) =>
+                      children.type === "array" &&
+                      Utils.isArrayOfObjects(children.children)
+                  )) {
+                    if (Utils.isObject(item[child_field.key])) {
+                      Object.entries(item[child_field.key]).forEach(
+                        ([key, value]) => {
+                          for (let _i = 0; _i < value.length; _i++) {
+                            if (!RETURN[index][field.key][_i])
+                              RETURN[index][field.key][_i] = {};
+                            if (!RETURN[index][field.key][_i][child_field.key])
+                              RETURN[index][field.key][_i][child_field.key] =
+                                [];
+                            value[_i].forEach((_element, _index) => {
+                              if (
+                                !RETURN[index][field.key][_i][child_field.key][
+                                  _index
+                                ]
+                              )
+                                RETURN[index][field.key][_i][child_field.key][
+                                  _index
+                                ] = {};
+                              RETURN[index][field.key][_i][child_field.key][
+                                _index
+                              ][key] = _element;
+                            });
+                          }
+                        }
+                      );
+                    }
+                  }
+                }
+              });
+              (
+                field as FieldDefault & (FieldArrayType | FieldArrayArrayType)
+              ).children = (
+                (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                  .children as Schema
+              ).filter(
+                (children) =>
+                  children.type !== "array" ||
+                  !Utils.isArrayOfObjects(children.children)
+              );
+            }
+            Object.entries(
+              (await getItemsFromSchema(
+                path,
+                (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                  .children as Schema,
+                linesNumber,
+                (prefix ?? "") + field.key + ".*."
+              )) ?? {}
+            ).forEach(([index, item]) => {
+              if (!RETURN[index]) RETURN[index] = {};
+              if (Utils.isObject(item)) {
+                if (!Object.values(item).every((i) => i === null)) {
+                  if (RETURN[index][field.key])
+                    Object.entries(item).forEach(([key, value], _index) => {
+                      RETURN[index][field.key] = RETURN[index][field.key].map(
+                        (_obj, _i) => ({ ..._obj, [key]: value[_index] })
+                      );
+                    });
+                  else if (Object.values(item).every(Utils.isArrayOfArrays))
+                    RETURN[index][field.key] = item;
+                  else {
+                    RETURN[index][field.key] = [];
+                    Object.entries(item).forEach(([key, value]) => {
+                      for (let _i = 0; _i < value.length; _i++) {
+                        if (!RETURN[index][field.key][_i])
+                          RETURN[index][field.key][_i] = {};
+                        RETURN[index][field.key][_i][key] = value[_i];
+                      }
+                    });
+                  }
+                } else RETURN[index][field.key] = null;
+              } else RETURN[index][field.key] = item;
+            });
+          } else if (
+            (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+              .children === "table" ||
+            (Array.isArray(
+              (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                .children
+            ) &&
+              (
+                (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                  .children as FieldType[]
+              ).includes("table"))
+          ) {
             if (options.columns)
               options.columns = (options.columns as string[])
                 .filter((column) => column.includes(`${field.key}.*.`))
@@ -681,8 +891,10 @@ export default class Inibase {
                   path,
                   File.encodeFileName((prefix ?? "") + field.key, "inib")
                 ),
+                linesNumber,
                 field.type,
-                linesNumber
+                (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
+                  .children as FieldType | FieldType[]
               )) ?? {}
             )) {
               if (!RETURN[index]) RETURN[index] = {};
@@ -690,26 +902,44 @@ export default class Inibase {
                 ? await this.get(field.key, value as number, options)
                 : this.getDefaultValue(field);
             }
-          } else if (Utils.isArrayOfObjects(field.children)) {
-            Object.entries(
-              (await getItemsFromSchema(
+          } else if (
+            existsSync(
+              join(
                 path,
-                field.children as Schema,
+                File.encodeFileName((prefix ?? "") + field.key, "inib")
+              )
+            )
+          )
+            Object.entries(
+              (await File.get(
+                join(
+                  path,
+                  File.encodeFileName((prefix ?? "") + field.key, "inib")
+                ),
                 linesNumber,
-                (prefix ?? "") +
-                  field.key +
-                  (field.type === "array" ? ".*." : ".")
+                field.type,
+                (field as any)?.children
               )) ?? {}
             ).forEach(([index, item]) => {
               if (!RETURN[index]) RETURN[index] = {};
-              RETURN[index][field.key] =
-                field.type === "array" &&
-                Utils.isObject(item) &&
-                Object.values(item).every((i) => i === null)
-                  ? []
-                  : item;
+              RETURN[index][field.key] = item ?? this.getDefaultValue(field);
             });
-          }
+        } else if (field.type === "object") {
+          Object.entries(
+            (await getItemsFromSchema(
+              path,
+              field.children as Schema,
+              linesNumber,
+              (prefix ?? "") + field.key + "."
+            )) ?? {}
+          ).forEach(([index, item]) => {
+            if (!RETURN[index]) RETURN[index] = {};
+            if (Utils.isObject(item)) {
+              if (!Object.values(item).every((i) => i === null))
+                RETURN[index][field.key] = item;
+              else RETURN[index][field.key] = null;
+            } else RETURN[index][field.key] = null;
+          });
         } else if (field.type === "table") {
           if (
             existsSync(join(this.databasePath, field.key)) &&
@@ -734,8 +964,8 @@ export default class Inibase {
                   path,
                   File.encodeFileName((prefix ?? "") + field.key, "inib")
                 ),
-                "number",
-                linesNumber
+                linesNumber,
+                "number"
               )) ?? {}
             )) {
               if (!RETURN[index]) RETURN[index] = {};
@@ -748,21 +978,21 @@ export default class Inibase {
           existsSync(
             join(path, File.encodeFileName((prefix ?? "") + field.key, "inib"))
           )
-        ) {
+        )
           Object.entries(
             (await File.get(
               join(
                 path,
                 File.encodeFileName((prefix ?? "") + field.key, "inib")
               ),
+              linesNumber,
               field.type,
-              linesNumber
+              (field as any)?.children
             )) ?? {}
           ).forEach(([index, item]) => {
             if (!RETURN[index]) RETURN[index] = {};
             RETURN[index][field.key] = item ?? this.getDefaultValue(field);
           });
-        }
       }
       return RETURN;
     };
@@ -781,18 +1011,19 @@ export default class Inibase {
           )
         )
       );
-    } else if (this.isValidID(where) || Utils.isNumber(where)) {
+    } else if (Utils.isValidID(where) || Utils.isNumber(where)) {
       let Ids = where as string | number | (string | number)[];
       if (!Array.isArray(Ids)) Ids = [Ids];
       const idFilePath = join(this.databasePath, tableName, "id.inib");
       if (!existsSync(idFilePath)) throw this.throwError("NO_ITEMS", tableName);
       const [lineNumbers, countItems] = await File.search(
         idFilePath,
-        "number",
         "[]",
         Utils.isNumber(Ids)
-          ? Ids.map((id) => parseFloat(id as string))
-          : Ids.map((id) => this.decodeID(id as string)),
+          ? Ids.map((id) => Number(id as string))
+          : Ids.map((id) => Utils.decodeID(id as string, this.databasePath)),
+        undefined,
+        "number",
         undefined,
         Ids.length
       );
@@ -809,10 +1040,11 @@ export default class Inibase {
         )) ?? {}
       );
       if (RETURN.length && !Array.isArray(where)) RETURN = RETURN[0];
-    } else if (typeof where === "object" && !Array.isArray(where)) {
+    } else if (Utils.isObject(where)) {
       // Criteria
       const FormatObjectCriteriaValue = (
-        value: string
+        value: string,
+        isParentArray: boolean = false
       ): [ComparisonOperator, string | number | boolean | null] => {
         switch (value[0]) {
           case ">":
@@ -839,10 +1071,19 @@ export default class Inibase {
                   value.slice(3) as string | number,
                 ]
               : [
-                  value.slice(0, 1) as ComparisonOperator,
+                  (value.slice(0, 1) + "=") as ComparisonOperator,
                   value.slice(1) as string | number,
                 ];
           case "=":
+            return isParentArray
+              ? [
+                  value.slice(0, 1) as ComparisonOperator,
+                  value.slice(1) as string | number,
+                ]
+              : [
+                  value.slice(0, 1) as ComparisonOperator,
+                  (value.slice(1) + ",") as string,
+                ];
           case "*":
             return [
               value.slice(0, 1) as ComparisonOperator,
@@ -856,11 +1097,14 @@ export default class Inibase {
       const applyCriteria = async (
         criteria?: Criteria,
         allTrue?: boolean
-      ): Promise<Data | null> => {
-        let RETURN: Data = {};
+      ): Promise<Record<number, Data> | null> => {
+        let RETURN: Record<number, Data> = {};
         if (!criteria) return null;
-        if (criteria.and && typeof criteria.and === "object") {
-          const searchResult = await applyCriteria(criteria.and, true);
+        if (criteria.and && Utils.isObject(criteria.and)) {
+          const searchResult = await applyCriteria(
+            criteria.and as Criteria,
+            true
+          );
           if (searchResult) {
             RETURN = Utils.deepMerge(
               RETURN,
@@ -876,118 +1120,124 @@ export default class Inibase {
           } else return null;
         }
 
-        if (criteria.or && typeof criteria.or === "object") {
-          const searchResult = await applyCriteria(criteria.or);
+        if (criteria.or && Utils.isObject(criteria.or)) {
+          const searchResult = await applyCriteria(criteria.or as Criteria);
           delete criteria.or;
           if (searchResult) RETURN = Utils.deepMerge(RETURN, searchResult);
         }
 
-        let index = -1;
-        for (const [key, value] of Object.entries(criteria)) {
-          index++;
-          if (
-            allTrue &&
-            index > 0 &&
-            (!Object.keys(RETURN).length ||
-              Object.values(RETURN).every(
-                (item) => Object.keys(item).length >= index
-              ))
-          )
-            break;
-          let searchOperator:
-              | ComparisonOperator
-              | ComparisonOperator[]
-              | undefined = undefined,
-            searchComparedAtValue:
-              | string
-              | number
-              | boolean
-              | null
-              | (string | number | boolean | null)[]
-              | undefined = undefined,
-            searchLogicalOperator: "and" | "or" | undefined = undefined;
-          if (typeof value === "object") {
-            if (value?.or && Array.isArray(value.or)) {
-              const searchCriteria = value.or
-                .map(
-                  (
-                    single_or
-                  ): [ComparisonOperator, string | number | boolean | null] =>
-                    typeof single_or === "string"
-                      ? FormatObjectCriteriaValue(single_or)
-                      : ["=", single_or]
+        if (Object.keys(criteria).length > 0) {
+          allTrue = true;
+          let index = -1;
+          for (const [key, value] of Object.entries(criteria)) {
+            const field = this.getField(key, schema as Schema) as Field;
+            index++;
+            let searchOperator:
+                | ComparisonOperator
+                | ComparisonOperator[]
+                | undefined = undefined,
+              searchComparedAtValue:
+                | string
+                | number
+                | boolean
+                | null
+                | (string | number | boolean | null)[]
+                | undefined = undefined,
+              searchLogicalOperator: "and" | "or" | undefined = undefined;
+            if (Utils.isObject(value)) {
+              if (
+                (value as Criteria)?.or &&
+                Array.isArray((value as Criteria).or)
+              ) {
+                const searchCriteria = (
+                  (value as Criteria).or as (string | number | boolean)[]
                 )
-                .filter((a) => a) as [ComparisonOperator, string | number][];
-              if (searchCriteria.length > 0) {
-                searchOperator = searchCriteria.map(
-                  (single_or) => single_or[0]
-                );
-                searchComparedAtValue = searchCriteria.map(
-                  (single_or) => single_or[1]
-                );
-                searchLogicalOperator = "or";
+                  .map(
+                    (
+                      single_or
+                    ): [ComparisonOperator, string | number | boolean | null] =>
+                      typeof single_or === "string"
+                        ? FormatObjectCriteriaValue(single_or)
+                        : ["=", single_or]
+                  )
+                  .filter((a) => a) as [ComparisonOperator, string | number][];
+                if (searchCriteria.length > 0) {
+                  searchOperator = searchCriteria.map(
+                    (single_or) => single_or[0]
+                  );
+                  searchComparedAtValue = searchCriteria.map(
+                    (single_or) => single_or[1]
+                  );
+                  searchLogicalOperator = "or";
+                }
+                delete (value as Criteria).or;
               }
-              delete value.or;
-            }
-            if (value?.and && Array.isArray(value.and)) {
-              const searchCriteria = value.and
+              if (
+                (value as Criteria)?.and &&
+                Array.isArray((value as Criteria).and)
+              ) {
+                const searchCriteria = (
+                  (value as Criteria).and as (string | number | boolean)[]
+                )
+                  .map(
+                    (
+                      single_and
+                    ): [ComparisonOperator, string | number | boolean | null] =>
+                      typeof single_and === "string"
+                        ? FormatObjectCriteriaValue(single_and)
+                        : ["=", single_and]
+                  )
+                  .filter((a) => a) as [ComparisonOperator, string | number][];
+                if (searchCriteria.length > 0) {
+                  searchOperator = searchCriteria.map(
+                    (single_and) => single_and[0]
+                  );
+                  searchComparedAtValue = searchCriteria.map(
+                    (single_and) => single_and[1]
+                  );
+                  searchLogicalOperator = "and";
+                }
+                delete (value as Criteria).and;
+              }
+            } else if (Array.isArray(value)) {
+              const searchCriteria = value
                 .map(
                   (
-                    single_and
+                    single
                   ): [ComparisonOperator, string | number | boolean | null] =>
-                    typeof single_and === "string"
-                      ? FormatObjectCriteriaValue(single_and)
-                      : ["=", single_and]
+                    typeof single === "string"
+                      ? FormatObjectCriteriaValue(single)
+                      : ["=", single]
                 )
                 .filter((a) => a) as [ComparisonOperator, string | number][];
               if (searchCriteria.length > 0) {
-                searchOperator = searchCriteria.map(
-                  (single_and) => single_and[0]
-                );
+                searchOperator = searchCriteria.map((single) => single[0]);
                 searchComparedAtValue = searchCriteria.map(
-                  (single_and) => single_and[1]
+                  (single) => single[1]
                 );
                 searchLogicalOperator = "and";
               }
-              delete value.and;
-            }
-          } else if (Array.isArray(value)) {
-            const searchCriteria = value
-              .map(
-                (
-                  single
-                ): [ComparisonOperator, string | number | boolean | null] =>
-                  typeof single === "string"
-                    ? FormatObjectCriteriaValue(single)
-                    : ["=", single]
-              )
-              .filter((a) => a) as [ComparisonOperator, string | number][];
-            if (searchCriteria.length > 0) {
-              searchOperator = searchCriteria.map((single) => single[0]);
-              searchComparedAtValue = searchCriteria.map((single) => single[1]);
-              searchLogicalOperator = "and";
-            }
-          } else if (typeof value === "string") {
-            const ComparisonOperatorValue = FormatObjectCriteriaValue(value);
-            if (ComparisonOperatorValue) {
-              searchOperator = ComparisonOperatorValue[0];
-              searchComparedAtValue = ComparisonOperatorValue[1];
+            } else if (typeof value === "string") {
+              const ComparisonOperatorValue = FormatObjectCriteriaValue(value);
+              if (ComparisonOperatorValue) {
+                searchOperator = ComparisonOperatorValue[0];
+                searchComparedAtValue = ComparisonOperatorValue[1];
+              }
+            } else {
+              searchOperator = "=";
+              searchComparedAtValue = value as number | boolean;
             }
-          } else {
-            searchOperator = "=";
-            searchComparedAtValue = value;
-          }
-          if (searchOperator && searchComparedAtValue) {
             const [searchResult, totlaItems] = await File.search(
               join(
                 this.databasePath,
                 tableName,
                 File.encodeFileName(key, "inib")
               ),
-              this.getField(key, schema as Schema)?.type ?? "string",
               searchOperator,
               searchComparedAtValue,
               searchLogicalOperator,
+              field?.type,
+              (field as any)?.children,
               options.per_page,
               (options.page as number) - 1 * (options.per_page as number) + 1,
               true
@@ -997,12 +1247,20 @@ export default class Inibase {
               if (!this.pageInfoArray[key]) this.pageInfoArray[key] = {};
               this.pageInfoArray[key].total_items = totlaItems;
             }
+            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 = {};
+            }
           }
         }
-        return Object.keys(RETURN).length > 0 ? RETURN : null;
+        return Object.keys(RETURN).length ? RETURN : null;
       };
-
-      RETURN = await applyCriteria(where);
+      RETURN = await applyCriteria(where as Criteria);
       if (RETURN) {
         if (onlyLinesNumbers) return Object.keys(RETURN).map(Number);
         const alreadyExistsColumns = Object.keys(Object.values(RETURN)[0]).map(
@@ -1019,7 +1277,7 @@ export default class Inibase {
           );
         if (greatestColumnTotalItems)
           this.pageInfo = {
-            ...(({ columns, ...restOFOptions }) => restOFOptions)(options),
+            ...(({ columns, ...restOfOptions }) => restOfOptions)(options),
             ...this.pageInfoArray[greatestColumnTotalItems],
             total_pages: Math.ceil(
               this.pageInfoArray[greatestColumnTotalItems].total_items /
@@ -1040,17 +1298,21 @@ export default class Inibase {
         );
       }
     }
-    return RETURN
-      ? Utils.isArrayOfObjects(RETURN)
-        ? (RETURN as Data[]).map((data: Data) => {
-            data.id = this.encodeID(data.id as number);
-            return data;
-          })
-        : {
-            ...(RETURN as Data),
-            id: this.encodeID((RETURN as Data).id as number),
-          }
-      : null;
+    if (
+      !RETURN ||
+      (Utils.isObject(RETURN) && !Object.keys(RETURN).length) ||
+      (Array.isArray(RETURN) && !RETURN.length)
+    )
+      return null;
+    return Utils.isArrayOfObjects(RETURN)
+      ? (RETURN as Data[]).map((data: Data) => {
+          data.id = Utils.encodeID(data.id as number, this.databasePath);
+          return data;
+        })
+      : {
+          ...(RETURN as Data),
+          id: Utils.encodeID((RETURN as Data).id as number, this.databasePath),
+        };
   }
 
   public async post(
@@ -1066,7 +1328,7 @@ export default class Inibase {
     if (!schema) throw this.throwError("NO_SCHEMA", tableName);
     const idFilePath = join(this.databasePath, tableName, "id.inib");
     let last_id = existsSync(idFilePath)
-      ? Number(Object.values(await File.get(idFilePath, "number", -1))[0])
+      ? Number(Object.values(await File.get(idFilePath, -1, "number"))[0])
       : 0;
     if (Utils.isArrayOfObjects(data))
       (data as Data[]).forEach((single_data, index) => {
@@ -1110,8 +1372,12 @@ export default class Inibase {
   public async put(
     tableName: string,
     data: Data | Data[],
-    where?: number | string | (number | string)[] | Criteria
-  ) {
+    where?: number | string | (number | string)[] | Criteria,
+    options: Options = {
+      page: 1,
+      per_page: 15,
+    }
+  ): Promise<Data | Data[] | null> {
     const schema = this.getTableSchema(tableName);
     if (!schema) throw this.throwError("NO_SCHEMA", tableName);
     this.validateData(data, schema, true);
@@ -1120,54 +1386,59 @@ export default class Inibase {
       if (Utils.isArrayOfObjects(data)) {
         if (
           !(data as Data[]).every(
-            (item) => item.hasOwnProperty("id") && this.isValidID(item.id)
+            (item) => item.hasOwnProperty("id") && Utils.isValidID(item.id)
           )
         )
           throw this.throwError("INVALID_ID");
-        await this.put(
+        return this.put(
           tableName,
           data,
           (data as Data[]).map((item) => item.id)
         );
       } else if (data.hasOwnProperty("id")) {
-        if (!this.isValidID((data as Data).id))
+        if (!Utils.isValidID((data as Data).id))
           throw this.throwError("INVALID_ID", (data as Data).id);
-        await this.put(
+        return this.put(
           tableName,
           data,
-          this.decodeID((data as Data).id as string)
+          Utils.decodeID((data as Data).id as string, this.databasePath)
         );
       } else {
         const pathesContents = this.joinPathesContents(
           join(this.databasePath, tableName),
           Utils.isArrayOfObjects(data)
             ? (data as Data[]).map((item) => ({
-                ...item,
+                ...(({ id, ...restOfData }) => restOfData)(item),
                 updated_at: new Date(),
               }))
-            : { ...data, updated_at: new Date() }
+            : {
+                ...(({ id, ...restOfData }) => restOfData)(data as Data),
+                updated_at: new Date(),
+              }
         );
         for (const [path, content] of Object.entries(pathesContents))
           await File.replace(path, content);
+        return this.get(tableName, where, options);
       }
-    } else if (this.isValidID(where)) {
+    } else if (Utils.isValidID(where)) {
       let Ids = where as string | string[];
       if (!Array.isArray(Ids)) Ids = [Ids];
       const idFilePath = join(this.databasePath, tableName, "id.inib");
       if (!existsSync(idFilePath)) throw this.throwError("NO_ITEMS", tableName);
       const [lineNumbers, countItems] = await File.search(
         idFilePath,
-        "number",
         "[]",
-        Ids.map((id) => this.decodeID(id)),
+        Ids.map((id) => Utils.decodeID(id, this.databasePath)),
+        undefined,
+        "number",
         undefined,
         Ids.length
       );
       if (!lineNumbers || !Object.keys(lineNumbers).length)
         throw this.throwError("INVALID_ID");
-      await this.put(tableName, data, Object.keys(lineNumbers).map(Number));
+      return this.put(tableName, data, Object.keys(lineNumbers).map(Number));
     } else if (Utils.isNumber(where)) {
-      // where in this case, is the line(s) number(s) and not id(s)
+      // "where" in this case, is the line(s) number(s) and not id(s)
       const pathesContents = Object.fromEntries(
         Object.entries(
           this.joinPathesContents(
@@ -1192,18 +1463,20 @@ export default class Inibase {
       );
       for (const [path, content] of Object.entries(pathesContents))
         await File.replace(path, content);
+      return this.get(tableName, where, options);
     } else if (typeof where === "object" && !Array.isArray(where)) {
       const lineNumbers = this.get(tableName, where, undefined, true);
       if (!lineNumbers || !Array.isArray(lineNumbers) || !lineNumbers.length)
         throw this.throwError("NO_ITEMS", tableName);
-      await this.put(tableName, data, lineNumbers);
-    } else throw this.throwError("PARAMETERS", tableName);
+      return this.put(tableName, data, lineNumbers);
+    } else throw this.throwError("INVALID_PARAMETERS", tableName);
   }
 
   public async delete(
     tableName: string,
-    where?: number | string | (number | string)[] | Criteria
-  ) {
+    where?: number | string | (number | string)[] | Criteria,
+    _id?: string | string[]
+  ): Promise<string | string[]> {
     const schema = this.getTableSchema(tableName);
     if (!schema) throw this.throwError("NO_SCHEMA", tableName);
     if (!where) {
@@ -1214,25 +1487,41 @@ export default class Inibase {
         ))
           unlinkSync(join(this.databasePath, tableName, file));
       }
-    } else if (this.isValidID(where)) {
+      return "*";
+    } else if (Utils.isValidID(where)) {
       let Ids = where as string | string[];
       if (!Array.isArray(Ids)) Ids = [Ids];
       const idFilePath = join(this.databasePath, tableName, "id.inib");
       if (!existsSync(idFilePath)) throw this.throwError("NO_ITEMS", tableName);
       const [lineNumbers, countItems] = await File.search(
         idFilePath,
-        "number",
         "[]",
-        Ids.map((id) => this.decodeID(id)),
+        Ids.map((id) => Utils.decodeID(id, this.databasePath)),
+        undefined,
+        "number",
         undefined,
         Ids.length
       );
       if (!lineNumbers || !Object.keys(lineNumbers).length)
         throw this.throwError("INVALID_ID");
-      await this.delete(tableName, Object.keys(lineNumbers).map(Number));
+      return this.delete(
+        tableName,
+        Object.keys(lineNumbers).map(Number),
+        where as string | string[]
+      );
     } else if (Utils.isNumber(where)) {
       const files = readdirSync(join(this.databasePath, tableName));
       if (files.length) {
+        if (!_id)
+          _id = Object.values(
+            await File.get(
+              join(this.databasePath, tableName, "id.inib"),
+              where as number | number[],
+              "number"
+            )
+          )
+            .map(Number)
+            .map((id) => Utils.encodeID(id, this.databasePath));
         for (const file in files.filter(
           (fileName: string) => fileName !== "schema.inib"
         ))
@@ -1240,12 +1529,13 @@ export default class Inibase {
             join(this.databasePath, tableName, file),
             where as number | number[]
           );
+        return Array.isArray(_id) && _id.length === 1 ? _id[0] : _id;
       }
     } else if (typeof where === "object" && !Array.isArray(where)) {
       const lineNumbers = this.get(tableName, where, undefined, true);
       if (!lineNumbers || !Array.isArray(lineNumbers) || !lineNumbers.length)
         throw this.throwError("NO_ITEMS", tableName);
-      await this.delete(tableName, lineNumbers);
-    } else throw this.throwError("PARAMETERS", tableName);
+      return this.delete(tableName, lineNumbers);
+    } else throw this.throwError("INVALID_PARAMETERS", tableName);
   }
 }