fix(ignore): update zigbee-herdsman-converters to 23.6.0 (#26691)

Author: Koenkk

package.json

@@ -63,7 +63,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.1",
         "zigbee-herdsman": "3.3.2",
-        "zigbee-herdsman-converters": "23.4.0",
+        "zigbee-herdsman-converters": "23.6.0",
         "zigbee2mqtt-frontend": "0.9.4"
     },
     "devDependencies": {

pnpm-lock.yaml

@@ -2,7 +2,7 @@ import * as data from '../mocks/data';
 import {mockLogger} from '../mocks/logger';
 import {events as mockMQTTEvents, mockMQTTPublishAsync, mockMQTTSubscribeAsync, mockMQTTUnsubscribeAsync} from '../mocks/mqtt';
 import * as mockSleep from '../mocks/sleep';
-import {flushPromises} from '../mocks/utils';
+import {flushPromises, getZhcBaseDefinitions} from '../mocks/utils';
 import {devices, groups, events as mockZHEvents} from '../mocks/zigbeeHerdsman';
 
 import assert from 'node:assert';
@@ -83,11 +83,8 @@ describe('Extension: HomeAssistant', () => {
     it('Should not have duplicate type/object_ids in a mapping', async () => {
         const duplicated: string[] = [];
 
-        (await import('zigbee-herdsman-converters/devices/index')).default.forEach((baseDefinition) => {
-            const d = zhc.prepareDefinition(
-                // @ts-expect-error inferred type is wrong
-                baseDefinition,
-            );
+        for (const baseDefinition of await getZhcBaseDefinitions()) {
+            const d = zhc.prepareDefinition(baseDefinition);
             const exposes = typeof d.exposes == 'function' ? d.exposes(undefined, undefined) : d.exposes;
             const device = {
                 definition: d,
@@ -112,7 +109,7 @@ describe('Extension: HomeAssistant', () => {
                     cfgTypeObjectIds.push(id);
                 }
             });
-        });
+        }
 
         expect(duplicated).toHaveLength(0);
     });

test/extensions/homeassistant.test.ts

@@ -1,7 +1,7 @@
 import * as data from '../mocks/data';
 import {mockLogger} from '../mocks/logger';
 import {mockMQTTPublishAsync} from '../mocks/mqtt';
-import {flushPromises} from '../mocks/utils';
+import {flushPromises, getZhcBaseDefinitions} from '../mocks/utils';
 import {devices, events as mockZHEvents} from '../mocks/zigbeeHerdsman';
 
 import {MockInstance} from 'vitest';
@@ -19,8 +19,8 @@ describe('Extension: OnEvent', () => {
     let mockLivoloOnEvent: MockInstance;
 
     beforeAll(async () => {
-        const mappedLivolo = (await zhc.findByDevice(devices.LIVOLO))!;
-        mockLivoloOnEvent = vi.spyOn(mappedLivolo, 'onEvent');
+        const livoloDefinition = (await getZhcBaseDefinitions()).find((d) => d.zigbeeModel?.includes(devices.LIVOLO.modelID!))!;
+        mockLivoloOnEvent = vi.spyOn(livoloDefinition, 'onEvent');
     });
 
     beforeEach(async () => {

test/extensions/onEvent.test.ts

@@ -1,3 +1,5 @@
+import type {DefinitionWithExtend} from 'zigbee-herdsman-converters';
+
 export type EventHandler = (...args: unknown[]) => unknown;
 
 export async function flushPromises(): Promise<void> {
@@ -12,3 +14,7 @@ export function defuseRejection<T>(promise: Promise<T>): Promise<T> {
 
     return promise;
 }
+
+export async function getZhcBaseDefinitions(): Promise<DefinitionWithExtend[]> {
+    return (await import('zigbee-herdsman-converters/devices/index')).default;
+}