Replace more interface with type for types definition

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 d3c33fc3a3f8936cf0c2a039599f30bbcb523416..0a3d544a01260c2d051b5f649010aaaa88146c05 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -12,13 +12,14 @@ import BaseError from '../exception/BaseError';
 import OCPPError from '../exception/OCPPError';
 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 { ChargingStationConfiguration } from '../types/ChargingStationConfiguration';
+import type { ChargingStationInfo } from '../types/ChargingStationInfo';
 import type { ChargingStationOcppConfiguration } from '../types/ChargingStationOcppConfiguration';
-import ChargingStationTemplate, {
+import {
+  type ChargingStationTemplate,
   CurrentType,
   PowerUnits,
-  WsOptions,
+  type WsOptions,
 } from '../types/ChargingStationTemplate';
 import { SupervisionUrlDistribution } from '../types/ConfigurationData';
 import type { ConnectorStatus } from '../types/ConnectorStatus';

diff --git a/src/charging-station/ChargingStationUtils.ts b/src/charging-station/ChargingStationUtils.ts
index 28f38b4619738e81ba07708dc5c5676bf93017e7..e6b9c17d53cb9c65bb3d37298983c8484db388d2 100644 (file)
--- a/src/charging-station/ChargingStationUtils.ts
+++ b/src/charging-station/ChargingStationUtils.ts
@@ -5,9 +5,10 @@ import { fileURLToPath } from 'url';
 import moment from 'moment';
 
 import BaseError from '../exception/BaseError';
-import type ChargingStationInfo from '../types/ChargingStationInfo';
-import ChargingStationTemplate, {
+import type { ChargingStationInfo } from '../types/ChargingStationInfo';
+import {
   AmpereUnits,
+  type ChargingStationTemplate,
   CurrentType,
   Voltage,
 } from '../types/ChargingStationTemplate';
@@ -17,7 +18,7 @@ import type { ChargingProfile, ChargingSchedulePeriod } from '../types/ocpp/Char
 import { StandardParametersKey } from '../types/ocpp/Configuration';
 import { MeterValueMeasurand, MeterValuePhase } from '../types/ocpp/MeterValues';
 import {
-  BootNotificationRequest,
+  type BootNotificationRequest,
   IncomingRequestCommand,
   RequestCommand,
 } from '../types/ocpp/Requests';

diff --git a/src/charging-station/SharedLRUCache.ts b/src/charging-station/SharedLRUCache.ts
index 01e18734b673295004a3c033a5db37bd382d6c58..e02f6ac6b6cdb29ba1e8f352ef689859b75b316b 100644 (file)
--- a/src/charging-station/SharedLRUCache.ts
+++ b/src/charging-station/SharedLRUCache.ts
@@ -1,7 +1,7 @@
 import LRUCache from 'mnemonist/lru-map-with-delete';
 
-import type ChargingStationConfiguration from '../types/ChargingStationConfiguration';
-import type ChargingStationTemplate from '../types/ChargingStationTemplate';
+import type { ChargingStationConfiguration } from '../types/ChargingStationConfiguration';
+import type { ChargingStationTemplate } from '../types/ChargingStationTemplate';
 import Utils from '../utils/Utils';
 
 enum CacheType {

diff --git a/src/types/AutomaticTransactionGenerator.ts b/src/types/AutomaticTransactionGenerator.ts
index f88659bff630ce8025e6f9f6082a9a2cee2e3e8e..c8ce3c9aaad48b31c311a8da6c9310caccd60c85 100644 (file)
--- a/src/types/AutomaticTransactionGenerator.ts
+++ b/src/types/AutomaticTransactionGenerator.ts
@@ -28,3 +28,8 @@ export type Status = {
   skippedConsecutiveTransactions?: number;
   skippedTransactions?: number;
 };
+
+export type ChargingStationAutomaticTransactionGeneratorConfiguration = {
+  automaticTransactionGenerator?: AutomaticTransactionGeneratorConfiguration;
+  automaticTransactionGeneratorStatus?: Status;
+};

diff --git a/src/types/ChargingStationConfiguration.ts b/src/types/ChargingStationConfiguration.ts
index 9fd5c2476215719a25ee30cdcb2d8e61acbf8a04..f0107a6573e2aa7331e883b5f8d62b0fa791ea75 100644 (file)
--- a/src/types/ChargingStationConfiguration.ts
+++ b/src/types/ChargingStationConfiguration.ts
@@ -1,8 +1,9 @@
+import type { ChargingStationAutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
 import type { ChargingStationInfoConfiguration } from './ChargingStationInfo';
 import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration';
 
-export default interface ChargingStationConfiguration
-  extends ChargingStationInfoConfiguration,
-    ChargingStationOcppConfiguration {
-  configurationHash?: string;
-}
+export type ChargingStationConfiguration = ChargingStationInfoConfiguration &
+  ChargingStationOcppConfiguration &
+  ChargingStationAutomaticTransactionGeneratorConfiguration & {
+    configurationHash?: string;
+  };

diff --git a/src/types/ChargingStationInfo.ts b/src/types/ChargingStationInfo.ts
index 03273e2af61aa6b11934f14cb825b8da14c5e7d8..f83ba030ab8dd08ab7b8e03d0c77203d9f2a1a49 100644 (file)
--- a/src/types/ChargingStationInfo.ts
+++ b/src/types/ChargingStationInfo.ts
@@ -1,6 +1,6 @@
-import type ChargingStationTemplate from './ChargingStationTemplate';
+import type { ChargingStationTemplate } from './ChargingStationTemplate';
 
-export default interface ChargingStationInfo
+export interface ChargingStationInfo
   extends Omit<
     ChargingStationTemplate,
     | 'AutomaticTransactionGenerator'

diff --git a/src/types/ChargingStationTemplate.ts b/src/types/ChargingStationTemplate.ts
index acf70e499c8634e6067a6c4102a272c9644dd7d4..0d063d51a05d0ce4f8d3d23facd9ca8c217de3b4 100644 (file)
--- a/src/types/ChargingStationTemplate.ts
+++ b/src/types/ChargingStationTemplate.ts
@@ -40,7 +40,7 @@ type CommandsSupport = {
   outgoingCommands?: Record<RequestCommand, boolean>;
 };
 
-export default interface ChargingStationTemplate {
+export type ChargingStationTemplate = {
   templateHash?: string;
   supervisionUrls?: string | string[];
   supervisionUrlOcppConfiguration?: boolean;
@@ -96,4 +96,4 @@ export default interface ChargingStationTemplate {
   Configuration?: ChargingStationOcppConfiguration;
   AutomaticTransactionGenerator?: AutomaticTransactionGeneratorConfiguration;
   Connectors: Record<string, ConnectorStatus>;
-}
+};

diff --git a/src/types/ChargingStationWorker.ts b/src/types/ChargingStationWorker.ts
index 58e10ce8cf0688751a62514c69233e5cb346ea62..3604a85d01e367d8257838c7eab2aedbbb590c4a 100644 (file)
--- a/src/types/ChargingStationWorker.ts
+++ b/src/types/ChargingStationWorker.ts
@@ -1,5 +1,5 @@
 import type { Status } from './AutomaticTransactionGenerator';
-import type ChargingStationInfo from './ChargingStationInfo';
+import type { ChargingStationInfo } from './ChargingStationInfo';
 import type { ConnectorStatus } from './ConnectorStatus';
 import type { JsonObject } from './JsonType';
 import type { BootNotificationResponse } from './ocpp/Responses';