refactor: merge duplicate same-kind imports from identical sources

diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index ff9f3c9bcca065aa447ed44ff4c33c3be3dfc98e..45c8f6b7d727c4eca50519e2dfd2d181cecc5359 100644 (file)
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -1,5 +1,4 @@
-import type { ValidateFunction } from 'ajv'
-import type _Ajv from 'ajv'
+import type { default as _Ajv, ValidateFunction } from 'ajv'
 
 import { EventEmitter } from 'node:events'
 

diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts
index 49a483075cb0671a3c554107a5c12c0c643038a1..8ddf85e5d19844b191db8f7c2e444001e739c5b0 100644 (file)
--- a/src/charging-station/ocpp/OCPPRequestService.ts
+++ b/src/charging-station/ocpp/OCPPRequestService.ts
@@ -1,5 +1,4 @@
-import type { ValidateFunction } from 'ajv'
-import type _Ajv from 'ajv'
+import type { default as _Ajv, ValidateFunction } from 'ajv'
 
 import type { ChargingStation } from '../../charging-station/index.js'
 import type { OCPPResponseService } from './OCPPResponseService.js'

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index ad9674f23f171c5b805f231a62651431e489f001..44f15090b68625c9510d346d005dfcc21c561001 100644 (file)
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,5 +1,4 @@
-import type { ValidateFunction } from 'ajv'
-import type _Ajv from 'ajv'
+import type { default as _Ajv, ValidateFunction } from 'ajv'
 
 import type { ChargingStation } from '../../charging-station/index.js'
 

diff --git a/src/charging-station/ocpp/auth/interfaces/OCPPAuthService.ts b/src/charging-station/ocpp/auth/interfaces/OCPPAuthService.ts
index 13edf9b1362a7bc9edd01013850834b0d53ff1e0..6345ea37b5d360ae9ca1d260460dc95b2a740f46 100644 (file)
--- a/src/charging-station/ocpp/auth/interfaces/OCPPAuthService.ts
+++ b/src/charging-station/ocpp/auth/interfaces/OCPPAuthService.ts
@@ -2,10 +2,11 @@ import type { JsonObject, OCPPVersion } from '../../../../types/index.js'
 import type {
   AuthConfiguration,
   AuthorizationResult,
+  AuthorizationStatus,
   AuthRequest,
   Identifier,
+  IdentifierType,
 } from '../types/AuthTypes.js'
-import type { AuthorizationStatus, IdentifierType } from '../types/AuthTypes.js'
 
 /**
  * Authorization cache interface

diff --git a/src/charging-station/ocpp/auth/types/AuthTypes.ts b/src/charging-station/ocpp/auth/types/AuthTypes.ts
index 1e1c1878432a30754dcdd9711a69ed28f076aa5e..0bd2bf1797e05010632f37b78aa86e24474408c8 100644 (file)
--- a/src/charging-station/ocpp/auth/types/AuthTypes.ts
+++ b/src/charging-station/ocpp/auth/types/AuthTypes.ts
@@ -1,5 +1,8 @@
-import type { JsonObject, OCPPVersion } from '../../../../types/index.js'
-import type { OCPP20MessageFormatEnumType } from '../../../../types/index.js'
+import type {
+  JsonObject,
+  OCPP20MessageFormatEnumType,
+  OCPPVersion,
+} from '../../../../types/index.js'
 
 import {
   OCPP16AuthorizationStatus,

diff --git a/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts b/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts
index 0c6fe70b8ecfc27b473ad07542ae16e119a31e1c..d171b36c008f8075c957041a912f56625b901157 100644 (file)
--- a/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts
+++ b/tests/charging-station/ocpp/1.6/OCPP16Integration-Transactions.test.ts
@@ -7,8 +7,7 @@
  */
 
 import assert from 'node:assert/strict'
-import { mock } from 'node:test'
-import { afterEach, beforeEach, describe, it } from 'node:test'
+import { afterEach, beforeEach, describe, it, mock } from 'node:test'
 
 import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type { TestableOCPP16IncomingRequestService } from '../../../../src/charging-station/ocpp/1.6/__testable__/index.js'

diff --git a/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts b/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts
index 541bf628d31cf21e19811d6c8b43316ce5b956c9..ae4336260eb165c11c1bab4901e3bbfe3e716583 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20ResponseService-TransactionEvent.test.ts
@@ -11,8 +11,8 @@ import type { ChargingStation } from '../../../../src/charging-station/index.js'
 import type {
   OCPP20TransactionEventRequest,
   OCPP20TransactionEventResponse,
+  UUIDv4,
 } from '../../../../src/types/index.js'
-import type { UUIDv4 } from '../../../../src/types/index.js'
 
 import { OCPP20ResponseService } from '../../../../src/charging-station/ocpp/2.0/OCPP20ResponseService.js'
 import { OCPP20ServiceUtils } from '../../../../src/charging-station/ocpp/2.0/OCPP20ServiceUtils.js'

diff --git a/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts b/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts
index 09e91504acbd2fd1e6613a35f9f6d249f2673203..d4ab72896a64758b8693f99c78cefb2703cc29a1 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20TestUtils.ts
@@ -14,9 +14,9 @@ import type {
   GetCertificateIdUseEnumType,
   JsonType,
   OCPP20IdTokenType,
+  OCPP20RequestCommand,
   OCSPRequestDataType,
 } from '../../../../src/types/index.js'
-import type { OCPP20RequestCommand } from '../../../../src/types/index.js'
 
 import { buildConfigKey } from '../../../../src/charging-station/index.js'
 import { OCPP20RequestService } from '../../../../src/charging-station/ocpp/2.0/OCPP20RequestService.js'

diff --git a/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts b/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts
index 88c6ab03ca802795dc191923107aab166ddade48..e42ae6624bd5f6f388974b9800c8c7a10277a802 100644 (file)
--- a/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts
+++ b/tests/charging-station/ocpp/auth/adapters/OCPP20AuthAdapter.test.ts
@@ -18,9 +18,9 @@ import {
 import {
   OCPP20AuthorizationStatusEnumType,
   OCPP20IdTokenEnumType,
+  OCPPVersion,
   RequestStartStopStatusEnumType,
 } from '../../../../../src/types/index.js'
-import { OCPPVersion } from '../../../../../src/types/index.js'
 import { standardCleanup } from '../../../../helpers/TestLifecycleHelpers.js'
 import { createMockAuthorizationResult, createMockIdentifier } from '../helpers/MockFactories.js'
 

diff --git a/tests/charging-station/ocpp/auth/helpers/MockFactories.ts b/tests/charging-station/ocpp/auth/helpers/MockFactories.ts
index b77b5d924046935e45c2c985428edc2e4960cc69..7cb48975905727480a058124ba32e161c1c99cca 100644 (file)
--- a/tests/charging-station/ocpp/auth/helpers/MockFactories.ts
+++ b/tests/charging-station/ocpp/auth/helpers/MockFactories.ts
@@ -23,8 +23,11 @@ import {
   type Identifier,
   IdentifierType,
 } from '../../../../../src/charging-station/ocpp/auth/types/AuthTypes.js'
-import { OCPPVersion } from '../../../../../src/types/index.js'
-import { OCPP20IdTokenEnumType, type OCPP20IdTokenType } from '../../../../../src/types/index.js'
+import {
+  OCPP20IdTokenEnumType,
+  type OCPP20IdTokenType,
+  OCPPVersion,
+} from '../../../../../src/types/index.js'
 
 /**
  * Factory functions for creating test mocks and fixtures