Reorganize more sensibly types definition

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 00cfce9f96f00014a251284a02494abe9be7d5bc..ad4dac388a293b56243982184dd1f40848b7fbf3 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -5,7 +5,6 @@ import { BootNotificationResponse, RegistrationStatus } from '../types/ocpp/Resp
 import ChargingStationConfiguration, { ConfigurationKey } from '../types/ChargingStationConfiguration';
 import ChargingStationTemplate, { CurrentType, PowerUnits, Voltage } from '../types/ChargingStationTemplate';
 import { ConnectorPhaseRotation, StandardParametersKey, SupportedFeatureProfiles, VendorDefaultParametersKey } from '../types/ocpp/Configuration';
-import { ConnectorStatus, SampledValueTemplate } from '../types/Connectors';
 import { MeterValueMeasurand, MeterValuePhase } from '../types/ocpp/MeterValues';
 import { WSError, WebSocketCloseEventStatusCode } from '../types/WebSocket';
 import WebSocket, { ClientOptions, Data, OPEN } from 'ws';
@@ -17,6 +16,7 @@ import ChargingStationInfo from '../types/ChargingStationInfo';
 import { ChargingStationWorkerMessageEvents } from '../types/ChargingStationWorker';
 import { ClientRequestArgs } from 'http';
 import Configuration from '../utils/Configuration';
+import { ConnectorStatus } from '../types/ConnectorStatus';
 import Constants from '../utils/Constants';
 import { ErrorType } from '../types/ocpp/ErrorType';
 import FileUtils from '../utils/FileUtils';
@@ -29,6 +29,7 @@ import OCPPIncomingRequestService from './ocpp/OCPPIncomingRequestService';
 import OCPPRequestService from './ocpp/OCPPRequestService';
 import { OCPPVersion } from '../types/ocpp/OCPPVersion';
 import PerformanceStatistics from '../performance/PerformanceStatistics';
+import { SampledValueTemplate } from '../types/MeasurandPerPhaseSampledValueTemplates';
 import { StopTransactionReason } from '../types/ocpp/Transaction';
 import { URL } from 'url';
 import Utils from '../utils/Utils';

diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
index 289b00ea22c0b70e928c2f72c069f77196cbb107..f55c74290efb3e773348c2456b36551314001f12 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
@@ -6,7 +6,7 @@ import ChargingStation from '../../ChargingStation';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
 import OCPPError from '../../../exception/OCPPError';
 import { RequestCommand } from '../../../types/ocpp/Requests';
-import { SampledValueTemplate } from '../../../types/Connectors';
+import { SampledValueTemplate } from '../../../types/MeasurandPerPhaseSampledValueTemplates';
 import Utils from '../../../utils/Utils';
 import logger from '../../../utils/Logger';
 

diff --git a/src/types/ChargingStationTemplate.ts b/src/types/ChargingStationTemplate.ts
index 8d0b044e6b265ec18abe2c5e8d27d048134ed059..5d553318576cc7b3980b7e8c8b2ad2b9c06dc0e0 100644 (file)
--- a/src/types/ChargingStationTemplate.ts
+++ b/src/types/ChargingStationTemplate.ts
@@ -1,7 +1,7 @@
 import ChargingStationConfiguration from './ChargingStationConfiguration';
 import { ClientOptions } from 'ws';
 import { ClientRequestArgs } from 'http';
-import { ConnectorStatus } from './Connectors';
+import { ConnectorStatus } from './ConnectorStatus';
 import { OCPPProtocol } from './ocpp/OCPPProtocol';
 import { OCPPVersion } from './ocpp/OCPPVersion';
 

diff --git a/src/types/Connectors.ts b/src/types/ConnectorStatus.ts
similarity index 84%
rename from src/types/Connectors.ts
rename to src/types/ConnectorStatus.ts
index 027ac645d7f22336e399b79d0793f7ef85b51ac4..c63dd3db98311b7496a6b07c56d4c10f0cd32f7a 100644 (file)
--- a/src/types/Connectors.ts
+++ b/src/types/ConnectorStatus.ts
@@ -1,12 +1,8 @@
-import { MeterValue, SampledValue } from './ocpp/MeterValues';
-
 import { AvailabilityType } from './ocpp/Requests';
 import { ChargePointStatus } from './ocpp/ChargePointStatus';
 import { ChargingProfile } from './ocpp/ChargingProfile';
-
-export interface SampledValueTemplate extends SampledValue {
-  fluctuationPercent?: number;
-}
+import { MeterValue } from './ocpp/MeterValues';
+import { SampledValueTemplate } from './MeasurandPerPhaseSampledValueTemplates';
 
 export interface ConnectorStatus {
   availability: AvailabilityType;

diff --git a/src/types/MeasurandPerPhaseSampledValueTemplates.ts b/src/types/MeasurandPerPhaseSampledValueTemplates.ts
index c78d9ebdd4591e414a8c945829fd08341cd88a91..9240fde2836c3229058ac1c105095f45a31c665d 100644 (file)
--- a/src/types/MeasurandPerPhaseSampledValueTemplates.ts
+++ b/src/types/MeasurandPerPhaseSampledValueTemplates.ts
@@ -1,4 +1,8 @@
-import { SampledValueTemplate } from './Connectors';
+import { SampledValue } from './ocpp/MeterValues';
+
+export interface SampledValueTemplate extends SampledValue {
+  fluctuationPercent?: number;
+}
 
 export default interface MeasurandPerPhaseSampledValueTemplates {
   L1?: SampledValueTemplate;