Convert types to native type

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

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 1845d35b220186bce42f042d29cf40930fddeb7f..93042f20ae6db111bae72b6383da070c358a3c30 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -14,7 +14,7 @@ import PerformanceStatistics from '../performance/PerformanceStatistics';
 import type { AutomaticTransactionGeneratorConfiguration } from '../types/AutomaticTransactionGenerator';
 import type ChargingStationConfiguration from '../types/ChargingStationConfiguration';
 import type ChargingStationInfo from '../types/ChargingStationInfo';
-import type ChargingStationOcppConfiguration from '../types/ChargingStationOcppConfiguration';
+import type { ChargingStationOcppConfiguration } from '../types/ChargingStationOcppConfiguration';
 import ChargingStationTemplate, {
   CurrentType,
   PowerUnits,

diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
index 62fa8e50b19a7617654157e887a9639d37113d2c..f5c4df7321b7a8c60be62ead9b9df9bf0d5a125c 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
@@ -2,10 +2,11 @@
 
 import OCPPError from '../../../exception/OCPPError';
 import { CurrentType, Voltage } from '../../../types/ChargingStationTemplate';
-import type MeasurandPerPhaseSampledValueTemplates from '../../../types/MeasurandPerPhaseSampledValueTemplates';
-// eslint-disable-next-line no-duplicate-imports
-import type { SampledValueTemplate } from '../../../types/MeasurandPerPhaseSampledValueTemplates';
-import type MeasurandValues from '../../../types/MeasurandValues';
+import type {
+  MeasurandPerPhaseSampledValueTemplates,
+  SampledValueTemplate,
+} from '../../../types/MeasurandPerPhaseSampledValueTemplates';
+import type { MeasurandValues } from '../../../types/MeasurandValues';
 import {
   OCPP16StandardParametersKey,
   OCPP16SupportedFeatureProfiles,

diff --git a/src/types/ChargingStationConfiguration.ts b/src/types/ChargingStationConfiguration.ts
index b81f7675d6183727ca7b92918105cd7711105642..9fd5c2476215719a25ee30cdcb2d8e61acbf8a04 100644 (file)
--- a/src/types/ChargingStationConfiguration.ts
+++ b/src/types/ChargingStationConfiguration.ts
@@ -1,5 +1,5 @@
 import type { ChargingStationInfoConfiguration } from './ChargingStationInfo';
-import type ChargingStationOcppConfiguration from './ChargingStationOcppConfiguration';
+import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration';
 
 export default interface ChargingStationConfiguration
   extends ChargingStationInfoConfiguration,

diff --git a/src/types/ChargingStationInfo.ts b/src/types/ChargingStationInfo.ts
index 192e5771c0152ecf83126778b2a9eac38db69a3b..03273e2af61aa6b11934f14cb825b8da14c5e7d8 100644 (file)
--- a/src/types/ChargingStationInfo.ts
+++ b/src/types/ChargingStationInfo.ts
@@ -21,6 +21,6 @@ export default interface ChargingStationInfo
   maximumAmperage?: number; // Always in Ampere
 }
 
-export interface ChargingStationInfoConfiguration {
+export type ChargingStationInfoConfiguration = {
   stationInfo?: ChargingStationInfo;
-}
+};

diff --git a/src/types/ChargingStationOcppConfiguration.ts b/src/types/ChargingStationOcppConfiguration.ts
index b6d9ec9278e89db8f81e3a7205078f6bd6adb7df..77c38f04971770aebe2dfe300c41f2a427d750e5 100644 (file)
--- a/src/types/ChargingStationOcppConfiguration.ts
+++ b/src/types/ChargingStationOcppConfiguration.ts
@@ -5,6 +5,6 @@ export interface ConfigurationKey extends OCPPConfigurationKey {
   reboot?: boolean;
 }
 
-export default interface ChargingStationOcppConfiguration {
+export type ChargingStationOcppConfiguration = {
   configurationKey?: ConfigurationKey[];
-}
+};

diff --git a/src/types/ChargingStationTemplate.ts b/src/types/ChargingStationTemplate.ts
index 1c68743d8b2903a61e84f9748cf2e020c258b2ef..acf70e499c8634e6067a6c4102a272c9644dd7d4 100644 (file)
--- a/src/types/ChargingStationTemplate.ts
+++ b/src/types/ChargingStationTemplate.ts
@@ -3,7 +3,7 @@ import type { ClientRequestArgs } from 'http';
 import type { ClientOptions } from 'ws';
 
 import type { AutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
-import type ChargingStationOcppConfiguration from './ChargingStationOcppConfiguration';
+import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration';
 import type { ConnectorStatus } from './ConnectorStatus';
 import type { OCPPProtocol } from './ocpp/OCPPProtocol';
 import type { OCPPVersion } from './ocpp/OCPPVersion';
@@ -35,10 +35,10 @@ export enum Voltage {
 
 export type WsOptions = ClientOptions & ClientRequestArgs;
 
-interface CommandsSupport {
+type CommandsSupport = {
   incomingCommands: Record<IncomingRequestCommand, boolean>;
   outgoingCommands?: Record<RequestCommand, boolean>;
-}
+};
 
 export default interface ChargingStationTemplate {
   templateHash?: string;

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index fb67bced00fdf3ac8f75f107a74f1383ff61a02e..ba9fb14ce993430379facda2f77d376e00e48a15 100644 (file)
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -14,12 +14,12 @@ export enum SupervisionUrlDistribution {
   SEQUENTIAL = 'sequential',
 }
 
-export interface StationTemplateUrl {
+export type StationTemplateUrl = {
   file: string;
   numberOfStations: number;
-}
+};
 
-export interface UIServerConfiguration {
+export type UIServerConfiguration = {
   enabled?: boolean;
   type?: ApplicationProtocol;
   options?: ServerOptions;
@@ -29,15 +29,15 @@ export interface UIServerConfiguration {
     username?: string;
     password?: string;
   };
-}
+};
 
-export interface StorageConfiguration {
+export type StorageConfiguration = {
   enabled?: boolean;
   type?: StorageType;
   uri?: string;
-}
+};
 
-export interface WorkerConfiguration {
+export type WorkerConfiguration = {
   processType?: WorkerProcessType;
   startDelay?: number;
   elementsPerWorker?: number;
@@ -45,9 +45,9 @@ export interface WorkerConfiguration {
   poolMinSize?: number;
   poolMaxSize?: number;
   poolStrategy?: WorkerChoiceStrategy;
-}
+};
 
-export default interface ConfigurationData {
+export type ConfigurationData = {
   supervisionUrls?: string | string[];
   supervisionUrlDistribution?: SupervisionUrlDistribution;
   stationTemplateUrls: StationTemplateUrl[];
@@ -77,4 +77,4 @@ export default interface ConfigurationData {
   logFile?: string;
   logErrorFile?: string;
   logConsole?: boolean;
-}
+};

diff --git a/src/types/ConnectorStatus.ts b/src/types/ConnectorStatus.ts
index abf0c45ddd9a3c8bda06779be2c48c654d813330..209cd42e42be230f72c12985fed322087b70f162 100644 (file)
--- a/src/types/ConnectorStatus.ts
+++ b/src/types/ConnectorStatus.ts
@@ -4,7 +4,7 @@ import type { ChargingProfile } from './ocpp/ChargingProfile';
 import type { MeterValue } from './ocpp/MeterValues';
 import type { AvailabilityType } from './ocpp/Requests';
 
-export interface ConnectorStatus {
+export type ConnectorStatus = {
   availability: AvailabilityType;
   bootStatus?: ChargePointStatus;
   status?: ChargePointStatus;
@@ -22,4 +22,4 @@ export interface ConnectorStatus {
   transactionEnergyActiveImportRegisterValue?: number; // In Wh
   transactionBeginMeterValue?: MeterValue;
   chargingProfiles?: ChargingProfile[];
-}
+};

diff --git a/src/types/Error.ts b/src/types/Error.ts
index b27f24578fa4829dc27e9eb7468f7217c3c6090b..76e3005f243236c7fcb65b6e6c204fee76418560 100644 (file)
--- a/src/types/Error.ts
+++ b/src/types/Error.ts
@@ -1,5 +1,5 @@
-export interface HandleErrorParams<T> {
+export type HandleErrorParams<T> = {
   throwError?: boolean;
   consoleOut?: boolean;
   errorResponse?: T;
-}
+};

diff --git a/src/types/MeasurandPerPhaseSampledValueTemplates.ts b/src/types/MeasurandPerPhaseSampledValueTemplates.ts
index 2fb8f9ba21716957e71aa586a0fd4778a0e46e83..34ead1a574a9df526b238794753e4a72f96ca51b 100644 (file)
--- a/src/types/MeasurandPerPhaseSampledValueTemplates.ts
+++ b/src/types/MeasurandPerPhaseSampledValueTemplates.ts
@@ -4,8 +4,8 @@ export interface SampledValueTemplate extends SampledValue {
   fluctuationPercent?: number;
 }
 
-export default interface MeasurandPerPhaseSampledValueTemplates {
+export type MeasurandPerPhaseSampledValueTemplates = {
   L1?: SampledValueTemplate;
   L2?: SampledValueTemplate;
   L3?: SampledValueTemplate;
-}
+};

diff --git a/src/types/MeasurandValues.ts b/src/types/MeasurandValues.ts
index d66a76451c5760f1c3200f9a454f290846f5e7bc..9adfbf05253ee66ede8585b24f912c0bbcdfa765 100644 (file)
--- a/src/types/MeasurandValues.ts
+++ b/src/types/MeasurandValues.ts
@@ -1,6 +1,6 @@
-export default interface MeasurandValues {
+export type MeasurandValues = {
   L1: number;
   L2: number;
   L3: number;
   allPhases: number;
-}
+};

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 628ad28b6d150a582acacd875dd575dd18c5d5e5..26f6bc9fc39281a9e1777721b6e0b53408d42c8b 100644 (file)
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -1,12 +1,12 @@
 import type { CircularArray } from '../utils/CircularArray';
 import type { WorkerData } from './Worker';
 
-export interface TimeSeries {
+export type TimeSeries = {
   timestamp: number;
   value: number;
-}
+};
 
-export interface StatisticsData {
+export type StatisticsData = {
   countRequest: number;
   countResponse: number;
   countError: number;
@@ -20,7 +20,7 @@ export interface StatisticsData {
   medTimeMeasurement: number;
   ninetyFiveThPercentileTimeMeasurement: number;
   stdDevTimeMeasurement: number;
-}
+};
 
 export default interface Statistics extends WorkerData {
   id: string;

diff --git a/src/types/Worker.ts b/src/types/Worker.ts
index 9d9692a720a1af4c32342df01354f6b1f375cd6d..c2594b9a932cf9b6fcc903c23e37a715143523cc 100644 (file)
--- a/src/types/Worker.ts
+++ b/src/types/Worker.ts
@@ -8,7 +8,7 @@ export enum WorkerProcessType {
   STATIC_POOL = 'staticPool',
 }
 
-export interface WorkerOptions {
+export type WorkerOptions = {
   workerStartDelay?: number;
   elementStartDelay?: number;
   poolMaxSize?: number;
@@ -16,19 +16,19 @@ export interface WorkerOptions {
   elementsPerWorker?: number;
   poolOptions?: PoolOptions<Worker>;
   messageHandler?: (message: unknown) => void | Promise<void>;
-}
+};
 
 export type WorkerData = Record<string, unknown>;
 
-export interface WorkerSetElement {
+export type WorkerSetElement = {
   worker: Worker;
   numberOfWorkerElements: number;
-}
+};
 
-export interface WorkerMessage<T extends WorkerData> {
+export type WorkerMessage<T extends WorkerData> = {
   id: WorkerMessageEvents;
   data: T;
-}
+};
 
 export enum WorkerMessageEvents {
   START_WORKER_ELEMENT = 'startWorkerElement',

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 99a3f817b064301c55d396c28f11a557c0c6b90e..052bfc6bc044e41bf8e6e8a7f1d8e78f24983db1 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -21,10 +21,10 @@ export const RequestCommand = {
 
 export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
 
-export interface RequestParams {
+export type RequestParams = {
   skipBufferingOnError?: boolean;
   triggerMessage?: boolean;
-}
+};
 
 export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
 

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index 43250047ade5952a2d818aa7c8a0c97e5aa271b3..c57510ae7eaf04ebb71d9c407e9a9007b574a9c3 100644 (file)
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -39,9 +39,9 @@ export enum DefaultStatus {
   REJECTED = 'Rejected',
 }
 
-export interface DefaultResponse {
+export type DefaultResponse = {
   status: DefaultStatus;
-}
+};
 
 export type RegistrationStatus = OCPP16RegistrationStatus;
 

diff --git a/src/ui/web/src/types/ConfigurationType.ts b/src/ui/web/src/types/ConfigurationType.ts
index f07f565e3315a5366ead7940e0681d8369097f6b..9b74808278eca7e1ed1cb37cba3d967b50115c52 100644 (file)
--- a/src/ui/web/src/types/ConfigurationType.ts
+++ b/src/ui/web/src/types/ConfigurationType.ts
@@ -1,11 +1,11 @@
-export interface BaseConfig {
+export type BaseConfig = {
   uiServer: UIServerConfig;
-}
+};
 
-interface UIServerConfig {
+type UIServerConfig = {
   host: string;
   port: number;
   protocol: string;
   username?: string;
   password?: string;
-}
+};

diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts
index afc992f8e7841b35f44a49841ee1c63f452e5285..c90c214d91b829ef1d558d02fc227e06a9abd706 100644 (file)
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -4,12 +4,13 @@ import { fileURLToPath } from 'url';
 
 import chalk from 'chalk';
 
-import ConfigurationData, {
-  StationTemplateUrl,
-  StorageConfiguration,
+import {
+  type ConfigurationData,
+  type StationTemplateUrl,
+  type StorageConfiguration,
   SupervisionUrlDistribution,
-  UIServerConfiguration,
-  WorkerConfiguration,
+  type UIServerConfiguration,
+  type WorkerConfiguration,
 } from '../types/ConfigurationData';
 import type { EmptyObject } from '../types/EmptyObject';
 import type { HandleErrorParams } from '../types/Error';