inibase 1.0.0-rc.10 → 1.0.0-rc.11

package/file.ts

@@ -20,6 +20,8 @@ export const isExists = async (path: string) => {
   }
 };
 
+const delimiters = [",", "|", "&", "$", "#", "@", "^", "%", ":", "!", ";"];
+
 export const encode = (
   input:
     | string
@@ -30,23 +32,42 @@ export const encode = (
   secretKey?: string | Buffer
 ) => {
   const secureString = (input: string | number | boolean | null) => {
-    if (["true", "false"].includes(String(input))) return input ? 1 : 0;
-    return typeof input === "string"
-      ? decodeURIComponent(input)
-          .replaceAll("<", "&lt;")
-          .replaceAll(">", "&gt;")
-          .replaceAll(",", "%2C")
-          .replaceAll("|", "%7C")
-          .replaceAll("\n", "\\n")
-          .replaceAll("\r", "\\r")
-      : input;
-  };
+      if (["true", "false"].includes(String(input))) return input ? 1 : 0;
+      return typeof input === "string"
+        ? decodeURIComponent(input)
+            .replaceAll("<", "&lt;")
+            .replaceAll(">", "&gt;")
+            .replaceAll(",", "%2C")
+            .replaceAll("|", "%7C")
+            .replaceAll("&", "%26")
+            .replaceAll("$", "%24")
+            .replaceAll("#", "%23")
+            .replaceAll("@", "%40")
+            .replaceAll("^", "%5E")
+            .replaceAll("%", "%25")
+            .replaceAll(":", "%3A")
+            .replaceAll("!", "%21")
+            .replaceAll(";", "%3B")
+            .replaceAll("\n", "\\n")
+            .replaceAll("\r", "\\r")
+        : input;
+    },
+    secureArray = (arr_str: any[] | any): any[] | any =>
+      Array.isArray(arr_str) ? arr_str.map(secureArray) : secureString(arr_str),
+    joinMultidimensionalArray = (
+      arr: any[] | any[][],
+      delimiter_index = 0
+    ): string => {
+      delimiter_index++;
+      if (isArrayOfArrays(arr))
+        arr = arr.map((ar: any[]) =>
+          joinMultidimensionalArray(ar, delimiter_index)
+        );
+      delimiter_index--;
+      return arr.join(delimiters[delimiter_index]);
+    };
   return Array.isArray(input)
-    ? isArrayOfArrays(input)
-      ? (input as any[])
-          .map((_input) => _input.map(secureString).join(","))
-          .join("|")
-      : input.map(secureString).join(",")
+    ? joinMultidimensionalArray(secureArray(input))
     : secureString(input);
 };
 
@@ -58,65 +79,87 @@ export const decode = (
 ): string | number | boolean | null | (string | number | null | boolean)[] => {
   if (!fieldType) return null;
   const unSecureString = (input: string) =>
-    decodeURIComponent(input)
-      .replaceAll("&lt;", "<")
-      .replaceAll("&gt;", ">")
-      .replaceAll("%2C", ",")
-      .replaceAll("%7C", "|")
-      .replaceAll("\\n", "\n")
-      .replaceAll("\\r", "\r") || null;
+      decodeURIComponent(input)
+        .replaceAll("&lt;", "<")
+        .replaceAll("&gt;", ">")
+        .replaceAll("%2C", ",")
+        .replaceAll("%7C", "|")
+        .replaceAll("%26", "&")
+        .replaceAll("%24", "$")
+        .replaceAll("%23", "#")
+        .replaceAll("%40", "@")
+        .replaceAll("%5E", "^")
+        .replaceAll("%25", "%")
+        .replaceAll("%3A", ":")
+        .replaceAll("%21", "!")
+        .replaceAll("%3B", ";")
+        .replaceAll("\\n", "\n")
+        .replaceAll("\\r", "\r") || null,
+    unSecureArray = (arr_str: any[] | any): any[] | any =>
+      Array.isArray(arr_str)
+        ? arr_str.map(unSecureArray)
+        : unSecureString(arr_str),
+    reverseJoinMultidimensionalArray = (
+      joinedString: string | any[] | any[][]
+    ): any | any[] | any[][] => {
+      const reverseJoinMultidimensionalArrayHelper = (
+        arr: any | any[] | any[][],
+        delimiter: string
+      ) =>
+        Array.isArray(arr)
+          ? arr.map((ar: any) =>
+              reverseJoinMultidimensionalArrayHelper(ar, delimiter)
+            )
+          : arr.split(delimiter);
+
+      const availableDelimiters = delimiters.filter((delimiter) =>
+        joinedString.includes(delimiter)
+      );
+      for (const delimiter of availableDelimiters) {
+        joinedString = Array.isArray(joinedString)
+          ? reverseJoinMultidimensionalArrayHelper(joinedString, delimiter)
+          : joinedString.split(delimiter);
+      }
+      return joinedString;
+    },
+    decodeHelper = (value: string | number | any[]) => {
+      if (Array.isArray(value) && fieldType !== "array")
+        return value.map(decodeHelper);
+      switch (fieldType as 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 value.map(
+              (v) =>
+                decode(
+                  v,
+                  Array.isArray(fieldChildrenType)
+                    ? detectFieldType(v, fieldChildrenType)
+                    : fieldChildrenType,
+                  undefined,
+                  secretKey
+                ) as string | number | boolean | null
+            );
+          else return value;
+        case "id":
+          return isNumber(value) ? encodeID(value as number, secretKey) : value;
+        default:
+          return value;
+      }
+    };
   if (input === null || input === "") return null;
   if (Array.isArray(fieldType))
     fieldType = detectFieldType(String(input), fieldType);
-  const decodeHelper = (value: string | number | any[]) => {
-    if (Array.isArray(value) && fieldType !== "array")
-      return value.map(decodeHelper);
-    switch (fieldType as 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 value.map(
-            (v) =>
-              decode(
-                v,
-                Array.isArray(fieldChildrenType)
-                  ? detectFieldType(v, fieldChildrenType)
-                  : fieldChildrenType,
-                undefined,
-                secretKey
-              ) as string | number | boolean | null
-          );
-        else return value;
-      case "id":
-        return isNumber(value) ? encodeID(value as number, secretKey) : value;
-      default:
-        return value;
-    }
-  };
   return decodeHelper(
     typeof input === "string"
       ? input.includes(",")
-        ? input.includes("|")
-          ? input
-              .split("|")
-              .map((_input) => _input.split(",").map(unSecureString))
-          : input.split(",").map(unSecureString)
-        : input.includes("|")
-        ? input
-            .split("|")
-            .map((_input) => [
-              _input
-                ? fieldType === "array"
-                  ? [unSecureString(_input)]
-                  : unSecureString(_input)
-                : null,
-            ])
+        ? unSecureArray(reverseJoinMultidimensionalArray(input))
         : unSecureString(input)
       : input
   );

package/index.test.ts

@@ -1,3 +1,4 @@
+import { decode } from "./file";
 import Inibase, { Schema, Data } from "./index";
 import { join } from "node:path";
 // import os from "os";
@@ -197,9 +198,49 @@ const data_2 = [
 try {
   // db.setTableSchema("database", schema_2);
   // const DATA = await db.post("database", data_2);
-  const DATA = await db.get("user", {
-    or: { username: "admin", email: "demo" },
-  });
+  // const DATA = await db.delete("database", 2);
+  // const DATA = await db.post("database", {
+  //   slug: "demo",
+  //   tables: [
+  //     {
+  //       id: 1,
+  //       slug: "user",
+  //       allowed_methods: [
+  //         {
+  //           role: "user",
+  //           methods: ["c", "r", "u"],
+  //         },
+  //         {
+  //           role: "guest",
+  //           methods: ["c"],
+  //         },
+  //         {
+  //           role: "admin",
+  //           methods: ["d", "u"],
+  //         },
+  //       ],
+  //     },
+  //     {
+  //       id: 1,
+  //       slug: "user",
+  //       allowed_methods: [
+  //         {
+  //           role: "user",
+  //           methods: ["c", "r", "u"],
+  //         },
+  //         {
+  //           role: "guest",
+  //           methods: ["c"],
+  //         },
+  //         {
+  //           role: "admin",
+  //           methods: ["d", "u"],
+  //         },
+  //       ],
+  //     },
+  //   ],
+  // });
+  const DATA = await db.get("database");
   console.log(JSON.stringify(DATA, null, 4));
 } catch (er) {
   console.log(er);

package/index.ts

@@ -609,12 +609,13 @@ export default class Inibase {
                   (prefix ?? "") + key + "."
                 )
               );
-            else
+            else {
               RETURN[(prefix ?? "") + key] = File.encode(value) as
                 | boolean
                 | number
                 | string
                 | null;
+            }
           } else
             RETURN[(prefix ?? "") + key] = File.encode(value) as
               | boolean
@@ -635,6 +636,20 @@ export default class Inibase {
     return addPathToKeys(CombineData(data), mainPath);
   }
 
+  public async getOne(
+    tableName: string,
+    where?: string | number | (string | number)[] | Criteria,
+    options: Options = {
+      page: 1,
+      per_page: 15,
+    }
+  ): Promise<Data | null> {
+    const _get = await this.get(tableName, where, options);
+    if (!_get) return null;
+    else if (Array.isArray(_get)) return (_get as Data)[0];
+    else return _get;
+  }
+
   public async get(
     tableName: string,
     where?: string | number | (string | number)[] | Criteria,
@@ -1269,7 +1284,7 @@ export default class Inibase {
     let last_id = (await File.isExists(idFilePath))
       ? Number(
           Object.values(
-            await File.get(idFilePath, -1, "number", undefined, this.salt)
+            (await File.get(idFilePath, -1, "number", undefined, this.salt))[0]
           )[0]
         )
       : 0;
@@ -1289,6 +1304,7 @@ export default class Inibase {
         created_at: new Date(),
       }))(data as Data);
     if (!RETURN) throw this.throwError("NO_DATA");
+
     RETURN = this.formatData(RETURN, schema);
     const pathesContents = this.joinPathesContents(
       join(this.folder, this.database, tableName),
@@ -1463,16 +1479,16 @@ export default class Inibase {
       if (files.length) {
         if (!_id)
           _id = Object.values(
-            await File.get(
-              join(this.folder, this.database, tableName, "id.inib"),
-              where as number | number[],
-              "number",
-              undefined,
-              this.salt
-            )
-          )
-            .map(Number)
-            .map((id) => UtilsServer.encodeID(id, this.salt));
+            (
+              await File.get(
+                join(this.folder, this.database, tableName, "id.inib"),
+                where as number | number[],
+                "number",
+                undefined,
+                this.salt
+              )
+            )[0]
+          ).map((id) => UtilsServer.encodeID(Number(id), this.salt));
         for (const file of files.filter(
           (fileName: string) =>
             fileName.endsWith(".inib") && fileName !== "schema"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "description": "File-based Relational Database for large data",
   "main": "index.ts",
   "type": "module",