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

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.5",
   "description": "File-based Relational Database for large data",
   "main": "index.ts",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/inicontent/inibase.git"
@@ -32,6 +33,6 @@
     "@types/node": "^20.6.0"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "npx tsx watch ./index.test.ts"
   }
 }

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ES2021",
+    "module": "ES2022",
+    "target": "ES2022",
     "moduleResolution": "node"
   }
 }

package/utils.ts

@@ -1,49 +1,18 @@
+import {
+  scryptSync,
+  randomBytes,
+  timingSafeEqual,
+  createDecipheriv,
+  createCipheriv,
+} from "crypto";
 import { FieldType } from ".";
-import { scryptSync, randomBytes, timingSafeEqual } from "crypto";
-
-export const encode = (
-  input: string | number | boolean | null | (string | number | boolean | null)[]
-) => {
-  const secureString = (input: string | number | boolean | null) => {
-    if (["true", "false"].includes((input ?? "").toString()))
-      return input ? 1 : 0;
-    return typeof input === "string"
-      ? decodeURIComponent(input)
-          .replaceAll("<", "&lt;")
-          .replaceAll(">", "&gt;")
-          .replaceAll(",", "%2C")
-          .replaceAll("\n", "\\n")
-          .replaceAll("\r", "\\r")
-      : input;
-  };
-  return Array.isArray(input)
-    ? input.map(secureString).join(",")
-    : secureString(input);
-};
-
-export const decode = (
-  input: string | null | number,
-  fieldType?: FieldType
-): string | number | boolean | null | (string | number | null | boolean)[] => {
-  const unSecureString = (input: string) =>
-    decodeURIComponent(input)
-      .replaceAll("&lt;", "<")
-      .replaceAll("&gt;", ">")
-      .replaceAll("%2C", ",")
-      .replaceAll("\\n", "\n")
-      .replaceAll("\\r", "\r") || null;
-
-  if (input === null || input === "") return null;
-  if (!isNaN(Number(input)) && isFinite(Number(input)))
-    return fieldType === "boolean" ? Boolean(Number(input)) : Number(input);
-  return (input as string).includes(",")
-    ? (input as string).split(",").map(unSecureString)
-    : unSecureString(input as string);
-};
 
 export const isArrayOfObjects = (arr: any) => {
   return Array.isArray(arr) && (arr.length === 0 || arr.every(isObject));
 };
+export const isArrayOfArrays = (arr: any) => {
+  return Array.isArray(arr) && (arr.length === 0 || arr.every(Array.isArray));
+};
 
 export const isObject = (obj: any) =>
   obj != null &&
@@ -76,6 +45,20 @@ export const isNumber = (input: any): boolean =>
     ? input.every(isNumber)
     : !isNaN(parseFloat(input)) && !isNaN(input - 0);
 
+export const isEmail = (input: any) =>
+  /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(String(input));
+
+export const isURL = (input: any) =>
+  input[0] === "#" ||
+  /^((https?|www):\/\/)?[a-z0-9-]+(\.[a-z0-9-]+)*\.[a-z]+(\/[^\s]*)?$/.test(
+    input
+  );
+
+export const isPassword = (input: any) => input.length === 161;
+
+export const isDate = (input: any) =>
+  !isNaN(Date.parse(String(input))) && Date.parse(String(input)) >= 0;
+
 export const hashPassword = (password: string) => {
   const salt = randomBytes(16).toString("hex");
   const buf = scryptSync(password, salt, 64);
@@ -97,14 +80,86 @@ export const comparePassword = (
   return timingSafeEqual(hashedPasswordBuf, suppliedPasswordBuf);
 };
 
+export const encodeID = (id: number, secretKey: string | number): string => {
+  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");
+};
+
+export const decodeID = (input: string, secretKey: string | number): number => {
+  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")
+  );
+};
+
+export const isValidID = (input: any): boolean => {
+  return Array.isArray(input)
+    ? input.every(isValidID)
+    : typeof input === "string" && input.length === 32;
+};
+
+export const findChangedProperties = (
+  obj1: Record<string, string>,
+  obj2: Record<string, string>
+): Record<string, string> | null => {
+  const result: Record<string, string> = {};
+
+  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;
+};
+
+export const detectFieldType = (
+  input: any,
+  availableTypes: FieldType[]
+): FieldType | undefined => {
+  if (
+    (input === "0" || input === "1" || input === "true" || input === "false") &&
+    availableTypes.includes("boolean")
+  )
+    return "boolean";
+  else if (Utils.isNumber(input)) {
+    if (availableTypes.includes("table")) return "table";
+    else if (availableTypes.includes("number")) return "number";
+    else if (availableTypes.includes("date")) return "date";
+  } else if (
+    (Array.isArray(input) || input.includes(",")) &&
+    availableTypes.includes("array")
+  )
+    return "array";
+  else if (Utils.isEmail(input) && availableTypes.includes("email"))
+    return "email";
+  else if (Utils.isURL(input) && availableTypes.includes("url")) return "url";
+  else if (Utils.isPassword(input) && availableTypes.includes("password"))
+    return "password";
+  else if (Utils.isDate(input) && availableTypes.includes("date"))
+    return "date";
+  else if (!Utils.isNumber(input) && availableTypes.includes("string"))
+    return "string";
+  else return undefined;
+};
+
 export default class Utils {
-  static encode = encode;
-  static decode = decode;
+  static encodeID = encodeID;
+  static decodeID = decodeID;
   static isNumber = isNumber;
   static isObject = isObject;
-  static deepMerge = deepMerge;
+  static isEmail = isEmail;
+  static isDate = isDate;
+  static isURL = isURL;
+  static isValidID = isValidID;
+  static isPassword = isPassword;
   static hashPassword = hashPassword;
+  static deepMerge = deepMerge;
   static combineObjects = combineObjects;
   static comparePassword = comparePassword;
   static isArrayOfObjects = isArrayOfObjects;
+  static findChangedProperties = findChangedProperties;
+  static detectFieldType = detectFieldType;
+  static isArrayOfArrays = isArrayOfArrays;
 }