refactor(simulator): switch to internal modules export/import design

		     pattern

should close all issues related circular module dependencies

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

diff --git a/rollup.config.mjs b/rollup.config.mjs
index 6b113491dc7bc668d70e8eba682e9d32a50a544d..b97343c8c428f4263dbd94b976463b1f9a05f332 100644 (file)
--- a/rollup.config.mjs
+++ b/rollup.config.mjs
@@ -12,7 +12,7 @@ export default {
   output: [
     {
       dir: 'dist',
-      format: 'es',
+      format: 'esm',
       exports: 'auto',
       sourcemap: true,
       preserveModules: true,

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index e6b3dbf457fc0cde4bec0abb052d6453b2eb1fa8..8bb33b81b65ec0336722d546e66f7f25f2f185c3 100644 (file)
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -2,10 +2,10 @@
 
 import { AsyncResource } from 'async_hooks';
 
-import type { ChargingStation } from './ChargingStation';
-import { ChargingStationUtils } from './ChargingStationUtils';
+import { type ChargingStation, ChargingStationUtils } from './internal';
 import { BaseError } from '../exception';
-import { PerformanceStatistics } from '../performance';
+// import { PerformanceStatistics } from '../performance';
+import { PerformanceStatistics } from '../performance/PerformanceStatistics';
 import {
   AuthorizationStatus,
   type AuthorizeRequest,

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index c35464d1e2d4e3293c0f26dcf0ca134126cf6b40..f53225324ae21083fe0d82f6aa27363cb3523279 100644 (file)
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -6,8 +6,7 @@ import { type Worker, isMainThread } from 'worker_threads';
 
 import chalk from 'chalk';
 
-import { ChargingStationUtils } from './ChargingStationUtils';
-import { type AbstractUIServer, UIServerFactory } from './internal';
+import { type AbstractUIServer, ChargingStationUtils, UIServerFactory } from './internal';
 import { version } from '../../package.json';
 import { BaseError } from '../exception';
 import { type Storage, StorageFactory } from '../performance';

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 29119f92cf35d85f449fdf7d360f20b66af63e50..fe6bd0d9542088292a391fc7c82604c9468ccba7 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -9,27 +9,34 @@ import { parentPort } from 'worker_threads';
 import merge from 'just-merge';
 import WebSocket, { type RawData } from 'ws';
 
-import { AuthorizedTagsCache } from './AuthorizedTagsCache';
-import { AutomaticTransactionGenerator } from './AutomaticTransactionGenerator';
-import { ChargingStationConfigurationUtils } from './ChargingStationConfigurationUtils';
-import { ChargingStationUtils } from './ChargingStationUtils';
-import { ChargingStationWorkerBroadcastChannel } from './ChargingStationWorkerBroadcastChannel';
-import { MessageChannelUtils } from './MessageChannelUtils';
 import {
-  OCPP16IncomingRequestService,
+  AuthorizedTagsCache,
+  AutomaticTransactionGenerator,
+  ChargingStationConfigurationUtils,
+  ChargingStationUtils,
+  ChargingStationWorkerBroadcastChannel,
+  MessageChannelUtils,
+  SharedLRUCache,
+} from './internal';
+import {
+  // OCPP16IncomingRequestService,
   OCPP16RequestService,
-  OCPP16ResponseService,
+  // OCPP16ResponseService,
   OCPP16ServiceUtils,
   OCPP20IncomingRequestService,
   OCPP20RequestService,
-  OCPP20ResponseService,
+  // OCPP20ResponseService,
   type OCPPIncomingRequestService,
   type OCPPRequestService,
-  OCPPServiceUtils,
+  // OCPPServiceUtils,
 } from './ocpp';
-import { SharedLRUCache } from './SharedLRUCache';
+import { OCPP16IncomingRequestService } from './ocpp/1.6/OCPP16IncomingRequestService';
+import { OCPP16ResponseService } from './ocpp/1.6/OCPP16ResponseService';
+import { OCPP20ResponseService } from './ocpp/2.0/OCPP20ResponseService';
+import { OCPPServiceUtils } from './ocpp/OCPPServiceUtils';
 import { BaseError, OCPPError } from '../exception';
-import { PerformanceStatistics } from '../performance';
+// import { PerformanceStatistics } from '../performance';
+import { PerformanceStatistics } from '../performance/PerformanceStatistics';
 import {
   type AutomaticTransactionGeneratorConfiguration,
   AvailabilityType,

diff --git a/src/charging-station/ChargingStationConfigurationUtils.ts b/src/charging-station/ChargingStationConfigurationUtils.ts
index 541fd4455df5ca70c4bd736aa6a6fa2a89bb7076..342fe6d268b21fcf45abe901dec0180c827797e8 100644 (file)
--- a/src/charging-station/ChargingStationConfigurationUtils.ts
+++ b/src/charging-station/ChargingStationConfigurationUtils.ts
@@ -1,4 +1,4 @@
-import type { ChargingStation } from './ChargingStation';
+import type { ChargingStation } from './internal';
 import type { ConfigurationKey, StandardParametersKey } from '../types';
 import { logger } from '../utils/Logger';
 

diff --git a/src/charging-station/ChargingStationUtils.ts b/src/charging-station/ChargingStationUtils.ts
index 92ed040696f2e60f0d3e7e13a4ee624ee3bf4047..7254734aaf26f1d1bfe32b64a68f258afa0c9504 100644 (file)
--- a/src/charging-station/ChargingStationUtils.ts
+++ b/src/charging-station/ChargingStationUtils.ts
@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 
 import moment from 'moment';
 
-import type { ChargingStation } from './ChargingStation';
+import type { ChargingStation } from './internal';
 import { BaseError } from '../exception';
 import {
   AmpereUnits,

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index d28204e3a57c9ffc0316387beb8a5057de7f345a..3a1859a4a027057d99541b403a7464c5966310a1 100644 (file)
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -4,8 +4,7 @@ import { parentPort, workerData } from 'worker_threads';
 
 import { ThreadWorker } from 'poolifier';
 
-import { ChargingStation } from './ChargingStation';
-import { ChargingStationUtils } from './ChargingStationUtils';
+import { ChargingStation, ChargingStationUtils } from './internal';
 import type { ChargingStationWorkerData } from '../types';
 import { Utils } from '../utils/Utils';
 import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../worker';

diff --git a/src/charging-station/ChargingStationWorkerBroadcastChannel.ts b/src/charging-station/ChargingStationWorkerBroadcastChannel.ts
index 1a2943a71c842f90c83b3c1a68bc6de17f9affc5..02febe4ab81d3a275d0b5a216dfe7f172f622eb0 100644 (file)
--- a/src/charging-station/ChargingStationWorkerBroadcastChannel.ts
+++ b/src/charging-station/ChargingStationWorkerBroadcastChannel.ts
@@ -1,7 +1,9 @@
-import type { ChargingStation } from './ChargingStation';
-import { ChargingStationConfigurationUtils } from './ChargingStationConfigurationUtils';
+import {
+  type ChargingStation,
+  ChargingStationConfigurationUtils,
+  WorkerBroadcastChannel,
+} from './internal';
 import { OCPP16ServiceUtils } from './ocpp';
-import { WorkerBroadcastChannel } from './WorkerBroadcastChannel';
 import { BaseError, type OCPPError } from '../exception';
 import {
   AuthorizationStatus,

diff --git a/src/charging-station/MessageChannelUtils.ts b/src/charging-station/MessageChannelUtils.ts
index d8f1aa105a926b4fc0cf3b2025c9b58f121a3bf4..749a21ddcac8b767f2732868f3cfdd154dd53444 100644 (file)
--- a/src/charging-station/MessageChannelUtils.ts
+++ b/src/charging-station/MessageChannelUtils.ts
@@ -1,4 +1,4 @@
-import type { ChargingStation } from './ChargingStation';
+import type { ChargingStation } from './internal';
 import {
   type ChargingStationData,
   type ChargingStationWorkerMessage,

diff --git a/src/charging-station/UIServiceWorkerBroadcastChannel.ts b/src/charging-station/UIServiceWorkerBroadcastChannel.ts
index 3a21bc7378d71161da31480e9b7e9a3d36ada4bc..d9e746393d32b03f6062787a8924d819d864bf1d 100644 (file)
--- a/src/charging-station/UIServiceWorkerBroadcastChannel.ts
+++ b/src/charging-station/UIServiceWorkerBroadcastChannel.ts
@@ -1,5 +1,4 @@
-import type { AbstractUIService } from './internal';
-import { WorkerBroadcastChannel } from './WorkerBroadcastChannel';
+import { type AbstractUIService, WorkerBroadcastChannel } from './internal';
 import {
   type BroadcastChannelResponse,
   type BroadcastChannelResponsePayload,

diff --git a/src/charging-station/index.ts b/src/charging-station/index.ts
index c365e0b90c6f6911936ab4a63f427130702cf713..3b7660fe610895e1ae12bad4df01019ca3053682 100644 (file)
--- a/src/charging-station/index.ts
+++ b/src/charging-station/index.ts
@@ -1 +1,7 @@
-export { Bootstrap } from './internal';
+export {
+  Bootstrap,
+  type ChargingStation,
+  ChargingStationConfigurationUtils,
+  ChargingStationUtils,
+  MessageChannelUtils,
+} from './internal';

diff --git a/src/charging-station/internal.ts b/src/charging-station/internal.ts
index 314c96854b2c4a6e0362d772986a12a1d9d461ec..1f2fef1f834b1a714891e3e38a9839e5c7f7e974 100644 (file)
--- a/src/charging-station/internal.ts
+++ b/src/charging-station/internal.ts
@@ -1,8 +1,19 @@
+export * from './AuthorizedTagsCache';
+export * from './AutomaticTransactionGenerator';
 export * from './Bootstrap';
+export * from './ChargingStation';
+export * from './ChargingStationConfigurationUtils';
+export * from './ChargingStationUtils';
+export * from './ChargingStationWorkerBroadcastChannel';
+export * from './MessageChannelUtils';
+export * from './SharedLRUCache';
+export * from './UIServiceWorkerBroadcastChannel';
+export * from './WorkerBroadcastChannel';
 export * from './ui-server/AbstractUIServer';
 export * from './ui-server/UIHttpServer';
-export * from './ui-server/UIWebSocketServer';
 export * from './ui-server/UIServerFactory';
+export * from './ui-server/UIServerUtils';
+export * from './ui-server/UIWebSocketServer';
 export * from './ui-server/ui-services/AbstractUIService';
 export * from './ui-server/ui-services/UIService001';
 export * from './ui-server/ui-services/UIServiceFactory';

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index e6b8cc979317eeeecd7e0112ad5b928fae8b9750..029c422ef3a37ac0de56b27d7457e57bd29c1402 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -8,7 +8,11 @@ import type { JSONSchemaType } from 'ajv';
 import { Client, type FTPResponse } from 'basic-ftp';
 import tar from 'tar';
 
-import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
+import {
+  type ChargingStation,
+  ChargingStationConfigurationUtils,
+  ChargingStationUtils,
+} from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   type ChangeAvailabilityRequest,
@@ -76,11 +80,7 @@ import {
 import { Constants } from '../../../utils/Constants';
 import { logger } from '../../../utils/Logger';
 import { Utils } from '../../../utils/Utils';
-import type { ChargingStation } from '../../ChargingStation';
-import { ChargingStationConfigurationUtils } from '../../ChargingStationConfigurationUtils';
-import { ChargingStationUtils } from '../../ChargingStationUtils';
-import { OCPPConstants } from '../OCPPConstants';
-import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService';
+import { OCPP16ServiceUtils, OCPPConstants, OCPPIncomingRequestService } from '../internal';
 
 const moduleName = 'OCPP16IncomingRequestService';
 

diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
index efbd603c98e170dce3f4a3192d7f62c758351f34..7686e734d801d3775c6c56e0c7a8c5d2a126171d 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
@@ -2,7 +2,7 @@
 
 import type { JSONSchemaType } from 'ajv';
 
-import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
+import type { ChargingStation } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   ErrorType,
@@ -24,10 +24,12 @@ import {
 } from '../../../types';
 import { Constants } from '../../../utils/Constants';
 import { Utils } from '../../../utils/Utils';
-import type { ChargingStation } from '../../ChargingStation';
-import { OCPPConstants } from '../OCPPConstants';
-import { OCPPRequestService } from '../OCPPRequestService';
-import type { OCPPResponseService } from '../OCPPResponseService';
+import {
+  OCPP16ServiceUtils,
+  OCPPConstants,
+  OCPPRequestService,
+  type OCPPResponseService,
+} from '../internal';
 
 const moduleName = 'OCPP16RequestService';
 

diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
index 958f1a5d5b47c038a521e8339e4abaf4d82173fa..540ce93777fc185d7701d7a368e8d6208bc46aa9 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
@@ -2,7 +2,7 @@
 
 import type { JSONSchemaType } from 'ajv';
 
-import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
+import { type ChargingStation, ChargingStationConfigurationUtils } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   type ChangeAvailabilityResponse,
@@ -47,9 +47,7 @@ import {
 import { Constants } from '../../../utils/Constants';
 import { logger } from '../../../utils/Logger';
 import { Utils } from '../../../utils/Utils';
-import type { ChargingStation } from '../../ChargingStation';
-import { ChargingStationConfigurationUtils } from '../../ChargingStationConfigurationUtils';
-import { OCPPResponseService } from '../OCPPResponseService';
+import { OCPP16ServiceUtils, OCPPResponseService } from '../internal';
 
 const moduleName = 'OCPP16ResponseService';
 

diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
index 528a8aa71e53e03b155647f6b3826c99a3892c27..f57eaa8e55028e81305cf3e86c5ae6ff21537625 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
@@ -5,6 +5,7 @@ import { fileURLToPath } from 'node:url';
 
 import type { JSONSchemaType } from 'ajv';
 
+import type { ChargingStation } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   CurrentType,
@@ -32,8 +33,7 @@ import { Constants } from '../../../utils/Constants';
 import { ACElectricUtils, DCElectricUtils } from '../../../utils/ElectricUtils';
 import { logger } from '../../../utils/Logger';
 import { Utils } from '../../../utils/Utils';
-import type { ChargingStation } from '../../ChargingStation';
-import { OCPPServiceUtils } from '../OCPPServiceUtils';
+import { OCPPServiceUtils } from '../internal';
 
 export class OCPP16ServiceUtils extends OCPPServiceUtils {
   public static checkFeatureProfile(

diff --git a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
index 95169e2b0d88f548a6829bde7cbeed6a314f3991..1c70027293887f8f06d5f6063b44784bcbdcf630 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
@@ -2,7 +2,7 @@
 
 import type { JSONSchemaType } from 'ajv';
 
-import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
+import type { ChargingStation } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   ErrorType,
@@ -14,8 +14,7 @@ import {
   OCPPVersion,
 } from '../../../types';
 import { logger } from '../../../utils/Logger';
-import type { ChargingStation } from '../../ChargingStation';
-import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService';
+import { OCPP20ServiceUtils, OCPPIncomingRequestService } from '../internal';
 
 const moduleName = 'OCPP20IncomingRequestService';
 

diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
index bf8119c508b4825b6a6fbf931ec5ddc797af7446..7c137b48388d5d0a3357900de231fdebd2c68d01 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -2,7 +2,7 @@
 
 import type { JSONSchemaType } from 'ajv';
 
-import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
+import type { ChargingStation } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   ErrorType,
@@ -16,10 +16,12 @@ import {
   type RequestParams,
 } from '../../../types';
 import { Utils } from '../../../utils/Utils';
-import type { ChargingStation } from '../../ChargingStation';
-import { OCPPConstants } from '../OCPPConstants';
-import { OCPPRequestService } from '../OCPPRequestService';
-import type { OCPPResponseService } from '../OCPPResponseService';
+import {
+  OCPP20ServiceUtils,
+  OCPPConstants,
+  OCPPRequestService,
+  type OCPPResponseService,
+} from '../internal';
 
 const moduleName = 'OCPP20RequestService';
 

diff --git a/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts b/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts
index 4866b5c5c241856a87db28f54851c6a6cfc9e507..7e460ef199fd9444eab0d4b5d72b907b992196dc 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts
@@ -2,7 +2,7 @@
 
 import type { JSONSchemaType } from 'ajv';
 
-import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
+import { type ChargingStation, ChargingStationConfigurationUtils } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
   ErrorType,
@@ -20,9 +20,7 @@ import {
   type ResponseHandler,
 } from '../../../types';
 import { logger } from '../../../utils/Logger';
-import type { ChargingStation } from '../../ChargingStation';
-import { ChargingStationConfigurationUtils } from '../../ChargingStationConfigurationUtils';
-import { OCPPResponseService } from '../OCPPResponseService';
+import { OCPP20ServiceUtils, OCPPResponseService } from '../internal';
 
 const moduleName = 'OCPP20ResponseService';
 

diff --git a/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts b/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
index 38b80968a4327cd5c00660321e3f4d77cb671a3a..9fb61bd0c49eb07b4872840fb336ebbcbaaf0228 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 import type { JSONSchemaType } from 'ajv';
 
 import { type JsonType, OCPPVersion } from '../../../types';
-import { OCPPServiceUtils } from '../OCPPServiceUtils';
+import { OCPPServiceUtils } from '../internal';
 
 export class OCPP20ServiceUtils extends OCPPServiceUtils {
   public static parseJsonSchemaFile<T extends JsonType>(

diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index 00059f4b5d6c5c0b3c27d6779ea19b2b0609c5f8..de036e707237bf1393f537abddd62b58cebd0e1f 100644 (file)
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -3,8 +3,8 @@ import { AsyncResource } from 'async_hooks';
 import Ajv, { type JSONSchemaType } from 'ajv';
 import ajvFormats from 'ajv-formats';
 
-import { OCPPConstants } from './OCPPConstants';
-import { OCPPServiceUtils } from './OCPPServiceUtils';
+import { OCPPConstants, OCPPServiceUtils } from './internal';
+import { type ChargingStation, ChargingStationUtils } from '../../charging-station';
 import { OCPPError } from '../../exception';
 import type {
   ClearCacheResponse,
@@ -15,8 +15,6 @@ import type {
   OCPPVersion,
 } from '../../types';
 import { logger } from '../../utils/Logger';
-import type { ChargingStation } from '../ChargingStation';
-import { ChargingStationUtils } from '../ChargingStationUtils';
 
 const moduleName = 'OCPPIncomingRequestService';
 

diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts
index 4ef39b52ebec7e7e843a13b9b388bea1de8ec567..e58a1d43f71f97509c0d8d4a3edd37b00b780bb8 100644 (file)
--- a/src/charging-station/ocpp/OCPPRequestService.ts
+++ b/src/charging-station/ocpp/OCPPRequestService.ts
@@ -1,10 +1,11 @@
 import Ajv, { type JSONSchemaType } from 'ajv';
 import ajvFormats from 'ajv-formats';
 
-import type { OCPPResponseService } from './OCPPResponseService';
-import { OCPPServiceUtils } from './OCPPServiceUtils';
+import { type OCPPResponseService, OCPPServiceUtils } from './internal';
+import type { ChargingStation } from '../../charging-station';
 import { OCPPError } from '../../exception';
-import { PerformanceStatistics } from '../../performance';
+// import { PerformanceStatistics } from '../../performance';
+import { PerformanceStatistics } from '../../performance/PerformanceStatistics';
 import {
   type EmptyObject,
   type ErrorCallback,
@@ -26,7 +27,6 @@ import {
 import { Constants } from '../../utils/Constants';
 import { logger } from '../../utils/Logger';
 import { Utils } from '../../utils/Utils';
-import type { ChargingStation } from '../ChargingStation';
 
 const moduleName = 'OCPPRequestService';
 

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index ab17b05ad6bf2626dd03d7db2d34a196f71d9de7..c66a16dad839a4fbcd47e250341d4d6e15b9a823 100644 (file)
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,7 +1,8 @@
 import Ajv, { type JSONSchemaType } from 'ajv';
 import ajvFormats from 'ajv-formats';
 
-import { OCPPServiceUtils } from './OCPPServiceUtils';
+import { OCPPServiceUtils } from './internal';
+import type { ChargingStation } from '../../charging-station';
 import { OCPPError } from '../../exception';
 import type {
   IncomingRequestCommand,
@@ -11,7 +12,6 @@ import type {
   RequestCommand,
 } from '../../types';
 import { logger } from '../../utils/Logger';
-import type { ChargingStation } from '../ChargingStation';
 
 const moduleName = 'OCPPResponseService';
 

diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts
index 4b232033f70b1f71509e8034b4b6978a3a8194d8..9d410963ddd8dcf9210d10ae346ebc1f673acc6f 100644 (file)
--- a/src/charging-station/ocpp/OCPPServiceUtils.ts
+++ b/src/charging-station/ocpp/OCPPServiceUtils.ts
@@ -2,6 +2,7 @@ import fs from 'node:fs';
 
 import type { DefinedError, ErrorObject, JSONSchemaType } from 'ajv';
 
+import { type ChargingStation, ChargingStationConfigurationUtils } from '../../charging-station';
 import { BaseError } from '../../exception';
 import {
   ChargePointErrorCode,
@@ -27,8 +28,6 @@ import { Constants } from '../../utils/Constants';
 import { FileUtils } from '../../utils/FileUtils';
 import { logger } from '../../utils/Logger';
 import { Utils } from '../../utils/Utils';
-import type { ChargingStation } from '../ChargingStation';
-import { ChargingStationConfigurationUtils } from '../ChargingStationConfigurationUtils';
 
 export class OCPPServiceUtils {
   protected constructor() {

diff --git a/src/charging-station/ocpp/index.ts b/src/charging-station/ocpp/index.ts
index bf43676f2d69b2dd8f6c42a8292f0f4cfda21c21..a7681be65e6a1ad757a2e72cf5e4b50990ed7d70 100644 (file)
--- a/src/charging-station/ocpp/index.ts
+++ b/src/charging-station/ocpp/index.ts
@@ -1,11 +1,13 @@
-export { OCPPIncomingRequestService } from './OCPPIncomingRequestService';
-export { OCPPRequestService } from './OCPPRequestService';
-export { OCPPServiceUtils } from './OCPPServiceUtils';
-export { OCPP16IncomingRequestService } from './1.6/OCPP16IncomingRequestService';
-export { OCPP16RequestService } from './1.6/OCPP16RequestService';
-export { OCPP16ResponseService } from './1.6/OCPP16ResponseService';
-// FIXME: shall not be exported
-export { OCPP16ServiceUtils } from './1.6/OCPP16ServiceUtils';
-export { OCPP20IncomingRequestService } from './2.0/OCPP20IncomingRequestService';
-export { OCPP20RequestService } from './2.0/OCPP20RequestService';
-export { OCPP20ResponseService } from './2.0/OCPP20ResponseService';
+export {
+  OCPP20ResponseService,
+  OCPP20RequestService,
+  OCPP20IncomingRequestService,
+  // FIXME: shall not be exported
+  OCPP16ServiceUtils,
+  OCPPIncomingRequestService,
+  OCPP16ResponseService,
+  OCPPRequestService,
+  OCPPServiceUtils,
+  OCPP16IncomingRequestService,
+  OCPP16RequestService,
+} from './internal';

diff --git a/src/charging-station/ocpp/internal.ts b/src/charging-station/ocpp/internal.ts
new file mode 100644 (file)
index 0000000..c875570
--- /dev/null
+++ b/src/charging-station/ocpp/internal.ts
@@ -0,0 +1,15 @@
+export * from './1.6/OCPP16IncomingRequestService';
+export * from './1.6/OCPP16RequestService';
+export * from './1.6/OCPP16ResponseService';
+export * from './1.6/OCPP16ServiceUtils';
+
+export * from './2.0/OCPP20IncomingRequestService';
+export * from './2.0/OCPP20RequestService';
+export * from './2.0/OCPP20ResponseService';
+export * from './2.0/OCPP20ServiceUtils';
+
+export * from './OCPPConstants';
+export * from './OCPPIncomingRequestService';
+export * from './OCPPRequestService';
+export * from './OCPPResponseService';
+export * from './OCPPServiceUtils';

diff --git a/src/charging-station/ui-server/UIHttpServer.ts b/src/charging-station/ui-server/UIHttpServer.ts
index 08ea7ff080137f5cce8e664a90cb00be272abfb1..546c7642de181d33de56e8f4ea9e214515a2220e 100644 (file)
--- a/src/charging-station/ui-server/UIHttpServer.ts
+++ b/src/charging-station/ui-server/UIHttpServer.ts
@@ -2,7 +2,6 @@ import type { IncomingMessage, RequestListener, ServerResponse } from 'http';
 
 import { StatusCodes } from 'http-status-codes';
 
-import { UIServerUtils } from './UIServerUtils';
 import { BaseError } from '../../exception';
 import {
   type ProcedureName,
@@ -16,7 +15,7 @@ import {
 } from '../../types';
 import { logger } from '../../utils/Logger';
 import { Utils } from '../../utils/Utils';
-import { AbstractUIServer } from '../internal';
+import { AbstractUIServer, UIServerUtils } from '../internal';
 
 const moduleName = 'UIHttpServer';
 

diff --git a/src/charging-station/ui-server/UIServerFactory.ts b/src/charging-station/ui-server/UIServerFactory.ts
index 612054f692caee075917e873f293f14c68f2a8aa..ea95c5274c1977add17726002210e786cf997fd5 100644 (file)
--- a/src/charging-station/ui-server/UIServerFactory.ts
+++ b/src/charging-station/ui-server/UIServerFactory.ts
@@ -1,9 +1,8 @@
 import chalk from 'chalk';
 
-import { UIServerUtils } from './UIServerUtils';
 import { ApplicationProtocol, type UIServerConfiguration } from '../../types';
 import { Configuration } from '../../utils/Configuration';
-import { type AbstractUIServer, UIHttpServer, UIWebSocketServer } from '../internal';
+import { type AbstractUIServer, UIHttpServer, UIServerUtils, UIWebSocketServer } from '../internal';
 
 export class UIServerFactory {
   private constructor() {

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index d5e6ff808afbee13a4f3eee9c35a433203c8247a..c05ec6251278da2d3eed84711f975d7fb6e32ff1 100644 (file)
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -4,7 +4,6 @@ import type internal from 'stream';
 import { StatusCodes } from 'http-status-codes';
 import WebSocket, { type RawData, WebSocketServer } from 'ws';
 
-import { UIServerUtils } from './UIServerUtils';
 import {
   type ProtocolRequest,
   type ProtocolResponse,
@@ -13,7 +12,7 @@ import {
 } from '../../types';
 import { logger } from '../../utils/Logger';
 import { Utils } from '../../utils/Utils';
-import { AbstractUIServer } from '../internal';
+import { AbstractUIServer, UIServerUtils } from '../internal';
 
 const moduleName = 'UIWebSocketServer';
 

diff --git a/src/charging-station/ui-server/ui-services/AbstractUIService.ts b/src/charging-station/ui-server/ui-services/AbstractUIService.ts
index b471b6cc94e783f70a634404b5486b1aa9f30e36..d3d1231d49c578d5b7a32626202fe50208a547c3 100644 (file)
--- a/src/charging-station/ui-server/ui-services/AbstractUIService.ts
+++ b/src/charging-station/ui-server/ui-services/AbstractUIService.ts
@@ -12,8 +12,7 @@ import {
 } from '../../../types';
 import { logger } from '../../../utils/Logger';
 import { Utils } from '../../../utils/Utils';
-import { type AbstractUIServer, Bootstrap } from '../../internal';
-import { UIServiceWorkerBroadcastChannel } from '../../UIServiceWorkerBroadcastChannel';
+import { type AbstractUIServer, Bootstrap, UIServiceWorkerBroadcastChannel } from '../../internal';
 
 const moduleName = 'AbstractUIService';
 

diff --git a/src/exception/OCPPError.ts b/src/exception/OCPPError.ts
index 8ccc4fbf937000220be6cd026c8dec6f7cd9431d..3b23cc3b0d0c18a650a203042810750bd1e89b22 100644 (file)
--- a/src/exception/OCPPError.ts
+++ b/src/exception/OCPPError.ts
@@ -1,6 +1,6 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { BaseError } from './BaseError';
+import { BaseError } from './internal';
 import {
   ErrorType,
   type IncomingRequestCommand,

diff --git a/src/exception/index.ts b/src/exception/index.ts
index 5e5b60caf1743125aea0fdaf94781927e1ef9536..3d4b3f9004cc37d053977c70c8025ef2e457bccd 100644 (file)
--- a/src/exception/index.ts
+++ b/src/exception/index.ts
@@ -1,2 +1 @@
-export { BaseError } from './BaseError';
-export { OCPPError } from './OCPPError';
+export { BaseError, OCPPError } from './internal';

diff --git a/src/exception/internal.ts b/src/exception/internal.ts
new file mode 100644 (file)
index 0000000..49abdfc
--- /dev/null
+++ b/src/exception/internal.ts
@@ -0,0 +1,2 @@
+export * from './BaseError';
+export * from './OCPPError';

diff --git a/src/performance/PerformanceStatistics.ts b/src/performance/PerformanceStatistics.ts
index 79650c8f438bbcfa4a7f49c6643692f5b881211d..cfc19be868e31506eaff4187b5d0025e5d4dd5f6 100644 (file)
--- a/src/performance/PerformanceStatistics.ts
+++ b/src/performance/PerformanceStatistics.ts
@@ -4,7 +4,7 @@ import type { URL } from 'node:url';
 import { PerformanceEntry, PerformanceObserver, performance } from 'perf_hooks';
 import { parentPort } from 'worker_threads';
 
-import { MessageChannelUtils } from '../charging-station/MessageChannelUtils';
+import { MessageChannelUtils } from '../charging-station';
 import {
   type IncomingRequestCommand,
   MessageType,

diff --git a/src/performance/index.ts b/src/performance/index.ts
index 1b61c4652343d38d09747b4c3e429e6d9ad1388f..258dbc01f5912d056633f423bd08ae9403986bbf 100644 (file)
--- a/src/performance/index.ts
+++ b/src/performance/index.ts
@@ -1,3 +1 @@
-export { PerformanceStatistics } from './PerformanceStatistics';
-export { Storage } from './storage/Storage';
-export { StorageFactory } from './storage/StorageFactory';
+export { PerformanceStatistics, type Storage, StorageFactory } from './internal';

diff --git a/src/performance/internal.ts b/src/performance/internal.ts
new file mode 100644 (file)
index 0000000..af79c9c
--- /dev/null
+++ b/src/performance/internal.ts
@@ -0,0 +1,7 @@
+export * from './storage/JsonFileStorage';
+export * from './storage/MikroOrmStorage';
+export * from './storage/MongoDBStorage';
+export * from './storage/Storage';
+export * from './storage/StorageFactory';
+
+export * from './PerformanceStatistics';

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index 3128c862211f4df4866a1426aa53f7208c4219a2..91a2d426e0a0c6b62bb3887317c211e3b7090ab5 100644 (file)
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -4,10 +4,10 @@ import fs from 'node:fs';
 
 import lockfile from 'proper-lockfile';
 
-import { Storage } from './Storage';
 import { FileType, type Statistics } from '../../types';
 import { FileUtils } from '../../utils/FileUtils';
 import { Utils } from '../../utils/Utils';
+import { Storage } from '../internal';
 
 export class JsonFileStorage extends Storage {
   private fd: number | null = null;

diff --git a/src/performance/storage/MikroOrmStorage.ts b/src/performance/storage/MikroOrmStorage.ts
index 5d236f270791761e0fb869da1e26cf5bccd975fc..021bc28b078a658e7e4191d9fae13a2a45c31a84 100644 (file)
--- a/src/performance/storage/MikroOrmStorage.ts
+++ b/src/performance/storage/MikroOrmStorage.ts
@@ -3,7 +3,6 @@
 import { Configuration, Connection, IDatabaseDriver, MikroORM, Options } from '@mikro-orm/core';
 import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
 
-import { Storage } from './Storage';
 import {
   type MikroORMDBType,
   PerformanceData,
@@ -12,6 +11,7 @@ import {
   StorageType,
 } from '../../types';
 import { Constants } from '../../utils/Constants';
+import { Storage } from '../internal';
 
 export class MikroOrmStorage extends Storage {
   private storageType: StorageType;

diff --git a/src/performance/storage/MongoDBStorage.ts b/src/performance/storage/MongoDBStorage.ts
index 32532eadb1f829acad8727e2a58295b55123f4f4..cebab8c722ebef0e84da79117ec1c580421abd54 100644 (file)
--- a/src/performance/storage/MongoDBStorage.ts
+++ b/src/performance/storage/MongoDBStorage.ts
@@ -2,9 +2,9 @@
 
 import { MongoClient } from 'mongodb';
 
-import { Storage } from './Storage';
 import { type Statistics, StorageType } from '../../types';
 import { Constants } from '../../utils/Constants';
+import { Storage } from '../internal';
 
 export class MongoDBStorage extends Storage {
   private readonly client: MongoClient | null;

diff --git a/src/performance/storage/StorageFactory.ts b/src/performance/storage/StorageFactory.ts
index 09b58a15ffcda6b84363216bc2868eb84e6eb09f..5a3b2e128d896fc4fb6294dd3ff4ee505cb28ddf 100644 (file)
--- a/src/performance/storage/StorageFactory.ts
+++ b/src/performance/storage/StorageFactory.ts
@@ -1,10 +1,7 @@
 // Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { JsonFileStorage } from './JsonFileStorage';
-import { MikroOrmStorage } from './MikroOrmStorage';
-import { MongoDBStorage } from './MongoDBStorage';
-import type { Storage } from './Storage';
 import { StorageType } from '../../types';
+import { JsonFileStorage, MikroOrmStorage, MongoDBStorage, type Storage } from '../internal';
 
 export class StorageFactory {
   private constructor() {

diff --git a/src/types/ChargingStationConfiguration.ts b/src/types/ChargingStationConfiguration.ts
index f0107a6573e2aa7331e883b5f8d62b0fa791ea75..095090381a578e894bf87ef219ac5646684acb87 100644 (file)
--- a/src/types/ChargingStationConfiguration.ts
+++ b/src/types/ChargingStationConfiguration.ts
@@ -1,6 +1,8 @@
-import type { ChargingStationAutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
-import type { ChargingStationInfoConfiguration } from './ChargingStationInfo';
-import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration';
+import type {
+  ChargingStationAutomaticTransactionGeneratorConfiguration,
+  ChargingStationInfoConfiguration,
+  ChargingStationOcppConfiguration,
+} from './internal';
 
 export type ChargingStationConfiguration = ChargingStationInfoConfiguration &
   ChargingStationOcppConfiguration &

diff --git a/src/types/ChargingStationInfo.ts b/src/types/ChargingStationInfo.ts
index 29ff6fb719b6f550d600a5275e7d5ff99cb4be9a..0d23c1cf1131de6507a0670f01b26495f1dc8504 100644 (file)
--- a/src/types/ChargingStationInfo.ts
+++ b/src/types/ChargingStationInfo.ts
@@ -1,5 +1,4 @@
-import type { ChargingStationTemplate } from './ChargingStationTemplate';
-import type { FirmwareStatus } from './ocpp/Requests';
+import type { ChargingStationTemplate, FirmwareStatus } from './internal';
 
 export type ChargingStationInfo = Omit<
   ChargingStationTemplate,

diff --git a/src/types/ChargingStationOcppConfiguration.ts b/src/types/ChargingStationOcppConfiguration.ts
index 834b1d1dd11e4031eba25d7af689f88eab3b3639..bbd1bcfb20fa6354ed1a6b27e42be227eec6eefc 100644 (file)
--- a/src/types/ChargingStationOcppConfiguration.ts
+++ b/src/types/ChargingStationOcppConfiguration.ts
@@ -1,4 +1,4 @@
-import type { OCPPConfigurationKey } from './ocpp/Configuration';
+import type { OCPPConfigurationKey } from './internal';
 
 export type ConfigurationKey = OCPPConfigurationKey & {
   visible?: boolean;

diff --git a/src/types/ChargingStationTemplate.ts b/src/types/ChargingStationTemplate.ts
index 5c44ede928435031caf6d445fdaf03a0f7602e62..36a481ff6ed41299ea5c69bcca64767438b55eee 100644 (file)
--- a/src/types/ChargingStationTemplate.ts
+++ b/src/types/ChargingStationTemplate.ts
@@ -2,17 +2,17 @@ import type { ClientRequestArgs } from 'http';
 
 import type { ClientOptions } from 'ws';
 
-import type { AutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
-import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration';
-import type { ConnectorStatus } from './ConnectorStatus';
-import type { OCPPProtocol } from './ocpp/OCPPProtocol';
-import type { OCPPVersion } from './ocpp/OCPPVersion';
 import type {
+  AutomaticTransactionGeneratorConfiguration,
+  ChargingStationOcppConfiguration,
+  ConnectorStatus,
   FirmwareStatus,
   IncomingRequestCommand,
   MessageTrigger,
+  OCPPProtocol,
+  OCPPVersion,
   RequestCommand,
-} from './ocpp/Requests';
+} from './internal';
 
 export enum CurrentType {
   AC = 'AC',

diff --git a/src/types/ChargingStationWorker.ts b/src/types/ChargingStationWorker.ts
index 9a9d357463a0fb5f5c246e4208a557c492f3ee31..cd2cb0058993ffb4ba6923a4b9f7b36c33f5814f 100644 (file)
--- a/src/types/ChargingStationWorker.ts
+++ b/src/types/ChargingStationWorker.ts
@@ -1,11 +1,13 @@
 import type { WebSocket } from 'ws';
 
-import type { ChargingStationAutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
-import type { ChargingStationInfo } from './ChargingStationInfo';
-import type { ConnectorStatus } from './ConnectorStatus';
-import type { JsonObject } from './JsonType';
-import type { BootNotificationResponse } from './ocpp/Responses';
-import type { Statistics } from './Statistics';
+import type {
+  BootNotificationResponse,
+  ChargingStationAutomaticTransactionGeneratorConfiguration,
+  ChargingStationInfo,
+  ConnectorStatus,
+  JsonObject,
+  Statistics,
+} from './internal';
 import { type WorkerData, type WorkerMessage, WorkerMessageEvents } from '../worker';
 
 export interface ChargingStationWorkerOptions extends JsonObject {

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index 9688010a7e6fcd13593a26cacc95178421d60067..0e70094bd8719aa5b57933f5ebe5fbecd1a5c176 100644 (file)
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -2,8 +2,7 @@ import type { ListenOptions } from 'net';
 
 import type { WorkerChoiceStrategy } from 'poolifier';
 
-import type { StorageType } from './Storage';
-import type { ApplicationProtocol, AuthenticationType } from './UIProtocol';
+import type { ApplicationProtocol, AuthenticationType, StorageType } from './internal';
 import type { WorkerProcessType } from '../worker';
 
 export type ServerOptions = ListenOptions;

diff --git a/src/types/ConnectorStatus.ts b/src/types/ConnectorStatus.ts
index d7698107b9cc2146677db9624f66ae174d8c9dd8..02ee914e8759557f942cf2e671df737064674be0 100644 (file)
--- a/src/types/ConnectorStatus.ts
+++ b/src/types/ConnectorStatus.ts
@@ -1,8 +1,10 @@
-import type { SampledValueTemplate } from './MeasurandPerPhaseSampledValueTemplates';
-import type { ChargingProfile } from './ocpp/ChargingProfile';
-import type { ConnectorStatusEnum } from './ocpp/ConnectorStatusEnum';
-import type { MeterValue } from './ocpp/MeterValues';
-import type { AvailabilityType } from './ocpp/Requests';
+import type {
+  AvailabilityType,
+  ChargingProfile,
+  ConnectorStatusEnum,
+  MeterValue,
+  SampledValueTemplate,
+} from './internal';
 
 export type ConnectorStatus = {
   availability: AvailabilityType;

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index 782adae2465611ae5daf649c48ae61937937f250..f43da99b81e8298449fd7c538a47449163e6bd81 100644 (file)
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -1,4 +1,4 @@
-import type { IncomingRequestCommand, RequestCommand } from './ocpp/Requests';
+import type { IncomingRequestCommand, RequestCommand } from './internal';
 import type { CircularArray } from '../utils/CircularArray';
 import type { WorkerData } from '../worker';
 

diff --git a/src/types/UIProtocol.ts b/src/types/UIProtocol.ts
index 3b6592a5765a480965c62e645e210ca870703176..204051613d3305664fb808f42c5c66a70854ee1a 100644 (file)
--- a/src/types/UIProtocol.ts
+++ b/src/types/UIProtocol.ts
@@ -1,5 +1,4 @@
-import type { JsonObject } from './JsonType';
-import type { BroadcastChannelResponsePayload } from './WorkerBroadcastChannel';
+import type { BroadcastChannelResponsePayload, JsonObject } from './internal';
 
 export enum Protocol {
   UI = 'ui',

diff --git a/src/types/WorkerBroadcastChannel.ts b/src/types/WorkerBroadcastChannel.ts
index 2c174cd5fae6f594f38e1dfc60d82952d99a331d..3656fe3a9a1e8618375271002850ccd407a6e5fc 100644 (file)
--- a/src/types/WorkerBroadcastChannel.ts
+++ b/src/types/WorkerBroadcastChannel.ts
@@ -1,4 +1,4 @@
-import type { RequestPayload, ResponsePayload } from './UIProtocol';
+import type { RequestPayload, ResponsePayload } from './internal';
 
 export type BroadcastChannelRequest = [
   string,

diff --git a/src/types/index.ts b/src/types/index.ts
index f0a947a4e30ae4ab4d579611e0985e0cf003df58..d4ae9b14ece6a7a697ea5f5f5aefdfcf4abf7c49 100644 (file)
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,45 +1 @@
-export * from './ocpp/ChargePointErrorCode';
-export * from './ocpp/ChargingProfile';
-export * from './ocpp/Configuration';
-export * from './ocpp/ConnectorStatusEnum';
-export * from './ocpp/ErrorType';
-export * from './ocpp/MessageType';
-export * from './ocpp/MeterValues';
-export * from './ocpp/OCPPProtocol';
-export * from './ocpp/OCPPVersion';
-export * from './ocpp/Requests';
-export * from './ocpp/Responses';
-export * from './ocpp/Transaction';
-export * from './ocpp/1.6/ChargePointErrorCode';
-export * from './ocpp/1.6/ChargePointStatus';
-export * from './ocpp/1.6/ChargingProfile';
-export * from './ocpp/1.6/Configuration';
-export * from './ocpp/1.6/DiagnosticsStatus';
-export * from './ocpp/1.6/MeterValues';
-export * from './ocpp/1.6/Requests';
-export * from './ocpp/1.6/Responses';
-export * from './ocpp/1.6/Transaction';
-export * from './ocpp/2.0/Requests';
-export * from './ocpp/2.0/Responses';
-export * from './ocpp/2.0/Variables';
-export * from './orm/entities/PerformanceData';
-export * from './orm/entities/PerformanceRecord';
-export * from './AutomaticTransactionGenerator';
-export * from './ChargingStationConfiguration';
-export * from './ChargingStationInfo';
-export * from './ChargingStationOcppConfiguration';
-export * from './ChargingStationTemplate';
-export * from './ChargingStationWorker';
-export * from './ConfigurationData';
-export * from './ConnectorStatus';
-export * from './EmptyObject';
-export * from './Error';
-export * from './FileType';
-export * from './JsonType';
-export * from './MeasurandPerPhaseSampledValueTemplates';
-export * from './MeasurandValues';
-export * from './Statistics';
-export * from './Storage';
-export * from './UIProtocol';
-export * from './WebSocket';
-export * from './WorkerBroadcastChannel';
+export * from './internal';

diff --git a/src/types/internal.ts b/src/types/internal.ts
new file mode 100644 (file)
index 0000000..105c983
--- /dev/null
+++ b/src/types/internal.ts
@@ -0,0 +1,45 @@
+export * from './ocpp/1.6/ChargePointErrorCode';
+export * from './ocpp/1.6/ChargePointStatus';
+export * from './ocpp/1.6/ChargingProfile';
+export * from './ocpp/1.6/Configuration';
+export * from './ocpp/1.6/DiagnosticsStatus';
+export * from './ocpp/1.6/MeterValues';
+export * from './ocpp/1.6/Requests';
+export * from './ocpp/1.6/Responses';
+export * from './ocpp/1.6/Transaction';
+export * from './ocpp/2.0/Requests';
+export * from './ocpp/2.0/Responses';
+export * from './ocpp/2.0/Variables';
+export * from './ocpp/ChargePointErrorCode';
+export * from './ocpp/ChargingProfile';
+export * from './ocpp/Configuration';
+export * from './ocpp/ConnectorStatusEnum';
+export * from './ocpp/ErrorType';
+export * from './ocpp/MessageType';
+export * from './ocpp/MeterValues';
+export * from './ocpp/OCPPProtocol';
+export * from './ocpp/OCPPVersion';
+export * from './ocpp/Requests';
+export * from './ocpp/Responses';
+export * from './ocpp/Transaction';
+export * from './orm/entities/PerformanceData';
+export * from './orm/entities/PerformanceRecord';
+export * from './AutomaticTransactionGenerator';
+export * from './ChargingStationConfiguration';
+export * from './ChargingStationInfo';
+export * from './ChargingStationOcppConfiguration';
+export * from './ChargingStationTemplate';
+export * from './ChargingStationWorker';
+export * from './ConfigurationData';
+export * from './ConnectorStatus';
+export * from './EmptyObject';
+export * from './Error';
+export * from './FileType';
+export * from './JsonType';
+export * from './MeasurandPerPhaseSampledValueTemplates';
+export * from './MeasurandValues';
+export * from './Statistics';
+export * from './Storage';
+export * from './UIProtocol';
+export * from './WebSocket';
+export * from './WorkerBroadcastChannel';

diff --git a/src/types/ocpp/1.6/ChargingProfile.ts b/src/types/ocpp/1.6/ChargingProfile.ts
index 529bfd1da5eaf7cac6d566de0080316189bdfc1e..1b925bca72edec5f9b705a94a4addba52edc0fae 100644 (file)
--- a/src/types/ocpp/1.6/ChargingProfile.ts
+++ b/src/types/ocpp/1.6/ChargingProfile.ts
@@ -1,4 +1,4 @@
-import type { JsonObject } from '../../JsonType';
+import type { JsonObject } from '../../internal';
 
 export interface OCPP16ChargingProfile extends JsonObject {
   chargingProfileId: number;

diff --git a/src/types/ocpp/1.6/MeterValues.ts b/src/types/ocpp/1.6/MeterValues.ts
index 0cfca50e1ee8aeb2ac0ce42654a83ffc3d1d64fc..9fcff5e3fe05a2518520490709c86c3cd7d3af56 100644 (file)
--- a/src/types/ocpp/1.6/MeterValues.ts
+++ b/src/types/ocpp/1.6/MeterValues.ts
@@ -1,5 +1,4 @@
-import type { EmptyObject } from '../../EmptyObject';
-import type { JsonObject } from '../../JsonType';
+import type { EmptyObject, JsonObject } from '../../internal';
 
 export enum MeterValueUnit {
   WATT_HOUR = 'Wh',

diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts
index 89316dc6b656459530cfefa5bf1409cd7f6f4e9a..079c1dbb6de630540eb2e3e6662963641b3fab2d 100644 (file)
--- a/src/types/ocpp/1.6/Requests.ts
+++ b/src/types/ocpp/1.6/Requests.ts
@@ -1,10 +1,13 @@
-import type { OCPP16ChargePointErrorCode } from './ChargePointErrorCode';
-import type { OCPP16ChargePointStatus } from './ChargePointStatus';
-import type { ChargingProfilePurposeType, OCPP16ChargingProfile } from './ChargingProfile';
-import type { OCPP16StandardParametersKey } from './Configuration';
-import type { OCPP16DiagnosticsStatus } from './DiagnosticsStatus';
-import type { EmptyObject } from '../../EmptyObject';
-import type { JsonObject } from '../../JsonType';
+import type {
+  ChargingProfilePurposeType,
+  EmptyObject,
+  JsonObject,
+  OCPP16ChargePointErrorCode,
+  OCPP16ChargePointStatus,
+  OCPP16ChargingProfile,
+  OCPP16DiagnosticsStatus,
+  OCPP16StandardParametersKey,
+} from '../../internal';
 
 export enum OCPP16RequestCommand {
   BOOT_NOTIFICATION = 'BootNotification',

diff --git a/src/types/ocpp/1.6/Responses.ts b/src/types/ocpp/1.6/Responses.ts
index 84648e47e5d90b4ffd83d3def6f831098802b084..1724ce18ba87382495ed2d730f125b94b35c0c66 100644 (file)
--- a/src/types/ocpp/1.6/Responses.ts
+++ b/src/types/ocpp/1.6/Responses.ts
@@ -1,7 +1,9 @@
-import type { EmptyObject } from '../../EmptyObject';
-import type { JsonObject } from '../../JsonType';
-import type { OCPPConfigurationKey } from '../Configuration';
-import type { RegistrationStatusEnumType } from '../Responses';
+import type {
+  EmptyObject,
+  JsonObject,
+  OCPPConfigurationKey,
+  RegistrationStatusEnumType,
+} from '../../internal';
 
 export interface OCPP16HeartbeatResponse extends JsonObject {
   currentTime: Date;

diff --git a/src/types/ocpp/1.6/Transaction.ts b/src/types/ocpp/1.6/Transaction.ts
index e2aa3d81c0ef718836526d1e1d38512aad25d7bb..8824d1bc07499c7d0d52258c9ba8b0ab09d493fc 100644 (file)
--- a/src/types/ocpp/1.6/Transaction.ts
+++ b/src/types/ocpp/1.6/Transaction.ts
@@ -1,5 +1,4 @@
-import type { OCPP16MeterValue } from './MeterValues';
-import type { JsonObject } from '../../JsonType';
+import type { JsonObject, OCPP16MeterValue } from '../../internal';
 
 export enum OCPP16StopTransactionReason {
   NONE = '',

diff --git a/src/types/ocpp/2.0/Requests.ts b/src/types/ocpp/2.0/Requests.ts
index 407fdfe4482bb1e9cb5b157bfe1e6b3523af0a60..c42cd8bbbb9aa4c41912e88d1f7c14482ad1a7f6 100644 (file)
--- a/src/types/ocpp/2.0/Requests.ts
+++ b/src/types/ocpp/2.0/Requests.ts
@@ -1,5 +1,4 @@
-import type { EmptyObject } from '../../EmptyObject';
-import type { JsonObject } from '../../JsonType';
+import type { EmptyObject, JsonObject } from '../../internal';
 
 export enum OCPP20RequestCommand {
   BOOT_NOTIFICATION = 'BootNotification',

diff --git a/src/types/ocpp/2.0/Responses.ts b/src/types/ocpp/2.0/Responses.ts
index 04cd462b50850a43186d341b1b5c9ff647887b25..3f4d2f4274cc4c36dd73f51f303cb3ea773b5be6 100644 (file)
--- a/src/types/ocpp/2.0/Responses.ts
+++ b/src/types/ocpp/2.0/Responses.ts
@@ -1,6 +1,9 @@
-import type { EmptyObject } from '../../EmptyObject';
-import type { JsonObject } from '../../JsonType';
-import type { GenericStatus, RegistrationStatusEnumType } from '../Responses';
+import type {
+  EmptyObject,
+  GenericStatus,
+  JsonObject,
+  RegistrationStatusEnumType,
+} from '../../internal';
 
 export type StatusInfoType = {
   reasonCode: string;

diff --git a/src/types/ocpp/ChargePointErrorCode.ts b/src/types/ocpp/ChargePointErrorCode.ts
index d08f17a07121c078011db81253e1c9c6f51ab03d..9e70845d8221b0994c982c9ff68bdc33ab60d295 100644 (file)
--- a/src/types/ocpp/ChargePointErrorCode.ts
+++ b/src/types/ocpp/ChargePointErrorCode.ts
@@ -1,4 +1,4 @@
-import { OCPP16ChargePointErrorCode } from './1.6/ChargePointErrorCode';
+import { OCPP16ChargePointErrorCode } from '../internal';
 
 export const ChargePointErrorCode = {
   ...OCPP16ChargePointErrorCode,

diff --git a/src/types/ocpp/ChargingProfile.ts b/src/types/ocpp/ChargingProfile.ts
index 837102728a81163abd1e7d3684f97c40ed04c1ec..643e38dbeba75a255fab03c89913e3a9217990f9 100644 (file)
--- a/src/types/ocpp/ChargingProfile.ts
+++ b/src/types/ocpp/ChargingProfile.ts
@@ -2,7 +2,7 @@ import {
   type OCPP16ChargingProfile,
   OCPP16ChargingRateUnitType,
   type OCPP16ChargingSchedulePeriod,
-} from './1.6/ChargingProfile';
+} from '../internal';
 
 export type ChargingProfile = OCPP16ChargingProfile;
 

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index 9aeb91dc79d942f36df1e83a71574ab92cf33adb..297b403c39dec73fb62424c53a81b429ef160840 100644 (file)
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,14 +1,12 @@
 import {
+  type JsonObject,
   OCPP16StandardParametersKey,
   OCPP16SupportedFeatureProfiles,
   OCPP16VendorDefaultParametersKey,
-} from './1.6/Configuration';
-import {
   OCPP20OptionalVariableName,
   OCPP20RequiredVariableName,
   OCPP20VendorVariableName,
-} from './2.0/Variables';
-import type { JsonObject } from '../JsonType';
+} from '../internal';
 
 export const StandardParametersKey = {
   ...OCPP16StandardParametersKey,

diff --git a/src/types/ocpp/ConnectorStatusEnum.ts b/src/types/ocpp/ConnectorStatusEnum.ts
index 929d59cd7ae7ae83102d278859c207c786efee9e..a98e15d98b42409c2ec35d35edc1c5206d3fb46e 100644 (file)
--- a/src/types/ocpp/ConnectorStatusEnum.ts
+++ b/src/types/ocpp/ConnectorStatusEnum.ts
@@ -1,5 +1,4 @@
-import { OCPP16ChargePointStatus } from './1.6/ChargePointStatus';
-import { OCPP20ConnectorStatusEnumType } from './2.0/Requests';
+import { OCPP16ChargePointStatus, OCPP20ConnectorStatusEnumType } from '../internal';
 
 export const ConnectorStatusEnum = {
   ...OCPP16ChargePointStatus,

diff --git a/src/types/ocpp/MeterValues.ts b/src/types/ocpp/MeterValues.ts
index f34a8c176fd3cf711ee158bad3f9ac2e0f950c3e..10b8323df4fefac9eab9bf9719657562ccfe1389 100644 (file)
--- a/src/types/ocpp/MeterValues.ts
+++ b/src/types/ocpp/MeterValues.ts
@@ -3,7 +3,7 @@ import {
   OCPP16MeterValueMeasurand,
   OCPP16MeterValuePhase,
   type OCPP16SampledValue,
-} from './1.6/MeterValues';
+} from '../internal';
 
 export const MeterValueMeasurand = {
   ...OCPP16MeterValueMeasurand,

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 8ef05664964013164f14264aa0f16b9ea2f2da21..ff238094f3e5186415d05e6e497ae7ec8fb4996f 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,28 +1,26 @@
-import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
+import type { ChargingStation } from '../../charging-station';
+import type { OCPPError } from '../../exception';
 import {
+  type JsonType,
+  type MessageType,
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
   type OCPP16DataTransferRequest,
+  OCPP16DiagnosticsStatus,
   type OCPP16DiagnosticsStatusNotificationRequest,
   OCPP16FirmwareStatus,
   type OCPP16FirmwareStatusNotificationRequest,
   type OCPP16HeartbeatRequest,
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
+  type OCPP16MeterValuesRequest,
   OCPP16RequestCommand,
   type OCPP16StatusNotificationRequest,
-} from './1.6/Requests';
-import {
   type OCPP20BootNotificationRequest,
   OCPP20IncomingRequestCommand,
   OCPP20RequestCommand,
   type OCPP20StatusNotificationRequest,
-} from './2.0/Requests';
-import type { MessageType } from './MessageType';
-import type { ChargingStation } from '../../charging-station/ChargingStation';
-import type { OCPPError } from '../../exception';
-import type { JsonType } from '../JsonType';
+} from '../internal';
 
 export const RequestCommand = {
   ...OCPP16RequestCommand,

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index c61b5463469bd059c9280e8cf9629a052d3a8794..ae6ae45d67d6404b9ac9f6153d8af8550d438191 100644 (file)
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,5 +1,8 @@
-import type { OCPP16MeterValuesResponse } from './1.6/MeterValues';
+import type { ChargingStation } from '../../charging-station';
 import {
+  type ErrorType,
+  type JsonType,
+  type MessageType,
   OCPP16AvailabilityStatus,
   type OCPP16BootNotificationResponse,
   OCPP16ChargingProfileStatus,
@@ -10,19 +13,14 @@ import {
   type OCPP16DiagnosticsStatusNotificationResponse,
   type OCPP16FirmwareStatusNotificationResponse,
   type OCPP16HeartbeatResponse,
+  type OCPP16MeterValuesResponse,
   type OCPP16StatusNotificationResponse,
   OCPP16TriggerMessageStatus,
   OCPP16UnlockStatus,
-} from './1.6/Responses';
-import type {
-  OCPP20BootNotificationResponse,
-  OCPP20ClearCacheResponse,
-  OCPP20StatusNotificationResponse,
-} from './2.0/Responses';
-import type { ErrorType } from './ErrorType';
-import type { MessageType } from './MessageType';
-import type { ChargingStation } from '../../charging-station/ChargingStation';
-import type { JsonType } from '../JsonType';
+  type OCPP20BootNotificationResponse,
+  type OCPP20ClearCacheResponse,
+  type OCPP20StatusNotificationResponse,
+} from '../internal';
 
 export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType];
 

diff --git a/src/types/ocpp/Transaction.ts b/src/types/ocpp/Transaction.ts
index 2a8a0ad46648978d3fe8b0fbab43f3cf008b812d..1ce9d987e6b11431904c32137e820983f993e0c8 100644 (file)
--- a/src/types/ocpp/Transaction.ts
+++ b/src/types/ocpp/Transaction.ts
@@ -7,7 +7,7 @@ import {
   OCPP16StopTransactionReason,
   type OCPP16StopTransactionRequest,
   type OCPP16StopTransactionResponse,
-} from './1.6/Transaction';
+} from '../internal';
 
 export const AuthorizationStatus = {
   ...OCPP16AuthorizationStatus,

diff --git a/src/types/orm/entities/PerformanceData.ts b/src/types/orm/entities/PerformanceData.ts
index fc7268aa5e2c2a20e9d91196cd5310ff9cbff8ce..ef847e743897abdadddbcb0b2c55c97a08c4ec20 100644 (file)
--- a/src/types/orm/entities/PerformanceData.ts
+++ b/src/types/orm/entities/PerformanceData.ts
@@ -1,6 +1,6 @@
 import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
 
-import type { PerformanceRecord } from './PerformanceRecord';
+import type { PerformanceRecord } from '../../internal';
 
 @Entity()
 export class PerformanceData {

diff --git a/src/types/orm/entities/PerformanceRecord.ts b/src/types/orm/entities/PerformanceRecord.ts
index 06114da6be0a602422504d2e238a6b3792cae81a..1369377d7207db7b4484058aa9607f52fe7f50ae 100644 (file)
--- a/src/types/orm/entities/PerformanceRecord.ts
+++ b/src/types/orm/entities/PerformanceRecord.ts
@@ -1,6 +1,6 @@
 import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
 
-import type { PerformanceData } from './PerformanceData';
+import type { PerformanceData } from '../../internal';
 
 @Entity()
 export class PerformanceRecord {

diff --git a/src/worker/index.ts b/src/worker/index.ts
index 9fa370555ca23416422c3a1e4112595f37a6fbad..036ddaf168f69253e2618153617ad6f75bb38b49 100644 (file)
--- a/src/worker/index.ts
+++ b/src/worker/index.ts
@@ -1,10 +1,10 @@
-export { WorkerAbstract } from './WorkerAbstract';
+export type { WorkerAbstract } from './WorkerAbstract';
 export { WorkerConstants } from './WorkerConstants';
 export { WorkerFactory } from './WorkerFactory';
 export {
   WorkerProcessType,
-  WorkerData,
-  WorkerMessage,
+  type WorkerData,
+  type WorkerMessage,
   WorkerMessageEvents,
-  MessageHandler,
+  type MessageHandler,
 } from './WorkerTypes';