Convert Statistics interface to type

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index eb437ab08cf5e6e81baa1e8bf69499133200e456..85f8f371cf64ade08d7e40bd688cd972970a527e 100644 (file)
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -18,7 +18,7 @@ import {
   ChargingStationWorkerMessageEvents,
 } from '../types/ChargingStationWorker';
 import type { StationTemplateUrl } from '../types/ConfigurationData';
-import type Statistics from '../types/Statistics';
+import type { Statistics } from '../types/Statistics';
 import Configuration from '../utils/Configuration';
 import logger from '../utils/Logger';
 import Utils from '../utils/Utils';

diff --git a/src/charging-station/MessageChannelUtils.ts b/src/charging-station/MessageChannelUtils.ts
index 19266f73f6fee0348814dd7e4643838c50376a74..fe11041afd2dd30fdef81fa6fa8aec427148c1be 100644 (file)
--- a/src/charging-station/MessageChannelUtils.ts
+++ b/src/charging-station/MessageChannelUtils.ts
@@ -3,7 +3,7 @@ import {
   ChargingStationWorkerMessage,
   ChargingStationWorkerMessageEvents,
 } from '../types/ChargingStationWorker';
-import type Statistics from '../types/Statistics';
+import type { Statistics } from '../types/Statistics';
 import type ChargingStation from './ChargingStation';
 
 export class MessageChannelUtils {

diff --git a/src/performance/PerformanceStatistics.ts b/src/performance/PerformanceStatistics.ts
index 6513bba5e98ade3a08b00f8e3fb41680c5a66296..d3a174c076a2642ccaad247f4653d78bd48b8350 100644 (file)
--- a/src/performance/PerformanceStatistics.ts
+++ b/src/performance/PerformanceStatistics.ts
@@ -7,9 +7,7 @@ import { parentPort } from 'worker_threads';
 import { MessageChannelUtils } from '../charging-station/MessageChannelUtils';
 import { MessageType } from '../types/ocpp/MessageType';
 import type { IncomingRequestCommand, RequestCommand } from '../types/ocpp/Requests';
-import type Statistics from '../types/Statistics';
-// eslint-disable-next-line no-duplicate-imports
-import type { StatisticsData, TimeSeries } from '../types/Statistics';
+import type { Statistics, StatisticsData, TimeSeries } from '../types/Statistics';
 import { CircularArray, DEFAULT_CIRCULAR_ARRAY_SIZE } from '../utils/CircularArray';
 import Configuration from '../utils/Configuration';
 import logger from '../utils/Logger';

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index 2cdab50560fda0cd5e744d8265c4f1f49edeef61..8465290325173d316a24e6ef26f1d6a252675ad1 100644 (file)
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -5,7 +5,7 @@ import fs from 'fs';
 import lockfile from 'proper-lockfile';
 
 import { FileType } from '../../types/FileType';
-import type Statistics from '../../types/Statistics';
+import type { Statistics } from '../../types/Statistics';
 import FileUtils from '../../utils/FileUtils';
 import Utils from '../../utils/Utils';
 import { Storage } from './Storage';

diff --git a/src/performance/storage/MikroOrmStorage.ts b/src/performance/storage/MikroOrmStorage.ts
index 44be74918fa1d6ed9e50b69f10f6225a09a51b22..0c2b28ad920b1a256b1119b0f9c7e24a05cd62e6 100644 (file)
--- a/src/performance/storage/MikroOrmStorage.ts
+++ b/src/performance/storage/MikroOrmStorage.ts
@@ -5,7 +5,7 @@ import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
 
 import { PerformanceData } from '../../types/orm/entities/PerformanceData';
 import { PerformanceRecord } from '../../types/orm/entities/PerformanceRecord';
-import type Statistics from '../../types/Statistics';
+import type { Statistics } from '../../types/Statistics';
 import { MikroORMDBType, StorageType } from '../../types/Storage';
 import Constants from '../../utils/Constants';
 import { Storage } from './Storage';

diff --git a/src/performance/storage/MongoDBStorage.ts b/src/performance/storage/MongoDBStorage.ts
index f10481a0f96622cbe000e22def7da71e22936516..711799083d28f1f36e775f3f83d8910b4eb3fb72 100644 (file)
--- a/src/performance/storage/MongoDBStorage.ts
+++ b/src/performance/storage/MongoDBStorage.ts
@@ -2,7 +2,7 @@
 
 import { MongoClient } from 'mongodb';
 
-import type Statistics from '../../types/Statistics';
+import type { Statistics } from '../../types/Statistics';
 import { StorageType } from '../../types/Storage';
 import Constants from '../../utils/Constants';
 import { Storage } from './Storage';

diff --git a/src/performance/storage/Storage.ts b/src/performance/storage/Storage.ts
index d85d8c415efdd1b254694976597bfd722af4c42d..66bbc5f5d6f724acfacae07a5e627aa95315d85d 100644 (file)
--- a/src/performance/storage/Storage.ts
+++ b/src/performance/storage/Storage.ts
@@ -4,7 +4,7 @@ import { URL } from 'url';
 
 import type { EmptyObject } from '../../types/EmptyObject';
 import type { HandleErrorParams } from '../../types/Error';
-import type Statistics from '../../types/Statistics';
+import type { Statistics } from '../../types/Statistics';
 import { DBName, StorageType } from '../../types/Storage';
 import logger from '../../utils/Logger';
 import Utils from '../../utils/Utils';

diff --git a/src/types/ChargingStationWorker.ts b/src/types/ChargingStationWorker.ts
index 020ec7bd9b16295c72c5db64784fb0d86e47e475..58e10ce8cf0688751a62514c69233e5cb346ea62 100644 (file)
--- a/src/types/ChargingStationWorker.ts
+++ b/src/types/ChargingStationWorker.ts
@@ -3,7 +3,7 @@ import type ChargingStationInfo from './ChargingStationInfo';
 import type { ConnectorStatus } from './ConnectorStatus';
 import type { JsonObject } from './JsonType';
 import type { BootNotificationResponse } from './ocpp/Responses';
-import type Statistics from './Statistics';
+import type { Statistics } from './Statistics';
 import { WorkerData, WorkerMessage, WorkerMessageEvents } from './Worker';
 
 export interface ChargingStationWorkerOptions extends JsonObject {

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 26f6bc9fc39281a9e1777721b6e0b53408d42c8b..72f96696905165847155a305ddb8b4d5e3f8ab5b 100644 (file)
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -22,11 +22,11 @@ export type StatisticsData = {
   stdDevTimeMeasurement: number;
 };
 
-export default interface Statistics extends WorkerData {
+export type Statistics = WorkerData & {
   id: string;
   name: string;
   uri: string;
   createdAt: Date;
   updatedAt?: Date;
   statisticsData: Map<string, Partial<StatisticsData>>;
-}
+};