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

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index b13a24ba..ac8a0945 100644
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,24 +1,35 @@
-import { OCPP16StandardParametersKey, OCPP16SupportedFeatureProfiles, OCPP16VendorDefaultParametersKey } from './1.6/Configuration';
-
-import { JsonType } from '../JsonType';
-
-export type StandardParametersKey = OCPP16StandardParametersKey;
+import {
+  OCPP16StandardParametersKey,
+  OCPP16SupportedFeatureProfiles,
+  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;
+  ...OCPP16StandardParametersKey,
+  ...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
-};
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles
 
 export enum ConnectorPhaseRotation {
   NotApplicable = 'NotApplicable',
@@ -31,8 +42,10 @@ export enum ConnectorPhaseRotation {
   TSR = 'TSR'
 }
 
-export interface OCPPConfigurationKey extends JsonType {
-  key: string | StandardParametersKey;
-  readonly: boolean;
-  value?: string;
-}
+export type ConfigurationKeyType = string | StandardParametersKey | VendorParametersKey
+
+export type OCPPConfigurationKey = {
+  key: ConfigurationKeyType
+  readonly: boolean
+  value?: string
+} & JsonObject