Merge dependabot/npm_and_yarn/ui/web/jsdom-23.1.0 into combined-prs-branch

[e-mobility-charging-stations-simulator.git] / src / types / ocpp / Configuration.ts

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index aa50c75222623680885bb8e0b85950150dae0181..75062774d57b0871d7a2d595b4e5bdd5d1590a9f 100644 (file)
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,24 +1,35 @@
-import type { JsonObject } from '../JsonType';
 import {
   OCPP16StandardParametersKey,
   OCPP16SupportedFeatureProfiles,
-  OCPP16VendorDefaultParametersKey,
-} from './1.6/Configuration';
+  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,
-} as const;
-export type StandardParametersKey = OCPP16StandardParametersKey;
+  ...OCPP20RequiredVariableName,
+  ...OCPP20OptionalVariableName
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type StandardParametersKey = OCPP16StandardParametersKey
 
-export const VendorDefaultParametersKey = {
-  ...OCPP16VendorDefaultParametersKey,
-} as const;
-export type VendorDefaultParametersKey = OCPP16VendorDefaultParametersKey;
+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;
-export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles;
+  ...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 JsonObject {
-  key: string | StandardParametersKey;
-  readonly: boolean;
-  value?: string;
-}
+export type ConfigurationKeyType = string | StandardParametersKey | VendorParametersKey
+
+export type OCPPConfigurationKey = {
+  key: ConfigurationKeyType
+  readonly: boolean
+  value?: string
+} & JsonObject