From 460b4f787eaa9d6ec9ff928b5e674679ac069982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 18:47:30 +0100 Subject: [PATCH] build(deps-dev): bump the regular group with 3 updates (#1292) * build(deps-dev): bump the regular group with 3 updates Bumps the regular group with 3 updates: [eslint-plugin-perfectionist](https://github.com/azat-io/eslint-plugin-perfectionist), [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8) and [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest). Updates `eslint-plugin-perfectionist` from 4.6.0 to 4.7.0 - [Release notes](https://github.com/azat-io/eslint-plugin-perfectionist/releases) - [Changelog](https://github.com/azat-io/eslint-plugin-perfectionist/blob/main/changelog.md) - [Commits](https://github.com/azat-io/eslint-plugin-perfectionist/compare/v4.6.0...v4.7.0) Updates `@vitest/coverage-v8` from 3.0.2 to 3.0.3 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v3.0.3/packages/coverage-v8) Updates `vitest` from 3.0.2 to 3.0.3 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v3.0.3/packages/vitest) --- updated-dependencies: - dependency-name: eslint-plugin-perfectionist dependency-type: direct:development update-type: version-update:semver-minor dependency-group: regular - dependency-name: "@vitest/coverage-v8" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: regular - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: regular ... Signed-off-by: dependabot[bot] * [autofix.ci] apply automated fixes --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 200 ++++++++++++------ .../ocpp/1.6/OCPP16ServiceUtils.ts | 150 ++++++------- ui/web/package.json | 4 +- 4 files changed, 209 insertions(+), 147 deletions(-) diff --git a/package.json b/package.json index 8d7a9bfe..91a3df9b 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "eslint": "^9.18.0", "eslint-define-config": "^2.1.0", "eslint-plugin-jsdoc": "^50.6.2", - "eslint-plugin-perfectionist": "^4.6.0", + "eslint-plugin-perfectionist": "^4.7.0", "eslint-plugin-vue": "^9.32.0", "glob": "^11.0.1", "husky": "^9.1.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c80767a0..ce64babf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -138,8 +138,8 @@ importers: specifier: ^50.6.2 version: 50.6.2(eslint@9.18.0(jiti@2.4.2)) eslint-plugin-perfectionist: - specifier: ^4.6.0 - version: 4.6.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) + specifier: ^4.7.0 + version: 4.7.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) eslint-plugin-vue: specifier: ^9.32.0 version: 9.32.0(eslint@9.18.0(jiti@2.4.2)) @@ -208,8 +208,8 @@ importers: specifier: ^4.1.1 version: 4.1.1(vite@5.4.11(@types/node@22.10.7))(vue@3.5.13(typescript@5.7.3)) '@vitest/coverage-v8': - specifier: ^3.0.2 - version: 3.0.2(vitest@3.0.2(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))) + specifier: ^3.0.3 + version: 3.0.3(vitest@3.0.3(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))) '@vue/test-utils': specifier: ^2.4.6 version: 2.4.6 @@ -235,8 +235,8 @@ importers: specifier: ^5.4.11 version: 5.4.11(@types/node@22.10.7) vitest: - specifier: ^3.0.2 - version: 3.0.2(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)) + specifier: ^3.0.3 + version: 3.0.3(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)) packages: @@ -1571,6 +1571,10 @@ packages: resolution: {integrity: sha512-J7+VkpeGzhOt3FeG1+SzhiMj9NzGD/M6KoGn9f4dbz3YzK9hvbhVTmLj/HiTp9DazIzJ8B4XcM80LrR9Dm1rJw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.21.0': + resolution: {integrity: sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/type-utils@8.20.0': resolution: {integrity: sha512-bPC+j71GGvA7rVNAHAtOjbVXbLN5PkwqMvy1cwGeaxUoRQXVuKCebRoLzm+IPW/NtFFpstn1ummSIasD5t60GA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -1582,12 +1586,22 @@ packages: resolution: {integrity: sha512-cqaMiY72CkP+2xZRrFt3ExRBu0WmVitN/rYPZErA80mHjHx/Svgp8yfbzkJmDoQ/whcytOPO9/IZXnOc+wigRA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.21.0': + resolution: {integrity: sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/typescript-estree@8.20.0': resolution: {integrity: sha512-Y7ncuy78bJqHI35NwzWol8E0X7XkRVS4K4P4TCyzWkOJih5NDvtoRDW4Ba9YJJoB2igm9yXDdYI/+fkiiAxPzA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <5.8.0' + '@typescript-eslint/typescript-estree@8.21.0': + resolution: {integrity: sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <5.8.0' + '@typescript-eslint/utils@8.20.0': resolution: {integrity: sha512-dq70RUw6UK9ei7vxc4KQtBRk7qkHZv447OUZ6RPQMQl71I3NZxQJX/f32Smr+iqWrB02pHKn2yAdHBb0KNrRMA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -1595,10 +1609,21 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' + '@typescript-eslint/utils@8.21.0': + resolution: {integrity: sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.8.0' + '@typescript-eslint/visitor-keys@8.20.0': resolution: {integrity: sha512-v/BpkeeYAsPkKCkR8BDwcno0llhzWVqPOamQrAEMdpZav2Y9OVjd9dwJyBLJWwf335B5DmlifECIkZRJCaGaHA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.21.0': + resolution: {integrity: sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@vitejs/plugin-vue-jsx@4.1.1': resolution: {integrity: sha512-uMJqv/7u1zz/9NbWAD3XdjaY20tKTf17XVfQ9zq4wY1BjsB/PjpJPMe2xiG39QpP4ZdhYNhm4Hvo66uJrykNLA==} engines: {node: ^18.0.0 || >=20.0.0} @@ -1613,20 +1638,20 @@ packages: vite: ^5.0.0 || ^6.0.0 vue: ^3.2.25 - '@vitest/coverage-v8@3.0.2': - resolution: {integrity: sha512-U+hZYb0FtgNDb6B3E9piAHzXXIuxuBw2cd6Lvepc9sYYY4KjgiwCBmo3Sird9ZRu3ggLpLBTfw1ZRr77ipiSfw==} + '@vitest/coverage-v8@3.0.3': + resolution: {integrity: sha512-uVbJ/xhImdNtzPnLyxCZJMTeTIYdgcC2nWtBBBpR1H6z0w8m7D+9/zrDIx2nNxgMg9r+X8+RY2qVpUDeW2b3nw==} peerDependencies: - '@vitest/browser': 3.0.2 - vitest: 3.0.2 + '@vitest/browser': 3.0.3 + vitest: 3.0.3 peerDependenciesMeta: '@vitest/browser': optional: true - '@vitest/expect@3.0.2': - resolution: {integrity: sha512-dKSHLBcoZI+3pmP5hiZ7I5grNru2HRtEW8Z5Zp4IXog8QYcxhlox7JUPyIIFWfN53+3HW3KPLIl6nSzUGgKSuQ==} + '@vitest/expect@3.0.3': + resolution: {integrity: sha512-SbRCHU4qr91xguu+dH3RUdI5dC86zm8aZWydbp961aIR7G8OYNN6ZiayFuf9WAngRbFOfdrLHCGgXTj3GtoMRQ==} - '@vitest/mocker@3.0.2': - resolution: {integrity: sha512-Hr09FoBf0jlwwSyzIF4Xw31OntpO3XtZjkccpcBf8FeVW3tpiyKlkeUzxS/txzHqpUCNIX157NaTySxedyZLvA==} + '@vitest/mocker@3.0.3': + resolution: {integrity: sha512-XT2XBc4AN9UdaxJAeIlcSZ0ILi/GzmG5G8XSly4gaiqIvPV3HMTSIDZWJVX6QRJ0PX1m+W8Cy0K9ByXNb/bPIA==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -1636,20 +1661,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.2': - resolution: {integrity: sha512-yBohcBw/T/p0/JRgYD+IYcjCmuHzjC3WLAKsVE4/LwiubzZkE8N49/xIQ/KGQwDRA8PaviF8IRO8JMWMngdVVQ==} + '@vitest/pretty-format@3.0.3': + resolution: {integrity: sha512-gCrM9F7STYdsDoNjGgYXKPq4SkSxwwIU5nkaQvdUxiQ0EcNlez+PdKOVIsUJvh9P9IeIFmjn4IIREWblOBpP2Q==} - '@vitest/runner@3.0.2': - resolution: {integrity: sha512-GHEsWoncrGxWuW8s405fVoDfSLk6RF2LCXp6XhevbtDjdDme1WV/eNmUueDfpY1IX3MJaCRelVCEXsT9cArfEg==} + '@vitest/runner@3.0.3': + resolution: {integrity: sha512-Rgi2kOAk5ZxWZlwPguRJFOBmWs6uvvyAAR9k3MvjRvYrG7xYvKChZcmnnpJCS98311CBDMqsW9MzzRFsj2gX3g==} - '@vitest/snapshot@3.0.2': - resolution: {integrity: sha512-h9s67yD4+g+JoYG0zPCo/cLTabpDqzqNdzMawmNPzDStTiwxwkyYM1v5lWE8gmGv3SVJ2DcxA2NpQJZJv9ym3g==} + '@vitest/snapshot@3.0.3': + resolution: {integrity: sha512-kNRcHlI4txBGztuJfPEJ68VezlPAXLRT1u5UCx219TU3kOG2DplNxhWLwDf2h6emwmTPogzLnGVwP6epDaJN6Q==} - '@vitest/spy@3.0.2': - resolution: {integrity: sha512-8mI2iUn+PJFMT44e3ISA1R+K6ALVs47W6eriDTfXe6lFqlflID05MB4+rIFhmDSLBj8iBsZkzBYlgSkinxLzSQ==} + '@vitest/spy@3.0.3': + resolution: {integrity: sha512-7/dgux8ZBbF7lEIKNnEqQlyRaER9nkAL9eTmdKJkDO3hS8p59ATGwKOCUDHcBLKr7h/oi/6hP+7djQk8049T2A==} - '@vitest/utils@3.0.2': - resolution: {integrity: sha512-Qu01ZYZlgHvDP02JnMBRpX43nRaZtNpIzw3C1clDXmn8eakgX6iQVGzTQ/NjkIr64WD8ioqOjkaYRVvHQI5qiw==} + '@vitest/utils@3.0.3': + resolution: {integrity: sha512-f+s8CvyzPtMFY1eZKkIHGhPsQgYo5qCm6O8KZoim9qm1/jT64qBgGpO5tHscNH6BzRHM+edLNOP+3vO8+8pE/A==} '@vue/babel-helper-vue-transform-on@1.2.5': resolution: {integrity: sha512-lOz4t39ZdmU4DJAa2hwPYmKc8EsuGa2U0L9KaZaOJUt0UwQNjNA3AZTq6uEivhOKhhG1Wvy96SvYBoFmCg3uuw==} @@ -3001,8 +3026,8 @@ packages: peerDependencies: eslint: '>=8.23.0' - eslint-plugin-perfectionist@4.6.0: - resolution: {integrity: sha512-kOswTebUK0LlYExRwqz7YQtvyTUIRsKfp8XrwBBeHGh2e8MBOS6K+7VvG6HpmNckyKySi1I96uPeAlptMFGcRQ==} + eslint-plugin-perfectionist@4.7.0: + resolution: {integrity: sha512-e2ODzm2SsAztFWY3ZRJd1K702vyl8Sapacjc3JluOW294CfA3+jfjin+UxjcrK48EvlNIMOp+JJB9N54YR2LRw==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: eslint: '>=8.0.0' @@ -4886,8 +4911,8 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - pathe@2.0.1: - resolution: {integrity: sha512-6jpjMpOth5S9ITVu5clZ7NOgHNsv5vRQdheL9ztp2vZmM6fRbLvyua1tiBIL4lk8SAe3ARzeXEly6siXCjDHDw==} + pathe@2.0.2: + resolution: {integrity: sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==} pathval@2.0.0: resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} @@ -5983,8 +6008,8 @@ packages: resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==} engines: {'0': node >=0.6.0} - vite-node@3.0.2: - resolution: {integrity: sha512-hsEQerBAHvVAbv40m3TFQe/lTEbOp7yDpyqMJqr2Tnd+W58+DEYOt+fluQgekOePcsNBmR77lpVAnIU2Xu4SvQ==} + vite-node@3.0.3: + resolution: {integrity: sha512-0sQcwhwAEw/UJGojbhOrnq3HtiZ3tC7BzpAa0lx3QaTX0S3YX70iGcik25UBdB96pmdwjyY2uyKNYruxCDmiEg==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -6019,15 +6044,15 @@ packages: terser: optional: true - vitest@3.0.2: - resolution: {integrity: sha512-5bzaHakQ0hmVVKLhfh/jXf6oETDBtgPo8tQCHYB+wftNgFJ+Hah67IsWc8ivx4vFL025Ow8UiuTf4W57z4izvQ==} + vitest@3.0.3: + resolution: {integrity: sha512-dWdwTFUW9rcnL0LyF2F+IfvNQWB0w9DERySCk8VMG75F8k25C7LsZoh6XfCjPvcR8Nb+Lqi9JKr6vnzH7HSrpQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.2 - '@vitest/ui': 3.0.2 + '@vitest/browser': 3.0.3 + '@vitest/ui': 3.0.3 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -7502,7 +7527,7 @@ snapshots: '@stylistic/eslint-plugin@2.11.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3)': dependencies: - '@typescript-eslint/utils': 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) + '@typescript-eslint/utils': 8.21.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) eslint: 9.18.0(jiti@2.4.2) eslint-visitor-keys: 4.2.0 espree: 10.3.0 @@ -7638,6 +7663,11 @@ snapshots: '@typescript-eslint/types': 8.20.0 '@typescript-eslint/visitor-keys': 8.20.0 + '@typescript-eslint/scope-manager@8.21.0': + dependencies: + '@typescript-eslint/types': 8.21.0 + '@typescript-eslint/visitor-keys': 8.21.0 + '@typescript-eslint/type-utils@8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3)': dependencies: '@typescript-eslint/typescript-estree': 8.20.0(typescript@5.7.3) @@ -7651,6 +7681,8 @@ snapshots: '@typescript-eslint/types@8.20.0': {} + '@typescript-eslint/types@8.21.0': {} + '@typescript-eslint/typescript-estree@8.20.0(typescript@5.7.3)': dependencies: '@typescript-eslint/types': 8.20.0 @@ -7665,6 +7697,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.21.0(typescript@5.7.3)': + dependencies: + '@typescript-eslint/types': 8.21.0 + '@typescript-eslint/visitor-keys': 8.21.0 + debug: 4.4.0 + fast-glob: 3.3.3 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.6.3 + ts-api-utils: 2.0.0(typescript@5.7.3) + typescript: 5.7.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3)': dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@9.18.0(jiti@2.4.2)) @@ -7676,11 +7722,27 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/utils@8.21.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3)': + dependencies: + '@eslint-community/eslint-utils': 4.4.1(eslint@9.18.0(jiti@2.4.2)) + '@typescript-eslint/scope-manager': 8.21.0 + '@typescript-eslint/types': 8.21.0 + '@typescript-eslint/typescript-estree': 8.21.0(typescript@5.7.3) + eslint: 9.18.0(jiti@2.4.2) + typescript: 5.7.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/visitor-keys@8.20.0': dependencies: '@typescript-eslint/types': 8.20.0 eslint-visitor-keys: 4.2.0 + '@typescript-eslint/visitor-keys@8.21.0': + dependencies: + '@typescript-eslint/types': 8.21.0 + eslint-visitor-keys: 4.2.0 + '@vitejs/plugin-vue-jsx@4.1.1(vite@5.4.11(@types/node@22.10.7))(vue@3.5.13(typescript@5.7.3))': dependencies: '@babel/core': 7.26.0 @@ -7696,7 +7758,7 @@ snapshots: vite: 5.4.11(@types/node@22.10.7) vue: 3.5.13(typescript@5.7.3) - '@vitest/coverage-v8@3.0.2(vitest@3.0.2(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)))': + '@vitest/coverage-v8@3.0.3(vitest@3.0.3(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 1.0.2 @@ -7710,47 +7772,47 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 2.0.0 - vitest: 3.0.2(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)) + vitest: 3.0.3(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)) transitivePeerDependencies: - supports-color - '@vitest/expect@3.0.2': + '@vitest/expect@3.0.3': dependencies: - '@vitest/spy': 3.0.2 - '@vitest/utils': 3.0.2 + '@vitest/spy': 3.0.3 + '@vitest/utils': 3.0.3 chai: 5.1.2 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.2(vite@5.4.11(@types/node@22.10.7))': + '@vitest/mocker@3.0.3(vite@5.4.11(@types/node@22.10.7))': dependencies: - '@vitest/spy': 3.0.2 + '@vitest/spy': 3.0.3 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: vite: 5.4.11(@types/node@22.10.7) - '@vitest/pretty-format@3.0.2': + '@vitest/pretty-format@3.0.3': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.2': + '@vitest/runner@3.0.3': dependencies: - '@vitest/utils': 3.0.2 - pathe: 2.0.1 + '@vitest/utils': 3.0.3 + pathe: 2.0.2 - '@vitest/snapshot@3.0.2': + '@vitest/snapshot@3.0.3': dependencies: - '@vitest/pretty-format': 3.0.2 + '@vitest/pretty-format': 3.0.3 magic-string: 0.30.17 - pathe: 2.0.1 + pathe: 2.0.2 - '@vitest/spy@3.0.2': + '@vitest/spy@3.0.3': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.2': + '@vitest/utils@3.0.3': dependencies: - '@vitest/pretty-format': 3.0.2 + '@vitest/pretty-format': 3.0.3 loupe: 3.1.2 tinyrainbow: 2.0.0 @@ -9499,7 +9561,7 @@ snapshots: dependencies: '@types/doctrine': 0.0.9 '@typescript-eslint/scope-manager': 8.20.0 - '@typescript-eslint/utils': 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) + '@typescript-eslint/utils': 8.21.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) debug: 4.4.0 doctrine: 3.0.0 enhanced-resolve: 5.18.0 @@ -9544,10 +9606,10 @@ snapshots: minimatch: 9.0.5 semver: 7.6.3 - eslint-plugin-perfectionist@4.6.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3): + eslint-plugin-perfectionist@4.7.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3): dependencies: - '@typescript-eslint/types': 8.20.0 - '@typescript-eslint/utils': 8.20.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) + '@typescript-eslint/types': 8.21.0 + '@typescript-eslint/utils': 8.21.0(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) eslint: 9.18.0(jiti@2.4.2) natural-orderby: 5.0.0 transitivePeerDependencies: @@ -11588,7 +11650,7 @@ snapshots: path-type@4.0.0: {} - pathe@2.0.1: {} + pathe@2.0.2: {} pathval@2.0.0: {} @@ -12869,12 +12931,12 @@ snapshots: core-util-is: 1.0.2 extsprintf: 1.3.0 - vite-node@3.0.2(@types/node@22.10.7): + vite-node@3.0.3(@types/node@22.10.7): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 - pathe: 2.0.1 + pathe: 2.0.2 vite: 5.4.11(@types/node@22.10.7) transitivePeerDependencies: - '@types/node' @@ -12896,27 +12958,27 @@ snapshots: '@types/node': 22.10.7 fsevents: 2.3.3 - vitest@3.0.2(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)): + vitest@3.0.3(@types/node@22.10.7)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)): dependencies: - '@vitest/expect': 3.0.2 - '@vitest/mocker': 3.0.2(vite@5.4.11(@types/node@22.10.7)) - '@vitest/pretty-format': 3.0.2 - '@vitest/runner': 3.0.2 - '@vitest/snapshot': 3.0.2 - '@vitest/spy': 3.0.2 - '@vitest/utils': 3.0.2 + '@vitest/expect': 3.0.3 + '@vitest/mocker': 3.0.3(vite@5.4.11(@types/node@22.10.7)) + '@vitest/pretty-format': 3.0.3 + '@vitest/runner': 3.0.3 + '@vitest/snapshot': 3.0.3 + '@vitest/spy': 3.0.3 + '@vitest/utils': 3.0.3 chai: 5.1.2 debug: 4.4.0 expect-type: 1.1.0 magic-string: 0.30.17 - pathe: 2.0.1 + pathe: 2.0.2 std-env: 3.8.0 tinybench: 2.9.0 tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 vite: 5.4.11(@types/node@22.10.7) - vite-node: 3.0.2(@types/node@22.10.7) + vite-node: 3.0.3(@types/node@22.10.7) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.10.7 diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts index 010bd5b2..80ad5560 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts @@ -168,6 +168,81 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { return clearedCP } + private static readonly composeChargingSchedule = ( + chargingSchedule: OCPP16ChargingSchedule, + compositeInterval: Interval + ): OCPP16ChargingSchedule | undefined => { + const chargingScheduleInterval: Interval = { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + end: addSeconds(chargingSchedule.startSchedule!, chargingSchedule.duration!), + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + start: chargingSchedule.startSchedule!, + } + if (areIntervalsOverlapping(chargingScheduleInterval, compositeInterval)) { + chargingSchedule.chargingSchedulePeriod.sort((a, b) => a.startPeriod - b.startPeriod) + if (isBefore(chargingScheduleInterval.start, compositeInterval.start)) { + return { + ...chargingSchedule, + chargingSchedulePeriod: chargingSchedule.chargingSchedulePeriod + .filter((schedulePeriod, index) => { + if ( + isWithinInterval( + addSeconds(chargingScheduleInterval.start, schedulePeriod.startPeriod), + compositeInterval + ) + ) { + return true + } + if ( + index < chargingSchedule.chargingSchedulePeriod.length - 1 && + !isWithinInterval( + addSeconds(chargingScheduleInterval.start, schedulePeriod.startPeriod), + compositeInterval + ) && + isWithinInterval( + addSeconds( + chargingScheduleInterval.start, + chargingSchedule.chargingSchedulePeriod[index + 1].startPeriod + ), + compositeInterval + ) + ) { + return true + } + return false + }) + .map((schedulePeriod, index) => { + if (index === 0 && schedulePeriod.startPeriod !== 0) { + schedulePeriod.startPeriod = 0 + } + return schedulePeriod + }), + duration: differenceInSeconds( + chargingScheduleInterval.end, + compositeInterval.start as Date + ), + startSchedule: compositeInterval.start as Date, + } + } + if (isAfter(chargingScheduleInterval.end, compositeInterval.end)) { + return { + ...chargingSchedule, + chargingSchedulePeriod: chargingSchedule.chargingSchedulePeriod.filter(schedulePeriod => + isWithinInterval( + addSeconds(chargingScheduleInterval.start, schedulePeriod.startPeriod), + compositeInterval + ) + ), + duration: differenceInSeconds( + compositeInterval.end as Date, + chargingScheduleInterval.start + ), + } + } + return chargingSchedule + } + } + public static composeChargingSchedules = ( chargingScheduleHigher: OCPP16ChargingSchedule | undefined, chargingScheduleLower: OCPP16ChargingSchedule | undefined, @@ -483,79 +558,4 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { } !cpReplaced && chargingStation.getConnectorStatus(connectorId)?.chargingProfiles?.push(cp) } - - private static readonly composeChargingSchedule = ( - chargingSchedule: OCPP16ChargingSchedule, - compositeInterval: Interval - ): OCPP16ChargingSchedule | undefined => { - const chargingScheduleInterval: Interval = { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - end: addSeconds(chargingSchedule.startSchedule!, chargingSchedule.duration!), - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - start: chargingSchedule.startSchedule!, - } - if (areIntervalsOverlapping(chargingScheduleInterval, compositeInterval)) { - chargingSchedule.chargingSchedulePeriod.sort((a, b) => a.startPeriod - b.startPeriod) - if (isBefore(chargingScheduleInterval.start, compositeInterval.start)) { - return { - ...chargingSchedule, - chargingSchedulePeriod: chargingSchedule.chargingSchedulePeriod - .filter((schedulePeriod, index) => { - if ( - isWithinInterval( - addSeconds(chargingScheduleInterval.start, schedulePeriod.startPeriod), - compositeInterval - ) - ) { - return true - } - if ( - index < chargingSchedule.chargingSchedulePeriod.length - 1 && - !isWithinInterval( - addSeconds(chargingScheduleInterval.start, schedulePeriod.startPeriod), - compositeInterval - ) && - isWithinInterval( - addSeconds( - chargingScheduleInterval.start, - chargingSchedule.chargingSchedulePeriod[index + 1].startPeriod - ), - compositeInterval - ) - ) { - return true - } - return false - }) - .map((schedulePeriod, index) => { - if (index === 0 && schedulePeriod.startPeriod !== 0) { - schedulePeriod.startPeriod = 0 - } - return schedulePeriod - }), - duration: differenceInSeconds( - chargingScheduleInterval.end, - compositeInterval.start as Date - ), - startSchedule: compositeInterval.start as Date, - } - } - if (isAfter(chargingScheduleInterval.end, compositeInterval.end)) { - return { - ...chargingSchedule, - chargingSchedulePeriod: chargingSchedule.chargingSchedulePeriod.filter(schedulePeriod => - isWithinInterval( - addSeconds(chargingScheduleInterval.start, schedulePeriod.startPeriod), - compositeInterval - ) - ), - duration: differenceInSeconds( - compositeInterval.end as Date, - chargingScheduleInterval.start - ), - } - } - return chargingSchedule - } - } } diff --git a/ui/web/package.json b/ui/web/package.json index 2b404d81..7c911fc6 100644 --- a/ui/web/package.json +++ b/ui/web/package.json @@ -39,7 +39,7 @@ "@types/node": "^22.10.7", "@vitejs/plugin-vue": "^5.2.1", "@vitejs/plugin-vue-jsx": "^4.1.1", - "@vitest/coverage-v8": "^3.0.2", + "@vitest/coverage-v8": "^3.0.3", "@vue/test-utils": "^2.4.6", "@vue/tsconfig": "^0.7.0", "cross-env": "^7.0.3", @@ -48,6 +48,6 @@ "rimraf": "^6.0.1", "typescript": "~5.7.3", "vite": "^5.4.11", - "vitest": "^3.0.2" + "vitest": "^3.0.3" } } -- 2.43.0