repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups uneeded encapsulating methods
[e-mobility-charging-stations-simulator.git]
/
src
/
utils
/
Utils.ts
diff --git
a/src/utils/Utils.ts
b/src/utils/Utils.ts
index 2dff293af5f31479f5c8fde2f6cc43b3b84dc346..f174407500db95556d6d1c04fb0b4c95355923b7 100644
(file)
--- a/
src/utils/Utils.ts
+++ b/
src/utils/Utils.ts
@@
-1,6
+1,6
@@
import crypto from 'crypto';
import crypto from 'crypto';
-import
{ v4 as uuid } from 'uuid
';
+import
clone from 'just-clone
';
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
@@
-14,7
+14,13
@@
export default class Utils {
}
public static generateUUID(): string {
}
public static generateUUID(): string {
- return uuid();
+ return crypto.randomUUID();
+ }
+
+ public static validateUUID(uuid: string): boolean {
+ 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> {
}
public static async sleep(milliSeconds: number): Promise<NodeJS.Timeout> {
@@
-46,42
+52,42
@@
export default class Utils {
return Utils.formatDurationMilliSeconds(duration * 1000);
}
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;
+ }
+ if (value instanceof Date) {
+ return value;
}
}
- // Check Type
- if (!(value instanceof Date)) {
- return new Date(value as string);
+ if (Utils.isString(value) || typeof value === 'number') {
+ return new Date(value as string | number);
}
}
- return
value
;
+ return
null
;
}
public static convertToInt(value: unknown): number {
}
public static convertToInt(value: unknown): number {
- let changedValue: number = value as number;
if (!value) {
return 0;
}
if (!value) {
return 0;
}
+ let changedValue: number = value as number;
if (Number.isSafeInteger(value)) {
return value as number;
}
if (Number.isSafeInteger(value)) {
return value as number;
}
- // Check
+ if (typeof value === 'number') {
+ changedValue = Math.trunc(value);
+ }
if (Utils.isString(value)) {
if (Utils.isString(value)) {
- // Create Object
changedValue = parseInt(value as string);
}
return changedValue;
}
public static convertToFloat(value: unknown): number {
changedValue = parseInt(value as string);
}
return changedValue;
}
public static convertToFloat(value: unknown): number {
- let changedValue: number = value as number;
if (!value) {
return 0;
}
if (!value) {
return 0;
}
- // Check
+ let changedValue: number = value as number;
if (Utils.isString(value)) {
if (Utils.isString(value)) {
- // Create Object
changedValue = parseFloat(value as string);
}
return changedValue;
changedValue = parseFloat(value as string);
}
return changedValue;
@@
-89,22
+95,24
@@
export default class Utils {
public static convertToBoolean(value: unknown): boolean {
let result = false;
public static convertToBoolean(value: unknown): boolean {
let result = false;
- // Check boolean
if (value) {
// Check the type
if (typeof value === 'boolean') {
if (value) {
// Check the type
if (typeof value === 'boolean') {
- // Already a boolean
result = value;
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;
}
}
}
return result;
}
- public static getRandomFloat(max
: number
, min = 0, negative = false): number {
- if (max < min || m
in < 0 || max
< 0) {
+ public static getRandomFloat(max
= Number.MAX_VALUE
, min = 0, negative = false): number {
+ if (max < min || m
ax < 0 || min
< 0) {
throw new RangeError('Invalid interval');
}
const randomPositiveFloat = crypto.randomBytes(4).readUInt32LE() / 0xffffffff;
throw new RangeError('Invalid interval');
}
const randomPositiveFloat = crypto.randomBytes(4).readUInt32LE() / 0xffffffff;
@@
-112,15
+120,12
@@
export default class Utils {
return sign * (randomPositiveFloat * (max - min) + min);
}
return sign * (randomPositiveFloat * (max - min) + min);
}
- public static getRandomInteger(max
: number
, min = 0): number {
- if (max < 0) {
+ public static getRandomInteger(max
= Number.MAX_SAFE_INTEGER
, min = 0): number {
+ if (max <
min || max < 0 || min <
0) {
throw new RangeError('Invalid interval');
}
max = Math.floor(max);
throw new RangeError('Invalid interval');
}
max = Math.floor(max);
- if (min) {
- if (max < min || min < 0) {
- throw new RangeError('Invalid interval');
- }
+ if (!Utils.isNullOrUndefined(min) && min !== 0) {
min = Math.ceil(min);
return Math.floor(Utils.secureRandom() * (max - min + 1)) + min;
}
min = Math.ceil(min);
return Math.floor(Utils.secureRandom() * (max - min + 1)) + min;
}
@@
-137,7
+142,7
@@
export default class Utils {
return Math.trunc(numberValue * truncPower) / truncPower;
}
return Math.trunc(numberValue * truncPower) / truncPower;
}
- public static getRandomFloatRounded(max
: number
, min = 0, scale = 2): number {
+ public static getRandomFloatRounded(max
= Number.MAX_VALUE
, min = 0, scale = 2): number {
if (min) {
return Utils.roundTo(Utils.getRandomFloat(max, min), scale);
}
if (min) {
return Utils.roundTo(Utils.getRandomFloat(max, min), scale);
}
@@
-160,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 {
}
public static isIterable<T>(obj: T): boolean {
@@
-173,7
+182,7
@@
export default class Utils {
}
public static isEmptyString(value: unknown): boolean {
}
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 {
}
public static isUndefined(value: unknown): boolean {
@@
-185,18
+194,26
@@
export default class Utils {
return value == null ? true : false;
}
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;
}
return true;
}
- if (
Array.isArray(object) &&
object.length > 0) {
+ if (object.length > 0) {
return false;
}
return true;
}
public static isEmptyObject(obj: object): boolean {
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 =>
}
public static insertAt = (str: string, subStr: string, pos: number): string =>