X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FUtils.ts;h=08e87320ce2c83f9ab563c46e53ec01718723cb1;hb=c60af6ca67ad2599e7e3e886f219da6323ead61b;hp=e8e658d1c07ec57522a37e718822e54a08da4af2;hpb=1f86b121076f7bed00f42e3f58c9f09166eda7ff;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index e8e658d1..08e87320 100644
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -1,5 +1,7 @@
 import crypto from 'crypto';
 
+import clone from 'just-clone';
+
 import { WebSocketCloseEventStatusString } from '../types/WebSocket';
 
 export default class Utils {
@@ -16,7 +18,9 @@ export default class Utils {
   }
 
   public static validateUUID(uuid: string): boolean {
-    return /\/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$\/i/.test(uuid);
+    return /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
+      uuid
+    );
   }
 
   public static async sleep(milliSeconds: number): Promise<NodeJS.Timeout> {
@@ -48,42 +52,42 @@ export default class Utils {
     return Utils.formatDurationMilliSeconds(duration * 1000);
   }
 
-  public static convertToDate(value: unknown): Date {
-    // Check
-    if (!value) {
-      return value as Date;
+  public static convertToDate(value: unknown): Date | null | undefined {
+    if (Utils.isNullOrUndefined(value)) {
+      return value as null | undefined;
     }
-    // Check Type
-    if (!(value instanceof Date)) {
-      return new Date(value as string);
+    if (value instanceof Date) {
+      return value;
     }
-    return value;
+    if (Utils.isString(value) || typeof value === 'number') {
+      return new Date(value as string | number);
+    }
+    return null;
   }
 
   public static convertToInt(value: unknown): number {
-    let changedValue: number = value as number;
     if (!value) {
       return 0;
     }
+    let changedValue: number = value as number;
     if (Number.isSafeInteger(value)) {
       return value as number;
     }
-    // Check
+    if (typeof value === 'number') {
+      changedValue = Math.trunc(value);
+    }
     if (Utils.isString(value)) {
-      // Create Object
       changedValue = parseInt(value as string);
     }
     return changedValue;
   }
 
   public static convertToFloat(value: unknown): number {
-    let changedValue: number = value as number;
     if (!value) {
       return 0;
     }
-    // Check
+    let changedValue: number = value as number;
     if (Utils.isString(value)) {
-      // Create Object
       changedValue = parseFloat(value as string);
     }
     return changedValue;
@@ -91,22 +95,24 @@ export default class Utils {
 
   public static convertToBoolean(value: unknown): boolean {
     let result = false;
-    // Check boolean
     if (value) {
       // Check the type
       if (typeof value === 'boolean') {
-        // Already a boolean
         result = value;
-      } else {
-        // Convert
-        result = value === 'true';
+      } else if (
+        Utils.isString(value) &&
+        ((value as string).toLowerCase() === 'true' || value === '1')
+      ) {
+        result = true;
+      } else if (typeof value === 'number' && value === 1) {
+        result = true;
       }
     }
     return result;
   }
 
   public static getRandomFloat(max = Number.MAX_VALUE, min = 0, negative = false): number {
-    if (max < min || min < 0 || max < 0) {
+    if (max < min || max < 0 || min < 0) {
       throw new RangeError('Invalid interval');
     }
     const randomPositiveFloat = crypto.randomBytes(4).readUInt32LE() / 0xffffffff;
@@ -115,14 +121,11 @@ export default class Utils {
   }
 
   public static getRandomInteger(max = Number.MAX_SAFE_INTEGER, min = 0): number {
-    if (max < 0) {
+    if (max < min || max < 0 || min < 0) {
       throw new RangeError('Invalid interval');
     }
     max = Math.floor(max);
     if (!Utils.isNullOrUndefined(min) && min !== 0) {
-      if (max < min || min < 0) {
-        throw new RangeError('Invalid interval');
-      }
       min = Math.ceil(min);
       return Math.floor(Utils.secureRandom() * (max - min + 1)) + min;
     }
@@ -162,8 +165,12 @@ export default class Utils {
     );
   }
 
-  public static cloneObject<T>(object: T): T {
-    return JSON.parse(JSON.stringify(object)) as T;
+  public static isObject(item: unknown): boolean {
+    return item && typeof item === 'object' && Array.isArray(item) === false;
+  }
+
+  public static cloneObject<T extends object>(object: T): T {
+    return clone<T>(object);
   }
 
   public static isIterable<T>(obj: T): boolean {
@@ -175,7 +182,7 @@ export default class Utils {
   }
 
   public static isEmptyString(value: unknown): boolean {
-    return Utils.isString(value) && (value as string).length === 0;
+    return Utils.isString(value) && (value as string).trim().length === 0;
   }
 
   public static isUndefined(value: unknown): boolean {
@@ -187,18 +194,26 @@ export default class Utils {
     return value == null ? true : false;
   }
 
-  public static isEmptyArray(object: unknown): boolean {
-    if (!object) {
+  public static isEmptyArray(object: unknown | unknown[]): boolean {
+    if (!Array.isArray(object)) {
       return true;
     }
-    if (Array.isArray(object) === true && (object as unknown[]).length > 0) {
+    if (object.length > 0) {
       return false;
     }
     return true;
   }
 
   public static isEmptyObject(obj: object): boolean {
-    return !Object.keys(obj).length;
+    if (obj?.constructor !== Object) {
+      return false;
+    }
+    // Iterates over the keys of an object, if
+    // any exist, return false.
+    for (const _ in obj) {
+      return false;
+    }
+    return true;
   }
 
   public static insertAt = (str: string, subStr: string, pos: number): string =>
@@ -244,7 +259,7 @@ export default class Utils {
   }
 
   public static JSONStringifyWithMapSupport(
-    obj: Record<string, unknown> | Record<string, unknown>[],
+    obj: Record<string, unknown> | Record<string, unknown>[] | Map<string, unknown>,
     space?: number
   ): string {
     return JSON.stringify(