Merge dependabot/npm_and_yarn/types/tar-6.1.12 into combined-prs-branch

[e-mobility-charging-stations-simulator.git] / src / utils / ChargingStationConfigurationUtils.ts

diff --git a/src/utils/ChargingStationConfigurationUtils.ts b/src/utils/ChargingStationConfigurationUtils.ts
index e61730c75170c958dd0c9644a3a10eb8449099a2..7b5346d52392deb1996673bc7210e1a3bf300708 100644 (file)
--- a/src/utils/ChargingStationConfigurationUtils.ts
+++ b/src/utils/ChargingStationConfigurationUtils.ts
@@ -1,62 +1,58 @@
-import { Utils } from './Utils';
-import type { ChargingStation } from '../charging-station';
+import type { ChargingStation } from '../charging-station/index.js'
 import type {
   ChargingStationAutomaticTransactionGeneratorConfiguration,
   ConnectorStatus,
   EvseStatusConfiguration,
-  EvseStatusWorkerType,
-} from '../types';
+  EvseStatusWorkerType
+} from '../types/index.js'
 
 export const buildChargingStationAutomaticTransactionGeneratorConfiguration = (
   chargingStation: ChargingStation
 ): ChargingStationAutomaticTransactionGeneratorConfiguration => {
   return {
     automaticTransactionGenerator: chargingStation.getAutomaticTransactionGeneratorConfiguration(),
-    ...(!Utils.isNullOrUndefined(
-      chargingStation.automaticTransactionGenerator?.connectorsStatus
-    ) && {
+    ...(chargingStation.automaticTransactionGenerator?.connectorsStatus != null && {
       automaticTransactionGeneratorStatuses: [
-        ...chargingStation.automaticTransactionGenerator.connectorsStatus.values(),
-      ],
-    }),
-  };
-};
+        ...chargingStation.automaticTransactionGenerator.connectorsStatus.values()
+      ]
+    })
+  }
+}
 
 export const buildConnectorsStatus = (chargingStation: ChargingStation): ConnectorStatus[] => {
   return [...chargingStation.connectors.values()].map(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest
-  );
-};
+    ({ transactionSetInterval, ...connectorStatus }) => connectorStatus
+  )
+}
 
 export const enum OutputFormat {
   configuration = 'configuration',
-  worker = 'worker',
+  worker = 'worker'
 }
 
 export const buildEvsesStatus = (
   chargingStation: ChargingStation,
   outputFormat: OutputFormat = OutputFormat.configuration
-): (EvseStatusWorkerType | EvseStatusConfiguration)[] => {
-  return [...chargingStation.evses.values()].map((evseStatus) => {
+): Array<EvseStatusWorkerType | EvseStatusConfiguration> => {
+  // eslint-disable-next-line array-callback-return
+  return [...chargingStation.evses.values()].map(evseStatus => {
     const connectorsStatus = [...evseStatus.connectors.values()].map(
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest
-    );
-    let status: EvseStatusConfiguration;
+      ({ transactionSetInterval, ...connectorStatus }) => connectorStatus
+    )
+    let status: EvseStatusConfiguration
     switch (outputFormat) {
       case OutputFormat.worker:
         return {
           ...evseStatus,
-          connectors: connectorsStatus,
-        };
+          connectors: connectorsStatus
+        }
       case OutputFormat.configuration:
         status = {
           ...evseStatus,
-          connectorsStatus,
-        };
-        delete (status as EvseStatusWorkerType).connectors;
-        return status;
+          connectorsStatus
+        }
+        delete (status as EvseStatusWorkerType).connectors
+        return status
     }
-  });
-};
+  })
+}