inibase 1.0.0-rc.6 → 1.0.0-rc.8

package/README.md

@@ -8,7 +8,7 @@
 
 ## Features
 
-- **Lightweight** 🪶 (~60kb)
+- **Lightweight** 🪶 (~80kb)
 - **Minimalist** :white_circle:
 - **TypeScript** :large_blue_diamond:
 - **Super-Fast** :turtle:
@@ -385,60 +385,6 @@ await db.put("user", { isActive: false });
 
 </details>
 
-## Typescript
-
-<details>
-<summary>Schema</summary>
-
-```js
-type Schema = Field[];
-type Field = {
-  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 FieldType =
-  | "string"
-  | "number"
-  | "boolean"
-  | "date"
-  | "email"
-  | "url"
-  | "table"
-  | "object"
-  | "array"
-  | "password";
-```
-
-</details>
-
-<details>
-<summary>Data</summary>
-
-```js
-type Data = {
-  id?: number | string,
-  [key: string]: any,
-  created_at?: Date,
-  updated_at?: Date,
-};
-```
-
-</details>
-
 ## Roadmap
 
 - [x] Actions:

package/file.ts

@@ -3,7 +3,8 @@ import { open, unlink, rename, stat } from "node:fs/promises";
 import { Interface, createInterface } from "node:readline";
 import { parse } from "node:path";
 import { ComparisonOperator, FieldType } from ".";
-import Utils from "./utils";
+import { detectFieldType, isArrayOfArrays, isNumber } from "./utils";
+import { encodeID, decodeID, comparePassword } from "./utils.server";
 
 const doesSupportReadLines = () => {
   const [major, minor, patch] = process.versions.node.split(".").map(Number);
@@ -30,7 +31,13 @@ export const decodeFileName = (fileName: string) => {
 };
 
 export const encode = (
-  input: string | number | boolean | null | (string | number | boolean | null)[]
+  input:
+    | string
+    | number
+    | boolean
+    | null
+    | (string | number | boolean | null)[],
+  secretKey?: string | Buffer
 ) => {
   const secureString = (input: string | number | boolean | null) => {
     if (["true", "false"].includes(String(input))) return input ? 1 : 0;
@@ -45,7 +52,7 @@ export const encode = (
       : input;
   };
   return Array.isArray(input)
-    ? Utils.isArrayOfArrays(input)
+    ? isArrayOfArrays(input)
       ? (input as any[])
           .map((_input) => _input.map(secureString).join(","))
           .join("|")
@@ -56,7 +63,8 @@ export const encode = (
 export const decode = (
   input: string | null | number,
   fieldType?: FieldType | FieldType[],
-  fieldChildrenType?: FieldType | FieldType[]
+  fieldChildrenType?: FieldType | FieldType[],
+  secretKey?: string | Buffer
 ): string | number | boolean | null | (string | number | null | boolean)[] => {
   if (!fieldType) return null;
   const unSecureString = (input: string) =>
@@ -69,29 +77,34 @@ export const decode = (
       .replaceAll("\\r", "\r") || null;
   if (input === null || input === "") return null;
   if (Array.isArray(fieldType))
-    fieldType = Utils.detectFieldType(String(input), 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 isNaN(Number(value)) ? null : Number(value);
+        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)
-                  ? Utils.detectFieldType(v, fieldChildrenType)
-                  : 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;
     }
@@ -104,6 +117,16 @@ export const decode = (
               .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,
+            ])
         : unSecureString(input)
       : input
   );
@@ -113,8 +136,20 @@ export const get = async (
   filePath: string,
   lineNumbers?: number | number[],
   fieldType?: FieldType | FieldType[],
-  fieldChildrenType?: FieldType | FieldType[]
-) => {
+  fieldChildrenType?: FieldType | FieldType[],
+  secretKey?: string | Buffer
+): Promise<
+  [
+    Record<
+      number,
+      | string
+      | number
+      | boolean
+      | (string | number | boolean | (string | number | boolean)[])[]
+    > | null,
+    number
+  ]
+> => {
   let rl: Interface;
   if (doesSupportReadLines()) rl = (await open(filePath)).readLines();
   else
@@ -135,12 +170,19 @@ export const get = async (
   if (!lineNumbers) {
     for await (const line of rl)
       lineCount++,
-        (lines[lineCount] = decode(line, fieldType, fieldChildrenType));
+        (lines[lineCount] = decode(
+          line,
+          fieldType,
+          fieldChildrenType,
+          secretKey
+        ));
   } else if (lineNumbers === -1) {
     let lastLine: string;
     for await (const line of rl) lineCount++, (lastLine = line);
     if (lastLine)
-      lines = { [lineCount]: decode(lastLine, fieldType, fieldChildrenType) };
+      lines = {
+        [lineCount]: decode(lastLine, fieldType, fieldChildrenType, secretKey),
+      };
   } else {
     let lineNumbersArray = [
       ...(Array.isArray(lineNumbers) ? lineNumbers : [lineNumbers]),
@@ -149,13 +191,13 @@ export const get = async (
       lineCount++;
       if (!lineNumbersArray.includes(lineCount)) continue;
       const indexOfLineCount = lineNumbersArray.indexOf(lineCount);
-      lines[lineCount] = decode(line, fieldType, fieldChildrenType);
+      lines[lineCount] = decode(line, fieldType, fieldChildrenType, secretKey);
       lineNumbersArray[indexOfLineCount] = 0;
       if (!lineNumbersArray.filter((lineN) => lineN !== 0).length) break;
     }
   }
 
-  return lines ?? null;
+  return [lines ?? null, lineCount];
 };
 
 export const replace = async (
@@ -169,7 +211,8 @@ export const replace = async (
     | Record<
         number,
         string | boolean | number | null | (string | boolean | number | null)[]
-      >
+      >,
+  secretKey?: string | Buffer
 ) => {
   if (await isExists(filePath)) {
     let rl: Interface, writeStream: WriteStream;
@@ -189,13 +232,14 @@ export const replace = async (
       for await (const line of rl) {
         lineCount++;
         writeStream.write(
-          (lineCount in replacements ? encode(replacements[lineCount]) : line) +
-            "\n"
+          (lineCount in replacements
+            ? encode(replacements[lineCount], secretKey)
+            : line) + "\n"
         );
       }
     } else
       for await (const _line of rl)
-        writeStream.write(encode(replacements) + "\n");
+        writeStream.write(encode(replacements, secretKey) + "\n");
 
     writeStream.end();
   } else if (typeof replacements === "object" && !Array.isArray(replacements)) {
@@ -207,8 +251,9 @@ export const replace = async (
       Math.max(...Object.keys(replacements).map(Number)) + 1;
     for (let lineCount = 1; lineCount < largestLinesNumbers; lineCount++) {
       writeStream.write(
-        (lineCount in replacements ? encode(replacements[lineCount]) : "") +
-          "\n"
+        (lineCount in replacements
+          ? encode(replacements[lineCount], secretKey)
+          : "") + "\n"
       );
     }
     writeStream.end();
@@ -280,7 +325,7 @@ export const search = async (
   limit?: number,
   offset?: number,
   readWholeFile?: boolean,
-  secretKey?: string
+  secretKey?: string | Buffer
 ): Promise<
   [
     Record<
@@ -311,7 +356,7 @@ export const search = async (
     fieldChildrenType?: FieldType | FieldType[]
   ): boolean => {
     if (Array.isArray(fieldType))
-      fieldType = Utils.detectFieldType(String(originalValue), fieldType);
+      fieldType = detectFieldType(String(originalValue), fieldType);
     if (Array.isArray(comparedAtValue) && !["[]", "![]"].includes(operator))
       return comparedAtValue.some((comparedAtValueSingle) =>
         handleComparisonOperator(
@@ -328,14 +373,13 @@ export const search = async (
           case "password":
             return typeof originalValue === "string" &&
               typeof comparedAtValue === "string"
-              ? Utils.comparePassword(originalValue, comparedAtValue)
+              ? comparePassword(originalValue, comparedAtValue)
               : false;
           case "boolean":
             return Number(originalValue) - Number(comparedAtValue) === 0;
           case "id":
             return secretKey && typeof comparedAtValue === "string"
-              ? Utils.decodeID(comparedAtValue as string, secretKey) ===
-                  originalValue
+              ? decodeID(comparedAtValue as string, secretKey) === originalValue
               : comparedAtValue === originalValue;
           default:
             return originalValue === comparedAtValue;
@@ -415,7 +459,7 @@ export const search = async (
 
   for await (const line of rl) {
     lineCount++;
-    const decodedLine = decode(line, fieldType, fieldChildrenType);
+    const decodedLine = decode(line, fieldType, fieldChildrenType, secretKey);
     if (
       (Array.isArray(operator) &&
         Array.isArray(comparedAtValue) &&

package/index.test.ts

@@ -197,8 +197,14 @@ const data_2 = [
 try {
   // db.setTableSchema("database", schema_2);
   // const DATA = await db.post("database", data_2);
-  const DATA = await db.get("database", "4f928b04e660de92dc904580055dbe23");
-  console.log(JSON.stringify(DATA, null, 4));
+  const DATA = await db.get("database", 1);
+  console.log(
+    JSON.stringify(
+      (DATA as Data).tables.find((table: any) => table.slug === "session"),
+      null,
+      4
+    )
+  );
 } catch (er) {
   console.log(er);
 }