inibase 1.0.0-rc.8 → 1.0.0-rc.9

package/README.md

@@ -31,7 +31,7 @@ const users = await db.get("user", undefined, { page: 2, per_page: 15 });
 
 // Get only required columns to improve speed
 const users = await db.get("user", undefined, {
-  columns: ["username", "address.street", "hobbies.*.name"],
+  columns: ["username", "address.street", "hobbies.name"],
 });
 
 // Get items from "user" table where "favoriteFoods" does not includes "Pizza"

package/file.ts

@@ -19,16 +19,6 @@ export const isExists = async (path: string) => {
     return false;
   }
 };
-export const encodeFileName = (fileName: string, extension?: string) => {
-  return (
-    fileName.replaceAll("%", "%25").replaceAll("*", "%") +
-    (extension ? `.${extension}` : "")
-  );
-};
-
-export const decodeFileName = (fileName: string) => {
-  return fileName.replaceAll("%", "*").replaceAll("*25", "%");
-};
 
 export const encode = (
   input:
@@ -377,10 +367,6 @@ export const search = async (
               : false;
           case "boolean":
             return Number(originalValue) - Number(comparedAtValue) === 0;
-          case "id":
-            return secretKey && typeof comparedAtValue === "string"
-              ? decodeID(comparedAtValue as string, secretKey) === originalValue
-              : comparedAtValue === originalValue;
           default:
             return originalValue === comparedAtValue;
         }
@@ -455,7 +441,7 @@ export const search = async (
       crlfDelay: Infinity,
     });
 
-  const columnName = decodeFileName(parse(filePath).name);
+  const columnName = parse(filePath).name;
 
   for await (const line of rl) {
     lineCount++;
@@ -511,7 +497,5 @@ export default class File {
   static count = count;
   static encode = encode;
   static decode = decode;
-  static encodeFileName = encodeFileName;
-  static decodeFileName = decodeFileName;
   static isExists = isExists;
 }

package/index.ts

@@ -266,14 +266,12 @@ export default class Inibase {
                 RETURN,
                 schemaToIdsPath(
                   field.children,
-                  (prefix ?? "") +
-                    field.key +
-                    (field.type === "array" ? ".*." : ".")
+                  (prefix ?? "") + field.key + "."
                 )
               );
             } else if (Utils.isValidID(field.id))
               RETURN[UtilsServer.decodeID(field.id, this.salt)] =
-                File.encodeFileName((prefix ?? "") + field.key, "inib");
+                (prefix ?? "") + field.key + ".inib";
 
           return RETURN;
         },
@@ -597,7 +595,7 @@ export default class Inibase {
                 RETURN,
                 CombineData(
                   combineObjectsToArray(value),
-                  (prefix ?? "") + key + ".*."
+                  (prefix ?? "") + key + "."
                 )
               );
             } else if (
@@ -608,7 +606,7 @@ export default class Inibase {
                 RETURN,
                 CombineData(
                   combineObjectsToArray(value.map(combineObjectsToArray)),
-                  (prefix ?? "") + key + ".*."
+                  (prefix ?? "") + key + "."
                 )
               );
             else
@@ -630,8 +628,7 @@ export default class Inibase {
     const addPathToKeys = (obj: Record<string, any>, path: string) => {
       const newObject: Record<string, any> = {};
 
-      for (const key in obj)
-        newObject[join(path, File.encodeFileName(key, "inib"))] = obj[key];
+      for (const key in obj) newObject[join(path, key + ".inib")] = obj[key];
 
       return newObject;
     };
@@ -740,7 +737,7 @@ export default class Inibase {
                       Utils.isArrayOfObjects(children.children)
                   ),
                   linesNumber,
-                  (prefix ?? "") + field.key + ".*."
+                  (prefix ?? "") + field.key + "."
                 )) ?? {}
               ).forEach(([index, item]) => {
                 if (Utils.isObject(item)) {
@@ -802,7 +799,7 @@ export default class Inibase {
                 (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
                   .children as Schema,
                 linesNumber,
-                (prefix ?? "") + field.key + ".*."
+                (prefix ?? "") + field.key + "."
               )) ?? {}
             ).forEach(([index, item]) => {
               if (!RETURN[index]) RETURN[index] = {};
@@ -843,13 +840,10 @@ export default class Inibase {
           ) {
             if (options.columns)
               options.columns = (options.columns as string[])
-                .filter((column) => column.includes(`${field.key}.*.`))
-                .map((column) => column.replace(`${field.key}.*.`, ""));
+                .filter((column) => column.includes(`${field.key}.`))
+                .map((column) => column.replace(`${field.key}.`, ""));
             const [items, total_lines] = await File.get(
-              join(
-                path,
-                File.encodeFileName((prefix ?? "") + field.key, "inib")
-              ),
+              join(path, (prefix ?? "") + field.key + ".inib"),
               linesNumber,
               field.type,
               (field as FieldDefault & (FieldArrayType | FieldArrayArrayType))
@@ -866,17 +860,11 @@ export default class Inibase {
             }
           } else if (
             await File.isExists(
-              join(
-                path,
-                File.encodeFileName((prefix ?? "") + field.key, "inib")
-              )
+              join(path, (prefix ?? "") + field.key + ".inib")
             )
           ) {
             const [items, total_lines] = await File.get(
-              join(
-                path,
-                File.encodeFileName((prefix ?? "") + field.key, "inib")
-              ),
+              join(path, (prefix ?? "") + field.key + ".inib"),
               linesNumber,
               field.type,
               (field as any)?.children,
@@ -911,10 +899,7 @@ export default class Inibase {
               join(this.folder, this.database, field.key)
             )) &&
             (await File.isExists(
-              join(
-                path,
-                File.encodeFileName((prefix ?? "") + field.key, "inib")
-              )
+              join(path, (prefix ?? "") + field.key + ".inib")
             ))
           ) {
             if (options.columns)
@@ -922,14 +907,11 @@ export default class Inibase {
                 .filter(
                   (column) =>
                     column.includes(`${field.key}.`) &&
-                    !column.includes(`${field.key}.*.`)
+                    !column.includes(`${field.key}.`)
                 )
                 .map((column) => column.replace(`${field.key}.`, ""));
             const [items, total_lines] = await File.get(
-              join(
-                path,
-                File.encodeFileName((prefix ?? "") + field.key, "inib")
-              ),
+              join(path, (prefix ?? "") + field.key + ".inib"),
               linesNumber,
               "number",
               undefined,
@@ -944,12 +926,10 @@ export default class Inibase {
             }
           }
         } else if (
-          await File.isExists(
-            join(path, File.encodeFileName((prefix ?? "") + field.key, "inib"))
-          )
+          await File.isExists(join(path, (prefix ?? "") + field.key + ".inib"))
         ) {
           const [items, total_lines] = await File.get(
-            join(path, File.encodeFileName((prefix ?? "") + field.key, "inib")),
+            join(path, (prefix ?? "") + field.key + ".inib"),
             linesNumber,
             field.type,
             (field as any)?.children,
@@ -1198,12 +1178,7 @@ export default class Inibase {
               searchComparedAtValue = value as number | boolean;
             }
             const [searchResult, total_lines] = await File.search(
-              join(
-                this.folder,
-                this.database,
-                tableName,
-                File.encodeFileName(key, "inib")
-              ),
+              join(this.folder, this.database, tableName, key + ".inib"),
               searchOperator,
               searchComparedAtValue,
               searchLogicalOperator,
@@ -1231,11 +1206,12 @@ export default class Inibase {
         }
         return Object.keys(RETURN).length ? RETURN : null;
       };
+
       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(
-          (key) => File.decodeFileName(parse(key).name)
+          (key) => parse(key).name
         );
         RETURN = Object.values(
           Utils.deepMerge(

package/package.json

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