X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FConfiguration.ts;h=ac8a094508bfa15fe57eac1a2a1bdda844c1f145;hb=5a15db9001b93665ab7581d2974c5f01a9e0fbe3;hp=5aa96818854d02fcff2373345c5fb7f15c4ddf07;hpb=3e0905a14af7b7e0a96e859d6c4c615044845d54;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index 5aa96818..ac8a0945 100644
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,28 +1,35 @@
 import {
   OCPP16StandardParametersKey,
   OCPP16SupportedFeatureProfiles,
-  OCPP16VendorDefaultParametersKey,
-} from './1.6/Configuration';
-
-import { JsonObject } from '../JsonType';
-
-export type StandardParametersKey = OCPP16StandardParametersKey;
+  OCPP16VendorParametersKey
+} from './1.6/Configuration.js'
+import {
+  OCPP20OptionalVariableName,
+  OCPP20RequiredVariableName,
+  OCPP20VendorVariableName
+} from './2.0/Variables.js'
+import type { JsonObject } from '../JsonType.js'
 
 export const StandardParametersKey = {
   ...OCPP16StandardParametersKey,
-};
-
-export type VendorDefaultParametersKey = OCPP16VendorDefaultParametersKey;
-
-export const VendorDefaultParametersKey = {
-  ...OCPP16VendorDefaultParametersKey,
-};
-
-export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles;
+  ...OCPP20RequiredVariableName,
+  ...OCPP20OptionalVariableName
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type StandardParametersKey = OCPP16StandardParametersKey
+
+export const VendorParametersKey = {
+  ...OCPP16VendorParametersKey,
+  ...OCPP20VendorVariableName
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type VendorParametersKey = OCPP16VendorParametersKey
 
 export const SupportedFeatureProfiles = {
-  ...OCPP16SupportedFeatureProfiles,
-};
+  ...OCPP16SupportedFeatureProfiles
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles
 
 export enum ConnectorPhaseRotation {
   NotApplicable = 'NotApplicable',
@@ -32,11 +39,13 @@ export enum ConnectorPhaseRotation {
   SRT = 'SRT',
   STR = 'STR',
   TRS = 'TRS',
-  TSR = 'TSR',
+  TSR = 'TSR'
 }
 
-export interface OCPPConfigurationKey extends JsonObject {
-  key: string | StandardParametersKey;
-  readonly: boolean;
-  value?: string;
-}
+export type ConfigurationKeyType = string | StandardParametersKey | VendorParametersKey
+
+export type OCPPConfigurationKey = {
+  key: ConfigurationKeyType
+  readonly: boolean
+  value?: string
+} & JsonObject