From 6415403ce9894b9a1d7d5d5f698483e58463370f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Wed, 11 Jan 2023 00:19:38 +0100
Subject: [PATCH] Convert some type definitions to type syntax
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/types/Statistics.ts         | 4 ++--
 src/types/ocpp/2.0/Requests.ts  | 2 +-
 src/types/ocpp/Configuration.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/types/Statistics.ts b/src/types/Statistics.ts
index f5a13ebb..fb9ededb 100644
--- a/src/types/Statistics.ts
+++ b/src/types/Statistics.ts
@@ -23,11 +23,11 @@ export type StatisticsData = {
   stdDevTimeMeasurement: number;
 };
 
-export type Statistics = WorkerData & {
+export type Statistics = {
   id: string;
   name: string;
   uri: string;
   createdAt: Date;
   updatedAt?: Date;
   statisticsData: Map<string | RequestCommand | IncomingRequestCommand, Partial<StatisticsData>>;
-};
+} & WorkerData;
diff --git a/src/types/ocpp/2.0/Requests.ts b/src/types/ocpp/2.0/Requests.ts
index 1b30a976..407fdfe4 100644
--- a/src/types/ocpp/2.0/Requests.ts
+++ b/src/types/ocpp/2.0/Requests.ts
@@ -60,4 +60,4 @@ export type OCPP20StatusNotificationRequest = {
   connectorStatus: OCPP20ConnectorStatusEnumType;
   evseId: number;
   connectorId: number;
-};
+} & JsonObject;
diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index aa50c752..6289a77d 100644
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -31,8 +31,8 @@ export enum ConnectorPhaseRotation {
   TSR = 'TSR',
 }
 
-export interface OCPPConfigurationKey extends JsonObject {
+export type OCPPConfigurationKey = {
   key: string | StandardParametersKey;
   readonly: boolean;
   value?: string;
-}
+} & JsonObject;
-- 
2.34.1