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 e2afc28a6412631c8d4cecb49d52991c228ccc06..f174407500db95556d6d1c04fb0b4c95355923b7 100644
(file)
--- a/
src/utils/Utils.ts
+++ b/
src/utils/Utils.ts
@@
-1,5
+1,7
@@
import crypto from 'crypto';
import crypto from 'crypto';
+import clone from 'just-clone';
+
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
export default class Utils {
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
export default class Utils {
@@
-50,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;
@@
-93,15
+95,17
@@
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;
@@
-161,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 {