refactor(ocpp): remove unnecessary exports from internal helpers

De-export 14 MeterValue helper functions in OCPPServiceUtils
that are now only used internally after builder consolidation.
Make readVariableAsIntervalMs private in OCPP20ServiceUtils.

diff --git a/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts b/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
index 9ce5bcbb8d5d818de3e83fa75206061c007a1054..6a91391012ca640b3866be7307a6b943ffa270e7 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
@@ -506,23 +506,6 @@ export class OCPP20ServiceUtils {
     return defaultValue
   }
 
-  public static readVariableAsIntervalMs (
-    chargingStation: ChargingStation,
-    componentName: string,
-    variableName: string,
-    defaultSeconds: number
-  ): number {
-    const intervalSeconds = OCPP20ServiceUtils.readVariableAsInteger(
-      chargingStation,
-      componentName,
-      variableName,
-      defaultSeconds
-    )
-    return intervalSeconds > 0
-      ? secondsToMilliseconds(intervalSeconds)
-      : secondsToMilliseconds(defaultSeconds)
-  }
-
   public static readVariableValue (
     chargingStation: ChargingStation,
     componentName: string,
@@ -1159,6 +1142,23 @@ export class OCPP20ServiceUtils {
     return endedMeterValues.length > 0 ? endedMeterValues : []
   }
 
+  private static readVariableAsIntervalMs (
+    chargingStation: ChargingStation,
+    componentName: string,
+    variableName: string,
+    defaultSeconds: number
+  ): number {
+    const intervalSeconds = OCPP20ServiceUtils.readVariableAsInteger(
+      chargingStation,
+      componentName,
+      variableName,
+      defaultSeconds
+    )
+    return intervalSeconds > 0
+      ? secondsToMilliseconds(intervalSeconds)
+      : secondsToMilliseconds(defaultSeconds)
+  }
+
   private static resolveActiveTransaction (
     chargingStation: ChargingStation,
     connectorId: number

diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts
index 533241cc42a88ea07c11699b614ec0cd3ea455cc..e7a51944236ce3203c2fcfd68f0584e147b532c8 100644 (file)
--- a/src/charging-station/ocpp/OCPPServiceUtils.ts
+++ b/src/charging-station/ocpp/OCPPServiceUtils.ts
@@ -160,7 +160,7 @@ export const convertDateToISOString = <T extends JsonType>(object: T): void => {
   }
 }
 
-export const buildSocMeasurandValue = (
+const buildSocMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   evseId?: number,
@@ -192,7 +192,7 @@ export const buildSocMeasurandValue = (
   }
 }
 
-export const validateSocMeasurandValue = (
+const validateSocMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   sampledValue: SampledValue,
@@ -215,7 +215,7 @@ export const validateSocMeasurandValue = (
   }
 }
 
-export const buildVoltageMeasurandValue = (
+const buildVoltageMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   evseId?: number,
@@ -248,7 +248,7 @@ export const buildVoltageMeasurandValue = (
   }
 }
 
-export const addMainVoltageToMeterValue = <TSampledValue extends SampledValue>(
+const addMainVoltageToMeterValue = <TSampledValue extends SampledValue>(
   chargingStation: ChargingStation,
   meterValue: { sampledValue: TSampledValue[] },
   voltageData: { template: SampledValueTemplate; value: number },
@@ -274,7 +274,7 @@ export const addMainVoltageToMeterValue = <TSampledValue extends SampledValue>(
   }
 }
 
-export const addPhaseVoltageToMeterValue = <TSampledValue extends SampledValue>(
+const addPhaseVoltageToMeterValue = <TSampledValue extends SampledValue>(
   chargingStation: ChargingStation,
   connectorId: number,
   meterValue: { sampledValue: TSampledValue[] },
@@ -327,7 +327,7 @@ export const addPhaseVoltageToMeterValue = <TSampledValue extends SampledValue>(
   )
 }
 
-export const addLineToLineVoltageToMeterValue = <TSampledValue extends SampledValue>(
+const addLineToLineVoltageToMeterValue = <TSampledValue extends SampledValue>(
   chargingStation: ChargingStation,
   connectorId: number,
   meterValue: { sampledValue: TSampledValue[] },
@@ -388,7 +388,7 @@ export const addLineToLineVoltageToMeterValue = <TSampledValue extends SampledVa
   )
 }
 
-export const buildEnergyMeasurandValue = (
+const buildEnergyMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   interval: number,
@@ -438,7 +438,7 @@ export const buildEnergyMeasurandValue = (
   }
 }
 
-export const updateConnectorEnergyValues = (
+const updateConnectorEnergyValues = (
   connectorStatus: ConnectorStatus | undefined,
   energyValue: number
 ): void => {
@@ -458,7 +458,7 @@ export const updateConnectorEnergyValues = (
   }
 }
 
-export const validateEnergyMeasurandValue = (
+const validateEnergyMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   sampledValue: SampledValue,
@@ -479,7 +479,7 @@ export const validateEnergyMeasurandValue = (
   }
 }
 
-export const buildPowerMeasurandValue = (
+const buildPowerMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   evseId?: number,
@@ -687,7 +687,7 @@ export const buildPowerMeasurandValue = (
   }
 }
 
-export const validatePowerMeasurandValue = (
+const validatePowerMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   connectorStatus: ConnectorStatus | undefined,
@@ -710,7 +710,7 @@ export const validatePowerMeasurandValue = (
   }
 }
 
-export const validateCurrentMeasurandValue = (
+const validateCurrentMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   connectorStatus: ConnectorStatus | undefined,
@@ -733,7 +733,7 @@ export const validateCurrentMeasurandValue = (
   }
 }
 
-export const validateCurrentMeasurandPhaseValue = (
+const validateCurrentMeasurandPhaseValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   connectorStatus: ConnectorStatus | undefined,
@@ -759,7 +759,7 @@ export const validateCurrentMeasurandPhaseValue = (
   }
 }
 
-export const buildCurrentMeasurandValue = (
+const buildCurrentMeasurandValue = (
   chargingStation: ChargingStation,
   connectorId: number,
   evseId?: number,