inibase 1.0.0-rc.5 → 1.0.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.6",
   "description": "File-based Relational Database for large data",
   "main": "index.ts",
   "type": "module",
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/inicontent/inibase#readme",
   "devDependencies": {
-    "@types/node": "^20.6.0"
+    "@types/node": "^20.8.6"
   },
   "scripts": {
     "test": "npx tsx watch ./index.test.ts"

package/utils.ts

@@ -4,7 +4,9 @@ import {
   timingSafeEqual,
   createDecipheriv,
   createCipheriv,
-} from "crypto";
+  Cipher,
+  Decipher,
+} from "node:crypto";
 import { FieldType } from ".";
 
 export const isArrayOfObjects = (arr: any) => {
@@ -40,7 +42,7 @@ export const combineObjects = (objectArray: Record<string, any>[]) => {
   return combinedValues;
 };
 
-export const isNumber = (input: any): boolean =>
+export const isNumber = (input: any | any[]): boolean =>
   Array.isArray(input)
     ? input.every(isNumber)
     : !isNaN(parseFloat(input)) && !isNaN(input - 0);
@@ -48,11 +50,30 @@ export const isNumber = (input: any): boolean =>
 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 isURL = (input: any) => input[0] === "#" || URL.canParse(input);
+
+export const isHTML = (input: any) =>
+  /<\/?\s*[a-z-][^>]*\s*>|(\&(?:[\w\d]+|#\d+|#x[a-f\d]+);)/g.test(input);
+
+export const isString = (input: any) =>
+  Object.prototype.toString.call(input) === "[object String]" &&
+  !isNumber(input) &&
+  !isBoolean(input) &&
+  !isEmail(input) &&
+  !isDate(input) &&
+  !isURL(input) &&
+  !isIP(input) &&
+  !isHTML(input);
+
+export const isIP = (input: any) =>
+  /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/.test(input);
+
+export const isBoolean = (input: any) =>
+  typeof input === "boolean" ||
+  input === "true" ||
+  input === "false" ||
+  input === true ||
+  input === false;
 
 export const isPassword = (input: any) => input.length === 161;
 
@@ -80,16 +101,43 @@ export const comparePassword = (
   return timingSafeEqual(hashedPasswordBuf, suppliedPasswordBuf);
 };
 
-export const encodeID = (id: number, secretKey: string | number): string => {
-  const salt = scryptSync(secretKey.toString(), "salt", 32),
+export const encodeID = (
+  id: number,
+  secretKey: string | number | Buffer
+): string => {
+  let cipher: Cipher, ret: string;
+
+  if (Buffer.isBuffer(secretKey))
+    cipher = createCipheriv(
+      "aes-256-cbc",
+      secretKey,
+      secretKey.subarray(0, 16)
+    );
+  else {
+    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),
+export const decodeID = (
+  input: string,
+  secretKey: string | number | Buffer
+): number => {
+  let decipher: Decipher;
+
+  if (Buffer.isBuffer(secretKey))
+    decipher = createDecipheriv(
+      "aes-256-cbc",
+      secretKey,
+      secretKey.subarray(0, 16)
+    );
+  else {
+    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")
   );
@@ -118,30 +166,34 @@ 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;
+  if (!Array.isArray(input)) {
+    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("date")) return "date";
+      else if (availableTypes.includes("number")) return "number";
+    } else if (input.includes(",") && availableTypes.includes("array"))
+      return "array";
+    else if (availableTypes.includes("email") && Utils.isEmail(input))
+      return "email";
+    else if (availableTypes.includes("url") && Utils.isURL(input)) return "url";
+    else if (availableTypes.includes("password") && Utils.isPassword(input))
+      return "password";
+    else if (availableTypes.includes("date") && Utils.isDate(input))
+      return "date";
+    else if (availableTypes.includes("string") && Utils.isString(input))
+      return "string";
+    else if (availableTypes.includes("ip") && Utils.isIP(input)) return "ip";
+  } else return "array";
+
+  return undefined;
 };
 
 export default class Utils {
@@ -162,4 +214,8 @@ export default class Utils {
   static findChangedProperties = findChangedProperties;
   static detectFieldType = detectFieldType;
   static isArrayOfArrays = isArrayOfArrays;
+  static isBoolean = isBoolean;
+  static isString = isString;
+  static isHTML = isHTML;
+  static isIP = isIP;
 }