Fix some types definition.

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

diff --git a/src/types/ocpp/ChargePointErrorCode.ts b/src/types/ocpp/ChargePointErrorCode.ts
index 30d91ad84d03135bd177a23c25bd3ef9208d2a8f..016e51d9d5d16569b6f775c765497c3cad602f5e 100644 (file)
--- a/src/types/ocpp/ChargePointErrorCode.ts
+++ b/src/types/ocpp/ChargePointErrorCode.ts
@@ -1,6 +1,6 @@
 import { OCPP16ChargePointErrorCode } from './1.6/ChargePointErrorCode';
 
-export type ChargePointErrorCode = typeof ChargePointErrorCode;
+export type ChargePointErrorCode = OCPP16ChargePointErrorCode;
 
 export const ChargePointErrorCode = {
   ...OCPP16ChargePointErrorCode

diff --git a/src/types/ocpp/ChargePointStatus.ts b/src/types/ocpp/ChargePointStatus.ts
index 595edc415a1e21aa68690b9f6be6e4f7d9ee97d5..daa9779bed14bc3819e855e50e03157ec52565a2 100644 (file)
--- a/src/types/ocpp/ChargePointStatus.ts
+++ b/src/types/ocpp/ChargePointStatus.ts
@@ -1,6 +1,6 @@
 import { OCPP16ChargePointStatus } from './1.6/ChargePointStatus';
 
-export type ChargePointStatus = typeof ChargePointStatus;
+export type ChargePointStatus = OCPP16ChargePointStatus;
 
 export const ChargePointStatus = {
   ...OCPP16ChargePointStatus

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index 54fba5a2edbe6c030a4c626c1adee61bfed3d6d3..f486532574c4a9355b6b95f137f18c3e825ce564 100644 (file)
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,6 +1,6 @@
 import { OCPP16StandardParametersKey } from './1.6/Configuration';
 
-export type StandardParametersKey = typeof StandardParametersKey;
+export type StandardParametersKey = OCPP16StandardParametersKey;
 
 export const StandardParametersKey = {
   ...OCPP16StandardParametersKey

diff --git a/src/types/ocpp/MeterValues.ts b/src/types/ocpp/MeterValues.ts
index c8c283860f7776108483a7d4b912d7b5daff0891..b052ce694beaf94617bce80dd1266052eb3fcb64 100644 (file)
--- a/src/types/ocpp/MeterValues.ts
+++ b/src/types/ocpp/MeterValues.ts
@@ -1,6 +1,6 @@
 import { OCPP16MeterValueMeasurand, OCPP16SampledValue } from './1.6/MeterValues';
 
-export type MeterValueMeasurand = typeof MeterValueMeasurand;
+export type MeterValueMeasurand = OCPP16MeterValueMeasurand;
 
 export const MeterValueMeasurand = {
   ...OCPP16MeterValueMeasurand

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 8292156d500b3295d45a404e4ec2746c44d4b313..d4388efe7c9c957aa3a1a4fe82374e608cea6881 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -9,19 +9,19 @@ export default interface Requests {
 
 export type BootNotificationRequest = OCPP16BootNotificationRequest;
 
-export type AvailabilityType = typeof AvailabilityType;
+export type AvailabilityType = OCPP16AvailabilityType;
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType
 };
 
-export type RequestCommand = typeof RequestCommand;
+export type RequestCommand = OCPP16RequestCommand;
 
 export const RequestCommand = {
   ...OCPP16RequestCommand
 };
 
-export type IncomingRequestCommand = typeof IncomingRequestCommand;
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
 
 export const IncomingRequestCommand = {
   ...OCPP16IncomingRequestCommand

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index 7e0a3c32dd621a9e4fb4307b9d127dd982805e7c..d134f545de2e9118152f348fe634ae14c79af428 100644 (file)
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -2,7 +2,7 @@ import { OCPP16BootNotificationResponse, OCPP16RegistrationStatus } from './1.6/
 
 export type BootNotificationResponse = OCPP16BootNotificationResponse;
 
-export type RegistrationStatus = typeof RegistrationStatus;
+export type RegistrationStatus = OCPP16RegistrationStatus;
 
 export const RegistrationStatus = {
   ...OCPP16RegistrationStatus

diff --git a/src/types/ocpp/Transaction.ts b/src/types/ocpp/Transaction.ts
index cca05a395c0e54f475782661092fac9008d984f3..83764a21f73e9eb4b8187ccc9fd46eaf50f3e4b1 100644 (file)
--- a/src/types/ocpp/Transaction.ts
+++ b/src/types/ocpp/Transaction.ts
@@ -1,6 +1,6 @@
 import { OCPP16AuthorizationStatus, OCPP16AuthorizeResponse, OCPP16StartTransactionResponse, OCPP16StopTransactionReason, OCPP16StopTransactionResponse } from './1.6/Transaction';
 
-export type AuthorizationStatus = typeof AuthorizationStatus;
+export type AuthorizationStatus = OCPP16AuthorizationStatus;
 
 export const AuthorizationStatus = {
   ...OCPP16AuthorizationStatus,
@@ -8,7 +8,7 @@ export const AuthorizationStatus = {
 
 export type AuthorizeResponse = OCPP16AuthorizeResponse;
 
-export type StopTransactionReason = typeof StopTransactionReason;
+export type StopTransactionReason = OCPP16StopTransactionReason;
 
 export const StopTransactionReason = {
   ...OCPP16StopTransactionReason,