From dbf573181510a19edda0bf76aee6e8553a06c60e Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Thu, 16 Apr 2026 01:43:43 +0200
Subject: [PATCH] =?utf8?q?refactor(web):=20eliminate=20type=20barrel=20?=
 =?utf8?q?=E2=80=94=20direct=20imports=20from=20ui-common=20and=20source?=
 =?utf8?q?=20modules?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ui/common/src/types/JsonType.ts               |  6 ++-
 .../actions/AddChargingStations.vue           |  4 +-
 .../components/actions/StartTransaction.vue   |  2 +-
 .../charging-stations/CSConnector.vue         |  2 +-
 .../components/charging-stations/CSData.vue   |  2 +-
 .../components/charging-stations/CSTable.vue  |  2 +-
 ui/web/src/composables/UIClient.ts            | 25 +++++++-----
 ui/web/src/composables/Utils.ts               |  4 +-
 ui/web/src/main.ts                            |  3 +-
 ui/web/src/types/ChargingStationType.ts       |  7 +---
 ui/web/src/types/index.ts                     | 40 -------------------
 ui/web/src/views/ChargingStationsView.vue     | 12 +++---
 ui/web/tests/unit/CSConnector.test.ts         |  2 +-
 ui/web/tests/unit/CSData.test.ts              |  4 +-
 ui/web/tests/unit/CSTable.test.ts             |  2 +-
 .../tests/unit/ChargingStationsView.test.ts   |  2 +-
 ui/web/tests/unit/StartTransaction.test.ts    |  2 +-
 ui/web/tests/unit/UIClient.test.ts            | 10 +----
 ui/web/tests/unit/constants.ts                | 10 +++--
 ui/web/tests/unit/helpers.ts                  |  3 +-
 20 files changed, 52 insertions(+), 92 deletions(-)
 delete mode 100644 ui/web/src/types/index.ts

diff --git a/ui/common/src/types/JsonType.ts b/ui/common/src/types/JsonType.ts
index 927f3c4d..ace385f0 100644
--- a/ui/common/src/types/JsonType.ts
+++ b/ui/common/src/types/JsonType.ts
@@ -1,5 +1,7 @@
-export type JsonObject = { [K in string]?: JsonType }
+export type JsonObject = {
+  [K in string]?: (JsonObject | JsonPrimitive)[] | JsonObject | JsonPrimitive
+}
 
 export type JsonPrimitive = boolean | null | number | string
 
-export type JsonType = JsonObject | JsonPrimitive | JsonType[]
+export type JsonType = (JsonObject | JsonPrimitive)[] | JsonObject | JsonPrimitive
diff --git a/ui/web/src/components/actions/AddChargingStations.vue b/ui/web/src/components/actions/AddChargingStations.vue
index 3597e3c4..816fe2e9 100644
--- a/ui/web/src/components/actions/AddChargingStations.vue
+++ b/ui/web/src/components/actions/AddChargingStations.vue
@@ -113,9 +113,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import type { UUIDv4 } from 'ui-common'
 
-import type { UUIDv4 } from '@/types'
+import { ref, watch } from 'vue'
 
 import Button from '@/components/buttons/Button.vue'
 import {
diff --git a/ui/web/src/components/actions/StartTransaction.vue b/ui/web/src/components/actions/StartTransaction.vue
index 62a7d8f7..73a47d30 100644
--- a/ui/web/src/components/actions/StartTransaction.vue
+++ b/ui/web/src/components/actions/StartTransaction.vue
@@ -43,7 +43,7 @@ import { useToast } from 'vue-toast-notification'
 
 import Button from '@/components/buttons/Button.vue'
 import { convertToInt, resetToggleButtonState, ROUTE_NAMES, useUIClient } from '@/composables'
-import { type OCPPVersion } from '@/types'
+import { type OCPPVersion } from '@/types/ChargingStationType'
 
 const props = defineProps<{
   chargingStationId: string
diff --git a/ui/web/src/components/charging-stations/CSConnector.vue b/ui/web/src/components/charging-stations/CSConnector.vue
index b49a49b4..b55b0d74 100644
--- a/ui/web/src/components/charging-stations/CSConnector.vue
+++ b/ui/web/src/components/charging-stations/CSConnector.vue
@@ -68,7 +68,7 @@
 <script setup lang="ts">
 import { useToast } from 'vue-toast-notification'
 
-import type { ConnectorStatus, OCPPVersion, Status } from '@/types'
+import type { ConnectorStatus, OCPPVersion, Status } from '@/types/ChargingStationType'
 
 import Button from '@/components/buttons/Button.vue'
 import StateButton from '@/components/buttons/StateButton.vue'
diff --git a/ui/web/src/components/charging-stations/CSData.vue b/ui/web/src/components/charging-stations/CSData.vue
index f77c767a..ff703b59 100644
--- a/ui/web/src/components/charging-stations/CSData.vue
+++ b/ui/web/src/components/charging-stations/CSData.vue
@@ -137,7 +137,7 @@
 import { computed } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import type { ChargingStationData, ConnectorEntry, Status } from '@/types'
+import type { ChargingStationData, ConnectorEntry, Status } from '@/types/ChargingStationType'
 
 import Button from '@/components/buttons/Button.vue'
 import StateButton from '@/components/buttons/StateButton.vue'
diff --git a/ui/web/src/components/charging-stations/CSTable.vue b/ui/web/src/components/charging-stations/CSTable.vue
index 4cb0c93e..4cd86cb5 100644
--- a/ui/web/src/components/charging-stations/CSTable.vue
+++ b/ui/web/src/components/charging-stations/CSTable.vue
@@ -107,7 +107,7 @@
 </template>
 
 <script setup lang="ts">
-import type { ChargingStationData } from '@/types'
+import type { ChargingStationData } from '@/types/ChargingStationType'
 
 import CSData from '@/components/charging-stations/CSData.vue'
 
diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index cfc8b8b7..60e1d83a 100644
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,21 +1,26 @@
-import { createBrowserWsAdapter, WebSocketClient, type WebSocketFactory } from 'ui-common'
+import {
+  AuthenticationType,
+  createBrowserWsAdapter,
+  ProcedureName,
+  type RequestPayload,
+  type ResponsePayload,
+  ResponseStatus,
+  ServerNotification,
+  WebSocketClient,
+  type WebSocketFactory,
+} from 'ui-common'
 import { useToast } from 'vue-toast-notification'
 
+import type { UIServerConfigurationSection } from '@/types/ConfigurationType'
+
 import {
-  ApplicationProtocol,
-  AuthenticationType,
   type ChargingStationOptions,
   OCPP20IdTokenEnumType,
   OCPP20TransactionEventEnumType,
   type OCPP20TransactionEventRequest,
   OCPPVersion,
-  ProcedureName,
-  type RequestPayload,
-  type ResponsePayload,
-  ResponseStatus,
-  ServerNotification,
-  type UIServerConfigurationSection,
-} from '@/types'
+} from '@/types/ChargingStationType'
+import { ApplicationProtocol } from '@/types/UIProtocol'
 
 export class UIClient {
   private static instance: null | UIClient = null
diff --git a/ui/web/src/composables/Utils.ts b/ui/web/src/composables/Utils.ts
index a8431172..80797b7f 100644
--- a/ui/web/src/composables/Utils.ts
+++ b/ui/web/src/composables/Utils.ts
@@ -1,9 +1,11 @@
+import type { UUIDv4 } from 'ui-common'
 import type { InjectionKey, Ref } from 'vue'
 
 import { inject } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import type { ChargingStationData, ConfigurationData, UUIDv4 } from '@/types'
+import type { ChargingStationData } from '@/types/ChargingStationType'
+import type { ConfigurationData } from '@/types/ConfigurationType'
 
 import {
   EMPTY_VALUE_PLACEHOLDER,
diff --git a/ui/web/src/main.ts b/ui/web/src/main.ts
index e921c64b..1ccae670 100644
--- a/ui/web/src/main.ts
+++ b/ui/web/src/main.ts
@@ -1,7 +1,8 @@
 import { type App as AppType, type Component, createApp, ref } from 'vue'
 import ToastPlugin from 'vue-toast-notification'
 
-import type { ChargingStationData, ConfigurationData, UIServerConfigurationSection } from '@/types'
+import type { ChargingStationData } from '@/types/ChargingStationType'
+import type { ConfigurationData, UIServerConfigurationSection } from '@/types/ConfigurationType'
 
 import App from '@/App.vue'
 import {
diff --git a/ui/web/src/types/ChargingStationType.ts b/ui/web/src/types/ChargingStationType.ts
index 06dbb523..1a98ce19 100644
--- a/ui/web/src/types/ChargingStationType.ts
+++ b/ui/web/src/types/ChargingStationType.ts
@@ -1,3 +1,5 @@
+import type { JsonObject } from 'ui-common'
+
 export enum AmpereUnits {
   AMPERE = 'A',
   CENTI_AMPERE = 'cA',
@@ -367,8 +369,3 @@ interface CommandsSupport extends JsonObject {
   incomingCommands: Record<IncomingRequestCommand, boolean>
   outgoingCommands?: Record<RequestCommand, boolean>
 }
-
-// Local non-recursive JsonObject avoids Vue UnwrapRef<T> infinite instantiation (TS2589)
-type JsonObject = { [key in string]?: (JsonObject | JsonPrimitive)[] | JsonObject | JsonPrimitive }
-
-type JsonPrimitive = boolean | null | number | string
diff --git a/ui/web/src/types/index.ts b/ui/web/src/types/index.ts
deleted file mode 100644
index d6c0b95c..00000000
--- a/ui/web/src/types/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export type {
-  ATGConfiguration,
-  ATGEntry,
-  ChargingStationData,
-  ChargingStationInfo,
-  ChargingStationOptions,
-  ConnectorEntry,
-  ConnectorStatus,
-  EvseEntry,
-  OCPP20TransactionEventRequest,
-  Status,
-} from './ChargingStationType'
-export {
-  OCPP16AvailabilityType,
-  OCPP16ChargePointStatus,
-  OCPP16RegistrationStatus,
-  OCPP20IdTokenEnumType,
-  OCPP20TransactionEventEnumType,
-  OCPPVersion,
-} from './ChargingStationType'
-export type { ConfigurationData, UIServerConfigurationSection } from './ConfigurationType'
-export { ApplicationProtocol, Protocol, type SimulatorState } from './UIProtocol'
-export {
-  AuthenticationType,
-  type BroadcastChannelResponsePayload,
-  type JsonObject,
-  type JsonPrimitive,
-  type JsonType,
-  ProcedureName,
-  type ProtocolNotification,
-  type ProtocolRequest,
-  type ProtocolRequestHandler,
-  type ProtocolResponse,
-  ProtocolVersion,
-  type RequestPayload,
-  type ResponsePayload,
-  ResponseStatus,
-  ServerNotification,
-  type UUIDv4,
-} from 'ui-common'
diff --git a/ui/web/src/views/ChargingStationsView.vue b/ui/web/src/views/ChargingStationsView.vue
index 6ccf7308..7f903c78 100644
--- a/ui/web/src/views/ChargingStationsView.vue
+++ b/ui/web/src/views/ChargingStationsView.vue
@@ -104,16 +104,14 @@
 </template>
 
 <script setup lang="ts">
+import type { ResponsePayload, UUIDv4 } from 'ui-common'
+
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import type {
-  ChargingStationData,
-  ResponsePayload,
-  SimulatorState,
-  UIServerConfigurationSection,
-  UUIDv4,
-} from '@/types'
+import type { ChargingStationData } from '@/types/ChargingStationType'
+import type { UIServerConfigurationSection } from '@/types/ConfigurationType'
+import type { SimulatorState } from '@/types/UIProtocol'
 
 import StateButton from '@/components/buttons/StateButton.vue'
 import ToggleButton from '@/components/buttons/ToggleButton.vue'
diff --git a/ui/web/tests/unit/CSConnector.test.ts b/ui/web/tests/unit/CSConnector.test.ts
index 9ea0e535..dedbebb9 100644
--- a/ui/web/tests/unit/CSConnector.test.ts
+++ b/ui/web/tests/unit/CSConnector.test.ts
@@ -9,7 +9,7 @@ import type { UIClient } from '@/composables'
 
 import CSConnector from '@/components/charging-stations/CSConnector.vue'
 import { EMPTY_VALUE_PLACEHOLDER, useUIClient } from '@/composables'
-import { OCPP16ChargePointStatus } from '@/types'
+import { OCPP16ChargePointStatus } from '@/types/ChargingStationType'
 
 import { toastMock } from '../setup'
 import { createConnectorStatus, TEST_HASH_ID, TEST_STATION_ID } from './constants'
diff --git a/ui/web/tests/unit/CSData.test.ts b/ui/web/tests/unit/CSData.test.ts
index 35cb78d3..500c5f5c 100644
--- a/ui/web/tests/unit/CSData.test.ts
+++ b/ui/web/tests/unit/CSData.test.ts
@@ -6,12 +6,12 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { UIClient } from '@/composables'
-import type { ChargingStationData } from '@/types'
+import type { ChargingStationData } from '@/types/ChargingStationType'
 
 import CSConnector from '@/components/charging-stations/CSConnector.vue'
 import CSData from '@/components/charging-stations/CSData.vue'
 import { EMPTY_VALUE_PLACEHOLDER, useUIClient } from '@/composables'
-import { OCPPVersion } from '@/types'
+import { OCPPVersion } from '@/types/ChargingStationType'
 
 import { toastMock } from '../setup'
 import {
diff --git a/ui/web/tests/unit/CSTable.test.ts b/ui/web/tests/unit/CSTable.test.ts
index f215e1e7..26194dd5 100644
--- a/ui/web/tests/unit/CSTable.test.ts
+++ b/ui/web/tests/unit/CSTable.test.ts
@@ -5,7 +5,7 @@
 import { mount } from '@vue/test-utils'
 import { describe, expect, it } from 'vitest'
 
-import type { ChargingStationData } from '@/types'
+import type { ChargingStationData } from '@/types/ChargingStationType'
 
 import CSTable from '@/components/charging-stations/CSTable.vue'
 
diff --git a/ui/web/tests/unit/ChargingStationsView.test.ts b/ui/web/tests/unit/ChargingStationsView.test.ts
index c0595efa..a861eb86 100644
--- a/ui/web/tests/unit/ChargingStationsView.test.ts
+++ b/ui/web/tests/unit/ChargingStationsView.test.ts
@@ -4,6 +4,7 @@
  *   simulator state display, CSTable visibility, UI server selector, and error handling.
  */
 import { flushPromises, mount } from '@vue/test-utils'
+import { ResponseStatus } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
@@ -16,7 +17,6 @@ import {
   uiClientKey,
   useUIClient,
 } from '@/composables'
-import { ResponseStatus } from '@/types'
 import ChargingStationsView from '@/views/ChargingStationsView.vue'
 
 import { toastMock } from '../setup'
diff --git a/ui/web/tests/unit/StartTransaction.test.ts b/ui/web/tests/unit/StartTransaction.test.ts
index 750f24c7..ebffb5e4 100644
--- a/ui/web/tests/unit/StartTransaction.test.ts
+++ b/ui/web/tests/unit/StartTransaction.test.ts
@@ -9,7 +9,7 @@ import type { UIClient } from '@/composables'
 
 import StartTransaction from '@/components/actions/StartTransaction.vue'
 import { useUIClient } from '@/composables'
-import { OCPPVersion } from '@/types'
+import { OCPPVersion } from '@/types/ChargingStationType'
 
 import { toastMock } from '../setup'
 import { TEST_HASH_ID, TEST_ID_TAG, TEST_STATION_ID } from './constants'
diff --git a/ui/web/tests/unit/UIClient.test.ts b/ui/web/tests/unit/UIClient.test.ts
index ea23d1c7..6337c09c 100644
--- a/ui/web/tests/unit/UIClient.test.ts
+++ b/ui/web/tests/unit/UIClient.test.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { AuthenticationType, ProcedureName, ResponseStatus, ServerNotification } from 'ui-common'
 /**
  * @file Tests for UIClient composable
  * @description Unit tests for WebSocket client singleton, connection lifecycle,
@@ -7,14 +8,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { UIClient } from '@/composables'
-import {
-  AuthenticationType,
-  OCPP20TransactionEventEnumType,
-  OCPPVersion,
-  ProcedureName,
-  ResponseStatus,
-  ServerNotification,
-} from '@/types'
+import { OCPP20TransactionEventEnumType, OCPPVersion } from '@/types/ChargingStationType'
 
 import { toastMock } from '../setup'
 import { createUIServerConfig, TEST_HASH_ID, TEST_ID_TAG } from './constants'
diff --git a/ui/web/tests/unit/constants.ts b/ui/web/tests/unit/constants.ts
index 17beb67f..3b326f03 100644
--- a/ui/web/tests/unit/constants.ts
+++ b/ui/web/tests/unit/constants.ts
@@ -3,6 +3,10 @@
  * @description Factory functions (NOT static objects) for ChargingStationData,
  *   ConnectorStatus, and other test fixtures. Using factories prevents shared state.
  */
+import { ProtocolVersion } from 'ui-common'
+
+import type { UIServerConfigurationSection } from '@/types/ConfigurationType'
+
 import {
   type ChargingStationData,
   type ChargingStationInfo,
@@ -12,10 +16,8 @@ import {
   OCPP16ChargePointStatus,
   OCPP16RegistrationStatus,
   OCPPVersion,
-  Protocol,
-  ProtocolVersion,
-  type UIServerConfigurationSection,
-} from '@/types'
+} from '@/types/ChargingStationType'
+import { Protocol } from '@/types/UIProtocol'
 
 // ── Shared Test Constants ─────────────────────────────────────────────────────
 
diff --git a/ui/web/tests/unit/helpers.ts b/ui/web/tests/unit/helpers.ts
index 440af817..7e5b2c4f 100644
--- a/ui/web/tests/unit/helpers.ts
+++ b/ui/web/tests/unit/helpers.ts
@@ -3,11 +3,10 @@
  * @description MockWebSocket, withSetup composable helper, mock factories.
  */
 import { flushPromises } from '@vue/test-utils'
+import { ResponseStatus } from 'ui-common'
 import { vi } from 'vitest'
 import { type App, createApp } from 'vue'
 
-import { ResponseStatus } from '@/types'
-
 export { flushPromises as flushAllPromises }
 
 // ── MockUIClient ──────────────────────────────────────────────────────────────
-- 
2.53.0