zigbee-herdsman-converters 23.0.0 → 23.1.1

package/dist/devices/tuya.js

@@ -32,13 +32,10 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.definitions = void 0;
-const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
-const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
+const fz = __importStar(require("../converters/fromZigbee"));
+const tz = __importStar(require("../converters/toZigbee"));
 const libColor = __importStar(require("../lib/color"));
 const constants_1 = require("../lib/constants");
 const exposes = __importStar(require("../lib/exposes"));
@@ -409,9 +406,9 @@ const tzLocal = {
                     state: libColor.syncColorState(newState, meta.state, entity, meta.options),
                 };
             }
-            return await toZigbee_1.default.light_color.convertSet(entity, key, value, meta);
+            return await tz.light_color.convertSet(entity, key, value, meta);
         },
-        convertGet: toZigbee_1.default.light_color.convertGet,
+        convertGet: tz.light_color.convertGet,
     },
     TS0224: {
         key: ["light", "duration", "volume"],
@@ -569,9 +566,9 @@ const fzLocal = {
         },
     },
     TS0222_humidity: {
-        ...fromZigbee_1.default.humidity,
+        ...fz.humidity,
         convert: async (model, msg, publish, options, meta) => {
-            const result = fromZigbee_1.default.humidity.convert(model, msg, publish, options, meta);
+            const result = fz.humidity.convert(model, msg, publish, options, meta);
             if (result)
                 result.humidity *= 10;
             return result;
@@ -608,16 +605,16 @@ const fzLocal = {
                 msg.data.batteryVoltage < 30 &&
                 !["_TZ3000_lqmvrwa2"].includes(meta.device.manufacturerName))
                 return;
-            return fromZigbee_1.default.battery.convert(model, msg, publish, options, meta);
+            return fz.battery.convert(model, msg, publish, options, meta);
         },
     },
     TS0201_humidity: {
-        ...fromZigbee_1.default.humidity,
+        ...fz.humidity,
         convert: (model, msg, publish, options, meta) => {
             if (["_TZ3210_ncw88jfq", "_TZ3000_ywagc4rj"].includes(meta.device.manufacturerName)) {
                 msg.data.measuredValue *= 10;
             }
-            return fromZigbee_1.default.humidity.convert(model, msg, publish, options, meta);
+            return fz.humidity.convert(model, msg, publish, options, meta);
         },
     },
     humidity10: {
@@ -645,9 +642,9 @@ const fzLocal = {
         },
     },
     TS011F_electrical_measurement: {
-        ...fromZigbee_1.default.electrical_measurement,
+        ...fz.electrical_measurement,
         convert: async (model, msg, publish, options, meta) => {
-            const result = fromZigbee_1.default.electrical_measurement.convert(model, msg, publish, options, meta) ?? {};
+            const result = fz.electrical_measurement.convert(model, msg, publish, options, meta) ?? {};
             const lookup = {
                 power: "activePower",
                 current: "rmsCurrent",
@@ -851,7 +848,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Gas sensor",
         whiteLabel: [{ vendor: "Tesla Smart", model: "TSL-SEN-GAS" }],
-        fromZigbee: [fromZigbee_1.default.ias_gas_alarm_1, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [fz.ias_gas_alarm_1, fz.ignore_basic_report],
         toZigbee: [],
         exposes: [e.gas(), e.tamper()],
     },
@@ -897,7 +894,7 @@ exports.definitions = [
         model: "TS0218",
         vendor: "Tuya",
         description: "Button",
-        fromZigbee: [fromZigbee_1.default.command_emergency, fromZigbee_1.default.battery],
+        fromZigbee: [fz.command_emergency, fz.battery],
         exposes: [e.battery(), e.action(["click"])],
         toZigbee: [],
     },
@@ -906,7 +903,7 @@ exports.definitions = [
         model: "TS0203",
         vendor: "Tuya",
         description: "Door sensor",
-        fromZigbee: [fromZigbee_1.default.ias_contact_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_contact_alarm_1_report],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_contact_alarm_1_report],
         toZigbee: [],
         whiteLabel: [
             { vendor: "CR Smart Home", model: "TS0203" },
@@ -980,7 +977,7 @@ exports.definitions = [
         model: "TS0203_1",
         vendor: "Tuya",
         description: "Door sensor with scene switch",
-        fromZigbee: [tuya.fz.datapoints, fromZigbee_1.default.ias_contact_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_contact_alarm_1_report],
+        fromZigbee: [tuya.fz.datapoints, fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_contact_alarm_1_report],
         toZigbee: [tuya.tz.datapoints],
         onEvent: tuya.onEventSetTime,
         configure: tuya.configureMagicPacket,
@@ -995,7 +992,7 @@ exports.definitions = [
         model: "LKWSZ211",
         vendor: "Tuya",
         description: "Scene remote with 2 keys",
-        fromZigbee: [tuya.fz.datapoints, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [tuya.fz.datapoints, fz.ignore_basic_report],
         toZigbee: [tuya.tz.datapoints],
         onEvent: tuya.onEventSetTime,
         configure: tuya.configureMagicPacket,
@@ -1744,8 +1741,8 @@ exports.definitions = [
             tuya.whitelabel("Lidl", "14149505L/14149506L_2", "Livarno Lux light bar RGB+CCT (black/white)", ["_TZ3210_iystcadi"]),
             tuya.whitelabel("Tuya", "TS0505B_2_2", "Zigbee GU10/E14 5W smart bulb", ["_TZ3210_it1u8ahz"]),
         ],
-        toZigbee: [toZigbee_1.default.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.tuya_led_controller, fromZigbee_1.default.brightness, fromZigbee_1.default.ignore_basic_report],
+        toZigbee: [tz.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
         exposes: [e.light_brightness_colortemp_colorhs([143, 500]).removeFeature("color_temp_startup"), tuya.exposes.doNotDisturb()],
         configure: async (device, coordinatorEndpoint) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue("lightingColorCtrl", {
@@ -1780,8 +1777,8 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Zigbee RGB+CCT light",
         whiteLabel: [tuya.whitelabel("Tuya", "TS0505B_4_1", "Zigbee 3.0 15W led light bulb E27 RGBCW", ["_TZ3210_bfwvfyx1"])],
-        toZigbee: [toZigbee_1.default.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.tuya_led_controller, fromZigbee_1.default.brightness, fromZigbee_1.default.ignore_basic_report],
+        toZigbee: [tz.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
         exposes: [e.light_brightness_colortemp_colorhs([50, 1000]).removeFeature("color_temp_startup"), tuya.exposes.doNotDisturb()],
         configure: async (device, coordinatorEndpoint) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue("lightingColorCtrl", {
@@ -1848,7 +1845,7 @@ exports.definitions = [
         model: "TS0202_3",
         vendor: "Tuya",
         description: "Motion detector with illuminance",
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_occupancy_alarm_1_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
         onEvent: tuya.onEventSetTime,
         configure: tuya.configureMagicPacket,
@@ -1860,7 +1857,7 @@ exports.definitions = [
         model: "TS0202_2",
         vendor: "Tuya",
         description: "Motion sensor with scene switch",
-        fromZigbee: [tuya.fz.datapoints, fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.datapoints, fz.ias_occupancy_alarm_1, fz.battery],
         toZigbee: [tuya.tz.datapoints],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -1889,7 +1886,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Motion sensor",
         // Requires alarm_1_with_timeout https://github.com/Koenkk/zigbee2mqtt/issues/2818#issuecomment-776119586
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1_with_timeout, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1_with_timeout, fz.battery, fz.ignore_basic_report],
         toZigbee: [],
         exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint) => {
@@ -1918,7 +1915,7 @@ exports.definitions = [
             tuya.whitelabel("Tuya", "HW500A", "Motion sensor", ["_TZ3000_bsvqrxru"]),
             tuya.whitelabel("Nedis", "ZBSM10WT", "Motion sensor", ["_TZ3000_nss8amz9"]),
         ],
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_occupancy_alarm_1_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
         exposes: (device, options) => {
             const exps = [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()];
@@ -1944,8 +1941,8 @@ exports.definitions = [
         model: "ZM-35H-Q",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ZM35HQ_attr, legacy.fromZigbee.ZM35HQ_battery],
-        toZigbee: [toZigbee_1.default.ZM35HQ_attr],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ZM35HQ_attr, legacy.fromZigbee.ZM35HQ_battery],
+        toZigbee: [tz.ZM35HQ_attr],
         extend: [m.quirkCheckinInterval(15000)],
         exposes: [
             e.occupancy(),
@@ -1962,8 +1959,8 @@ exports.definitions = [
         model: "IH012-RT01",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ZM35HQ_attr, fromZigbee_1.default.battery],
-        toZigbee: [toZigbee_1.default.ZM35HQ_attr],
+        fromZigbee: [fz.ignore_basic_report, fz.ZM35HQ_attr, fz.battery],
+        toZigbee: [tz.ZM35HQ_attr],
         extend: [
             m.quirkCheckinInterval(15000),
             // Occupancy reporting interval is 60s, so allow for one dropped update plus a small safety margin of 5s
@@ -1992,8 +1989,8 @@ exports.definitions = [
         model: "IH012-RT02",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ZM35HQ_attr, fromZigbee_1.default.battery],
-        toZigbee: [toZigbee_1.default.ZM35HQ_attr],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ignore_basic_report, fz.ZM35HQ_attr, fz.battery],
+        toZigbee: [tz.ZM35HQ_attr],
         extend: [m.quirkCheckinInterval(15000)],
         exposes: [
             e.occupancy(),
@@ -2029,7 +2026,7 @@ exports.definitions = [
         model: "TS0207_repeater",
         vendor: "Tuya",
         description: "Repeater",
-        fromZigbee: [fromZigbee_1.default.linkquality_from_basic],
+        fromZigbee: [fz.linkquality_from_basic],
         toZigbee: [],
         exposes: [],
     },
@@ -2038,7 +2035,7 @@ exports.definitions = [
         model: "TS0207_water_leak_detector",
         vendor: "Tuya",
         description: "Water leak detector",
-        fromZigbee: [fromZigbee_1.default.ias_water_leak_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [fz.ias_water_leak_alarm_1, fz.battery, fz.ignore_basic_report],
         whiteLabel: [
             { vendor: "CR Smart Home", model: "TS0207" },
             tuya.whitelabel("Meian", "SW02", "Water leak sensor", ["_TZ3000_kyb656no"]),
@@ -2759,12 +2756,12 @@ exports.definitions = [
         model: "TS130F",
         vendor: "Tuya",
         description: "Curtain/blind switch",
-        fromZigbee: [fromZigbee_1.default.cover_position_tilt, tuya.fz.indicator_mode, fromZigbee_1.default.tuya_cover_options, tuya.fz.backlight_mode_off_on],
+        fromZigbee: [fz.cover_position_tilt, tuya.fz.indicator_mode, fz.tuya_cover_options, tuya.fz.backlight_mode_off_on],
         toZigbee: [
-            toZigbee_1.default.cover_state,
-            toZigbee_1.default.cover_position_tilt,
-            toZigbee_1.default.tuya_cover_calibration,
-            toZigbee_1.default.tuya_cover_reversal,
+            tz.cover_state,
+            tz.cover_position_tilt,
+            tz.tuya_cover_calibration,
+            tz.tuya_cover_reversal,
             tuya.tz.backlight_indicator_mode_2,
             tuya.tz.backlight_indicator_mode_1,
         ],
@@ -2803,8 +2800,8 @@ exports.definitions = [
         whiteLabel: [tuya.whitelabel("Girier", "TS130F_GIRIER", "Smart curtain switch", ["_TZ3210_dwytrmda"])],
         ota: true,
         meta: { coverInverted: true },
-        fromZigbee: [fromZigbee_1.default.tuya_cover_options, fromZigbee_1.default.cover_position_tilt],
-        toZigbee: [toZigbee_1.default.cover_state, toZigbee_1.default.moes_cover_calibration, toZigbee_1.default.cover_position_tilt, toZigbee_1.default.tuya_cover_reversal],
+        fromZigbee: [fz.tuya_cover_options, fz.cover_position_tilt],
+        toZigbee: [tz.cover_state, tz.moes_cover_calibration, tz.cover_position_tilt, tz.tuya_cover_reversal],
         exposes: [
             e.cover_position(),
             e.numeric("calibration_time", ea.ALL).withValueMin(0).withValueMax(100),
@@ -2824,7 +2821,7 @@ exports.definitions = [
             e.switch().withEndpoint("l3").setAccess("state", ea.STATE_SET),
             e.switch().withEndpoint("l4").setAccess("state", ea.STATE_SET),
         ],
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         meta: { multiEndpoint: true },
         whiteLabel: [
@@ -2972,7 +2969,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "1 gang switch",
         exposes: [e.switch().setAccess("state", ea.STATE_SET)],
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         whiteLabel: [tuya.whitelabel("Shawader", "SMKG-1KNL-US/TZB-W", "1 gang switch", ["_TZE204_ojtqawav"])],
         configure: async (device, coordinatorEndpoint) => {
@@ -3007,7 +3004,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "2 gang switch",
         exposes: [e.switch().withEndpoint("l1").setAccess("state", ea.STATE_SET), e.switch().withEndpoint("l2").setAccess("state", ea.STATE_SET)],
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -3058,7 +3055,7 @@ exports.definitions = [
             e.switch().withEndpoint("l2").setAccess("state", ea.STATE_SET),
             e.switch().withEndpoint("l3").setAccess("state", ea.STATE_SET),
         ],
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -3112,7 +3109,7 @@ exports.definitions = [
         model: "TS0215A_sos",
         vendor: "Tuya",
         description: "SOS button",
-        fromZigbee: [fromZigbee_1.default.command_emergency, fromZigbee_1.default.battery],
+        fromZigbee: [fz.command_emergency, fz.battery],
         exposes: [e.battery(), e.battery_voltage(), e.action(["emergency"])],
         toZigbee: [],
         whiteLabel: [
@@ -3138,7 +3135,7 @@ exports.definitions = [
         model: "TS0215A_remote",
         vendor: "Tuya",
         description: "Security remote control",
-        fromZigbee: [fromZigbee_1.default.command_arm, fromZigbee_1.default.command_emergency, fromZigbee_1.default.battery],
+        fromZigbee: [fz.command_arm, fz.command_emergency, fz.battery],
         exposes: [e.battery(), e.action(["disarm", "arm_day_zones", "arm_night_zones", "arm_all_zones", "exit_delay", "emergency"])],
         toZigbee: [],
         whiteLabel: [
@@ -3163,8 +3160,8 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Led strip controller HSB",
         exposes: [e.light_colorhs()],
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.tuya_led_controller],
-        toZigbee: [toZigbee_1.default.tuya_led_controller, toZigbee_1.default.ignore_transition, toZigbee_1.default.ignore_rate],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller],
+        toZigbee: [tz.tuya_led_controller, tz.ignore_transition, tz.ignore_rate],
     },
     {
         zigbeeModel: ["TS0502A"],
@@ -3238,8 +3235,8 @@ exports.definitions = [
         model: "TS0505A_led",
         vendor: "Tuya",
         description: "RGB+CCT LED",
-        toZigbee: [toZigbee_1.default.on_off, toZigbee_1.default.tuya_led_control],
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.tuya_led_controller, fromZigbee_1.default.brightness, fromZigbee_1.default.ignore_basic_report],
+        toZigbee: [tz.on_off, tz.tuya_led_control],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
         exposes: [e.light_brightness_colortemp_colorhs([153, 500]).removeFeature("color_temp_startup")],
     },
     {
@@ -3273,7 +3270,7 @@ exports.definitions = [
         model: "TS0201",
         vendor: "Tuya",
         description: "Temperature & humidity sensor with display",
-        fromZigbee: [fzLocal.TS0201_battery, fromZigbee_1.default.temperature, fzLocal.TS0201_humidity],
+        fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fzLocal.TS0201_humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
         configure: tuya.configureMagicPacket,
@@ -3300,7 +3297,7 @@ exports.definitions = [
         model: "WSD500A",
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
-        fromZigbee: [fzLocal.TS0201_battery, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity],
+        fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
         configure: tuya.configureMagicPacket,
@@ -3325,7 +3322,7 @@ exports.definitions = [
         model: "IH-K009",
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
-        fromZigbee: [fzLocal.TS0201_battery, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity],
+        fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
         configure: tuya.configureMagicPacket,
@@ -3336,7 +3333,7 @@ exports.definitions = [
         model: "SM0201",
         vendor: "Tuya",
         description: "Temperature & humidity sensor with LED screen",
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity],
+        fromZigbee: [fz.battery, fz.temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
     },
@@ -3395,7 +3392,7 @@ exports.definitions = [
             tuya.whitelabel("Nous", "LZ4", "Wireless switch button", ["_TZ3000_6km7djcm"]),
         ],
         exposes: [e.battery(), e.action(["single", "double", "hold"])],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         /*
@@ -3415,7 +3412,7 @@ exports.definitions = [
             tuya.whitelabel("Marmitek", "Push_ME", "Wireless switch with 1 button", ["_TYZB01_1xktopx6"]),
         ],
         exposes: [e.battery(), e.battery_voltage(), e.action(["single", "double", "hold"])],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         /*
@@ -3436,7 +3433,7 @@ exports.definitions = [
             { vendor: "ClickSmart+", model: "CSPGM2075PW" },
         ],
         exposes: [e.battery(), e.action(["1_single", "1_double", "1_hold", "2_single", "2_double", "2_hold"])],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         /*
@@ -3457,7 +3454,7 @@ exports.definitions = [
             { vendor: "LoraTap", model: "SS600ZB" },
         ],
         exposes: [e.battery(), e.action(["1_single", "1_double", "1_hold", "2_single", "2_double", "2_hold", "3_single", "3_double", "3_hold"])],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         /*
@@ -3482,7 +3479,7 @@ exports.definitions = [
             tuya.whitelabel("Tuya", "TS0044_1", "Zigbee 4 button remote - 12 scene", ["_TZ3000_dziaict4", "_TZ3000_mh9px7cq", "_TZ3000_j61x9rxn"]),
             tuya.whitelabel("Tuya", "TM-YKQ004", "Zigbee 4 button remote - 12 scene", ["_TZ3000_u3nv1jwk"]),
         ],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         exposes: [
             e.battery(),
             e.action([
@@ -3552,18 +3549,18 @@ exports.definitions = [
             ]),
         ],
         fromZigbee: [
-            fromZigbee_1.default.battery,
+            fz.battery,
             tuya.fz.on_off_action,
-            fromZigbee_1.default.tuya_operation_mode,
-            fromZigbee_1.default.command_on,
-            fromZigbee_1.default.command_off,
-            fromZigbee_1.default.command_step,
-            fromZigbee_1.default.command_move,
-            fromZigbee_1.default.command_stop,
-            fromZigbee_1.default.command_step_color_temperature,
+            fz.tuya_operation_mode,
+            fz.command_on,
+            fz.command_off,
+            fz.command_step,
+            fz.command_move,
+            fz.command_stop,
+            fz.command_step_color_temperature,
         ],
         whiteLabel: [tuya.whitelabel("Zemismart", "ZMR4", "Wireless switch with 4 buttons", ["_TZ3000_11pg3ima", "_TZ3000_et7afzxz"])],
-        toZigbee: [toZigbee_1.default.tuya_operation_mode],
+        toZigbee: [tz.tuya_operation_mode],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read("genBasic", [0x0004, 0x000, 0x0001, 0x0005, 0x0007, 0xfffe]);
@@ -3624,8 +3621,8 @@ exports.definitions = [
                 "6_hold",
             ]),
         ],
-        fromZigbee: [fromZigbee_1.default.battery, tuya.fz.on_off_action, fromZigbee_1.default.tuya_operation_mode, fromZigbee_1.default.command_on, fromZigbee_1.default.command_off, fromZigbee_1.default.command_step, fromZigbee_1.default.command_move],
-        toZigbee: [toZigbee_1.default.tuya_operation_mode],
+        fromZigbee: [fz.battery, tuya.fz.on_off_action, fz.tuya_operation_mode, fz.command_on, fz.command_off, fz.command_step, fz.command_move],
+        toZigbee: [tz.tuya_operation_mode],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read("genBasic", [0x0004, 0x000, 0x0001, 0x0005, 0x0007, 0xfffe]);
@@ -3824,7 +3821,7 @@ exports.definitions = [
         model: "TS0601_water_sensor",
         vendor: "Tuya",
         description: "Water leak sensor",
-        fromZigbee: [legacy.fromZigbee.tuya_water_leak, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_water_leak, fz.ignore_basic_report],
         exposes: [e.water_leak()],
         toZigbee: [],
         whiteLabel: [{ vendor: "Neo", model: "NAS-WS02B0" }],
@@ -3834,7 +3831,7 @@ exports.definitions = [
         model: "WLS-100z",
         vendor: "Tuya",
         description: "Water leak sensor",
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_tuya_raw, legacy.fromZigbee.wls100z_water_leak],
+        fromZigbee: [fz.ignore_basic_report, fz.ignore_tuya_raw, legacy.fromZigbee.wls100z_water_leak],
         toZigbee: [],
         onEvent: tuya.onEventSetTime,
         configure: async (device, coordinatorEndpoint) => {
@@ -3862,8 +3859,8 @@ exports.definitions = [
         model: "TS0001_power",
         description: "Switch with power monitoring",
         vendor: "Tuya",
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering, fromZigbee_1.default.ignore_basic_report, tuya.fz.power_outage_memory, tuya.fz.switch_type],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, tuya.tz.switch_type],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_outage_memory, tuya.fz.switch_type],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tuya.tz.switch_type],
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
             const endpoint = device.getEndpoint(1);
@@ -3951,8 +3948,8 @@ exports.definitions = [
         model: "TS000F_power",
         description: "Switch with power monitoring",
         vendor: "Tuya",
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering, fromZigbee_1.default.ignore_basic_report, tuya.fz.power_on_behavior_1, tuya.fz.switch_type],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, tuya.tz.switch_type],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_on_behavior_1, tuya.fz.switch_type],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tuya.tz.switch_type],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
@@ -4407,7 +4404,7 @@ exports.definitions = [
             tuya.whitelabel("HUARUI", "CMD900LE", "Lithium battery intelligent curtain opening and closing motor", ["_TZE200_zxxfv8wi"]),
             tuya.whitelabel("Novato", "WPK", "Smart curtain track", ["_TZE204_lh3arisb"]),
         ],
-        fromZigbee: [legacy.fromZigbee.tuya_cover, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_cover, fz.ignore_basic_report],
         toZigbee: [legacy.toZigbee.tuya_cover_control, legacy.toZigbee.tuya_cover_options],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -4426,7 +4423,7 @@ exports.definitions = [
             tuya.whitelabel("Zemismart", "BCM100DB", "Curtain Motor", ["_TZE200_eegnwoyw"]),
             tuya.whitelabel("Nova Digital", "ZBCMR-01", "Roller Blind Motor", ["_TZE600_ogyg1y6b"]),
         ],
-        fromZigbee: [legacy.fromZigbee.tuya_cover, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_cover, fz.ignore_basic_report],
         toZigbee: [legacy.toZigbee.tuya_cover_control],
         exposes: [e.cover_position().setAccess("position", ea.STATE_SET)],
     },
@@ -4716,7 +4713,7 @@ exports.definitions = [
         },
         ota: true,
         onEvent: tuya.onEventSetLocalTime,
-        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_tuya_set_time],
+        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fz.ignore_basic_report, fz.ignore_tuya_set_time],
         toZigbee: [
             legacy.toZigbee.tuya_thermostat_child_lock,
             legacy.toZigbee.tuya_thermostat_window_detection,
@@ -5475,8 +5472,8 @@ exports.definitions = [
         fromZigbee: [
             legacy.fromZigbee.tuya_thermostat_weekly_schedule_2,
             legacy.fromZigbee.etop_thermostat,
-            fromZigbee_1.default.ignore_basic_report,
-            fromZigbee_1.default.ignore_tuya_set_time,
+            fz.ignore_basic_report,
+            fz.ignore_tuya_set_time,
         ],
         toZigbee: [
             legacy.toZigbee.etop_thermostat_system_mode,
@@ -5512,8 +5509,8 @@ exports.definitions = [
         fromZigbee: [
             legacy.fromZigbee.tuya_thermostat_weekly_schedule_2,
             legacy.fromZigbee.etop_thermostat,
-            fromZigbee_1.default.ignore_basic_report,
-            fromZigbee_1.default.ignore_tuya_set_time,
+            fz.ignore_basic_report,
+            fz.ignore_tuya_set_time,
         ],
         toZigbee: [
             legacy.toZigbee.etop_thermostat_system_mode,
@@ -6013,8 +6010,8 @@ exports.definitions = [
             { vendor: "Connecte", model: "4500993" },
         ],
         vendor: "Tuya",
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering, fromZigbee_1.default.ignore_basic_report, tuya.fz.power_outage_memory, tuya.fz.indicator_mode],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, tuya.tz.backlight_indicator_mode_1],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_outage_memory, tuya.fz.indicator_mode],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tuya.tz.backlight_indicator_mode_1],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff", "haElectricalMeasurement", "seMetering"]);
@@ -6980,7 +6977,7 @@ exports.definitions = [
         model: "SNTZ007",
         vendor: "Tuya",
         description: "Rechargeable Zigbee contact sensor",
-        fromZigbee: [fromZigbee_1.default.ias_contact_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_time_read],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ignore_time_read],
         toZigbee: [],
         exposes: [e.contact(), e.battery_low(), e.tamper(), e.battery()],
         whiteLabel: [{ vendor: "BlitzWolf", model: "BW-IS2" }],
@@ -6990,7 +6987,7 @@ exports.definitions = [
         model: "RH3040",
         vendor: "Tuya",
         description: "PIR sensor",
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_occupancy_alarm_1],
+        fromZigbee: [fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1],
         toZigbee: [],
         whiteLabel: [
             { vendor: "Samotech", model: "SM301Z" },
@@ -7032,7 +7029,7 @@ exports.definitions = [
         model: "TT001ZAV20",
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
-        fromZigbee: [fromZigbee_1.default.humidity, fromZigbee_1.default.temperature, fromZigbee_1.default.battery],
+        fromZigbee: [fz.humidity, fz.temperature, fz.battery],
         toZigbee: [],
         exposes: [e.humidity(), e.temperature(), e.battery()],
     },
@@ -7244,7 +7241,7 @@ exports.definitions = [
         model: "gq8b1uv",
         vendor: "Tuya",
         description: "Zigbee smart dimmer",
-        fromZigbee: [legacy.fromZigbee.tuya_dimmer, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_dimmer, fz.ignore_basic_report],
         toZigbee: [legacy.toZigbee.tuya_dimmer_state, legacy.toZigbee.tuya_dimmer_level],
         exposes: [e.light_brightness().setAccess("state", ea.STATE_SET).setAccess("brightness", ea.STATE_SET)],
         configure: async (device, coordinatorEndpoint) => {
@@ -7276,7 +7273,7 @@ exports.definitions = [
         model: "SNTZ009",
         vendor: "Tuya",
         description: "Water leak sensor",
-        fromZigbee: [legacy.fromZigbee.tuya_water_leak, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_water_leak, fz.ignore_basic_report],
         exposes: [e.water_leak()],
         toZigbee: [],
     },
@@ -7314,8 +7311,8 @@ exports.definitions = [
         model: "TS0726_2_gang",
         vendor: "Tuya",
         description: "2 gang switch with neutral wire",
-        fromZigbee: [fromZigbee_1.default.on_off, tuya.fz.power_on_behavior_2, fromZigbee_1.default.ignore_basic_report, fzLocal.TS0726_action],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
         exposes: [
             ...[1, 2].map((ep) => e.switch().withEndpoint(`l${ep}`)),
             ...[1, 2].map((ep) => e.power_on_behavior().withEndpoint(`l${ep}`)),
@@ -7338,8 +7335,8 @@ exports.definitions = [
         model: "TS0726_3_gang",
         vendor: "Tuya",
         description: "3 gang switch with neutral wire",
-        fromZigbee: [fromZigbee_1.default.on_off, tuya.fz.power_on_behavior_2, fromZigbee_1.default.ignore_basic_report, fzLocal.TS0726_action],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
         exposes: [
             ...[1, 2, 3].map((ep) => e.switch().withEndpoint(`l${ep}`)),
             ...[1, 2, 3].map((ep) => e.power_on_behavior().withEndpoint(`l${ep}`)),
@@ -7362,8 +7359,8 @@ exports.definitions = [
         model: "TS0726_4_gang",
         vendor: "Tuya",
         description: "4 gang switch with neutral wire",
-        fromZigbee: [fromZigbee_1.default.on_off, tuya.fz.power_on_behavior_2, fromZigbee_1.default.ignore_basic_report, fzLocal.TS0726_action],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
         exposes: [
             ...[1, 2, 3, 4].map((ep) => e.switch().withEndpoint(`l${ep}`)),
             ...[1, 2, 3, 4].map((ep) => e.power_on_behavior().withEndpoint(`l${ep}`)),
@@ -7441,25 +7438,25 @@ exports.definitions = [
         model: "U86KWF-ZPSJ",
         vendor: "Tuya",
         description: "Environment controller",
-        fromZigbee: [fromZigbee_1.default.thermostat, fromZigbee_1.default.fan],
+        fromZigbee: [fz.thermostat, fz.fan],
         toZigbee: [
-            toZigbee_1.default.thermostat_local_temperature,
-            toZigbee_1.default.thermostat_local_temperature_calibration,
-            toZigbee_1.default.thermostat_occupancy,
-            toZigbee_1.default.thermostat_occupied_heating_setpoint,
-            toZigbee_1.default.thermostat_unoccupied_heating_setpoint,
-            toZigbee_1.default.thermostat_occupied_cooling_setpoint,
-            toZigbee_1.default.thermostat_unoccupied_cooling_setpoint,
-            toZigbee_1.default.thermostat_setpoint_raise_lower,
-            toZigbee_1.default.thermostat_remote_sensing,
-            toZigbee_1.default.thermostat_control_sequence_of_operation,
-            toZigbee_1.default.thermostat_system_mode,
-            toZigbee_1.default.thermostat_weekly_schedule,
-            toZigbee_1.default.thermostat_clear_weekly_schedule,
-            toZigbee_1.default.thermostat_relay_status_log,
-            toZigbee_1.default.thermostat_temperature_setpoint_hold,
-            toZigbee_1.default.thermostat_temperature_setpoint_hold_duration,
-            toZigbee_1.default.fan_mode,
+            tz.thermostat_local_temperature,
+            tz.thermostat_local_temperature_calibration,
+            tz.thermostat_occupancy,
+            tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_unoccupied_heating_setpoint,
+            tz.thermostat_occupied_cooling_setpoint,
+            tz.thermostat_unoccupied_cooling_setpoint,
+            tz.thermostat_setpoint_raise_lower,
+            tz.thermostat_remote_sensing,
+            tz.thermostat_control_sequence_of_operation,
+            tz.thermostat_system_mode,
+            tz.thermostat_weekly_schedule,
+            tz.thermostat_clear_weekly_schedule,
+            tz.thermostat_relay_status_log,
+            tz.thermostat_temperature_setpoint_hold,
+            tz.thermostat_temperature_setpoint_hold_duration,
+            tz.fan_mode,
         ],
         exposes: [
             e
@@ -7496,7 +7493,7 @@ exports.definitions = [
                 .withSystemMode(["off", "auto", "heat"], ea.STATE_SET)
                 .withRunningState(["idle", "heat", "cool"], ea.STATE),
         ],
-        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fromZigbee_1.default.ignore_basic_report, legacy.fromZigbee.tuya_dimmer],
+        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fz.ignore_basic_report, legacy.fromZigbee.tuya_dimmer],
         meta: {
             tuyaThermostatSystemMode: legacy.thermostatSystemModes2,
             tuyaThermostatPreset: legacy.thermostatPresets,
@@ -7514,7 +7511,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Multiprise with 4 AC outlets and 2 USB super charging ports (16A)",
         extend: [tuya.modernExtend.tuyaOnOff()],
-        fromZigbee: [fromZigbee_1.default.on_off_skip_duplicate_transaction],
+        fromZigbee: [fz.on_off_skip_duplicate_transaction],
         exposes: [e.switch().withEndpoint("l1"), e.switch().withEndpoint("l2"), e.switch().withEndpoint("l3"), e.switch().withEndpoint("l4")],
         whiteLabel: [{ vendor: "LELLKI", model: "WP33-EU" }],
         meta: { multiEndpoint: true },
@@ -7534,13 +7531,13 @@ exports.definitions = [
         model: "TS0216",
         vendor: "Tuya",
         description: "Sound and flash siren",
-        fromZigbee: [fromZigbee_1.default.ts0216_siren, fromZigbee_1.default.battery],
+        fromZigbee: [fz.ts0216_siren, fz.battery],
         exposes: [
             e.battery(),
             e.binary("alarm", ea.STATE_SET, true, false),
             e.numeric("volume", ea.ALL).withValueMin(0).withValueMax(100).withDescription("Volume of siren"),
         ],
-        toZigbee: [toZigbee_1.default.ts0216_alarm, toZigbee_1.default.ts0216_duration, toZigbee_1.default.ts0216_volume],
+        toZigbee: [tz.ts0216_alarm, tz.ts0216_duration, tz.ts0216_volume],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genPowerCfg"]);
@@ -7554,7 +7551,7 @@ exports.definitions = [
         model: "HY08WE",
         vendor: "Tuya",
         description: "Wall-mount thermostat",
-        fromZigbee: [legacy.fromZigbee.hy_thermostat, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.hy_thermostat, fz.ignore_basic_report],
         toZigbee: [legacy.toZigbee.hy_thermostat],
         onEvent: tuya.onEventSetTime,
         exposes: [
@@ -7608,7 +7605,7 @@ exports.definitions = [
         model: "X5H-GB-B",
         vendor: "Tuya",
         description: "Wall-mount thermostat",
-        fromZigbee: [fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_tuya_set_time, legacy.fromZigbee.x5h_thermostat],
+        fromZigbee: [fz.ignore_basic_report, fz.ignore_tuya_set_time, legacy.fromZigbee.x5h_thermostat],
         toZigbee: [legacy.toZigbee.x5h_thermostat],
         whiteLabel: [
             { vendor: "Beok", model: "TGR85-ZB" },
@@ -7912,7 +7909,7 @@ exports.definitions = [
         model: "TS0222_temperature_humidity",
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
-        fromZigbee: [fzLocal.TS0222_humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature],
+        fromZigbee: [fzLocal.TS0222_humidity, fz.battery, fz.temperature],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         exposes: [e.battery(), e.temperature(), e.humidity()],
@@ -7924,7 +7921,7 @@ exports.definitions = [
         model: "TS0222_light",
         vendor: "Tuya",
         description: "Light sensor",
-        fromZigbee: [fromZigbee_1.default.battery],
+        fromZigbee: [fz.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         whiteLabel: [tuya.whitelabel("Moes", "ZSS-QT-LS-C", "Light sensor", ["_TZ3000_9kbbfeho"])],
@@ -7936,7 +7933,7 @@ exports.definitions = [
         model: "THE01860A",
         vendor: "Tuya",
         description: "Temp & humidity flower sensor with illuminance",
-        fromZigbee: [fromZigbee_1.default.humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature],
+        fromZigbee: [fz.humidity, fz.battery, fz.temperature],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         exposes: [e.battery(), e.temperature(), e.humidity()],
@@ -7947,7 +7944,7 @@ exports.definitions = [
         model: "TS0222",
         vendor: "Tuya",
         description: "Light intensity sensor",
-        fromZigbee: [fromZigbee_1.default.battery, legacy.fromZigbee.TS0222],
+        fromZigbee: [fz.battery, legacy.fromZigbee.TS0222],
         toZigbee: [],
         exposes: [e.battery()],
         configure: tuya.configureMagicPacket,
@@ -7959,8 +7956,8 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Vibration sensor",
         whiteLabel: [tuya.whitelabel("Niceboy", "ORBIS Vibration Sensor", "Vibration sensor", ["_TYZB01_821siati"])],
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.ias_vibration_alarm_1_with_timeout],
-        toZigbee: [toZigbee_1.default.TS0210_sensitivity],
+        fromZigbee: [fz.battery, fz.ias_vibration_alarm_1_with_timeout],
+        toZigbee: [tz.TS0210_sensitivity],
         exposes: [
             e.battery(),
             e.battery_voltage(),
@@ -8005,14 +8002,14 @@ exports.definitions = [
         description: "Din smart relay (with power monitoring)",
         vendor: "Tuya",
         fromZigbee: [
-            fromZigbee_1.default.on_off,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_basic_report,
+            fz.on_off,
+            fz.electrical_measurement,
+            fz.metering,
+            fz.ignore_basic_report,
             tuya.fz.power_outage_memory,
-            fromZigbee_1.default.tuya_relay_din_led_indicator,
+            fz.tuya_relay_din_led_indicator,
         ],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, toZigbee_1.default.tuya_relay_din_led_indicator],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tz.tuya_relay_din_led_indicator],
         whiteLabel: [{ vendor: "MatSee Plus", model: "ATMS1602Z" }],
         ota: true,
         configure: async (device, coordinatorEndpoint) => {
@@ -8048,14 +8045,14 @@ exports.definitions = [
         description: "Din smart relay (with power monitoring via polling)",
         vendor: "Tuya",
         fromZigbee: [
-            fromZigbee_1.default.on_off,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_basic_report,
+            fz.on_off,
+            fz.electrical_measurement,
+            fz.metering,
+            fz.ignore_basic_report,
             tuya.fz.power_outage_memory,
-            fromZigbee_1.default.tuya_relay_din_led_indicator,
+            fz.tuya_relay_din_led_indicator,
         ],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, toZigbee_1.default.tuya_relay_din_led_indicator],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tz.tuya_relay_din_led_indicator],
         whiteLabel: [
             tuya.whitelabel("Tongou", "TO-Q-SY1-JZT", "Din smart relay (with power monitoring via polling)", ["_TZ3000_qeuvnohg"]),
             tuya.whitelabel("TOMZN", "TOB9Z-63M", "Din smart relay (with power monitoring via polling)", ["_TZ3000_6l1pjfqe"]),
@@ -8096,8 +8093,8 @@ exports.definitions = [
         model: "ATMS1601Z",
         description: "Din smart relay (without power monitoring)",
         vendor: "Tuya",
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.ignore_basic_report, tuya.fz.power_outage_memory, fromZigbee_1.default.tuya_relay_din_led_indicator],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, toZigbee_1.default.tuya_relay_din_led_indicator],
+        fromZigbee: [fz.on_off, fz.ignore_basic_report, tuya.fz.power_outage_memory, fz.tuya_relay_din_led_indicator],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tz.tuya_relay_din_led_indicator],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff"]);
@@ -8176,7 +8173,7 @@ exports.definitions = [
         model: "GDC311ZBQ1",
         vendor: "Tuya",
         description: "LoraTap garage door opener with wireless sensor",
-        fromZigbee: [legacy.fromZigbee.matsee_garage_door_opener, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.matsee_garage_door_opener, fz.ignore_basic_report],
         toZigbee: [legacy.toZigbee.matsee_garage_door_opener, legacy.toZigbee.tuya_data_point_test],
         whiteLabel: [{ vendor: "LoraTap", model: "GDC311ZBQ1" }],
         configure: async (device, coordinatorEndpoint) => {
@@ -8222,8 +8219,8 @@ exports.definitions = [
         model: "LCZ030",
         vendor: "Tuya",
         description: "Temperature & humidity & illuminance sensor with display",
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity, fromZigbee_1.default.ts0201_temperature_humidity_alarm],
-        toZigbee: [toZigbee_1.default.ts0201_temperature_humidity_alarm],
+        fromZigbee: [fz.battery, fz.temperature, fz.humidity, fz.ts0201_temperature_humidity_alarm],
+        toZigbee: [tz.ts0201_temperature_humidity_alarm],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             // Enables reporting of measurement state changes
@@ -8377,7 +8374,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Wireless switch with 6 buttons",
         whiteLabel: [{ vendor: "LoraTap", model: "SS9600ZB" }],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         exposes: [
             e.battery(),
             e.action([
@@ -8439,17 +8436,17 @@ exports.definitions = [
                 .withDescription('Operation mode: "command" - for group control, "event" - for clicks'),
         ],
         fromZigbee: [
-            fromZigbee_1.default.battery,
-            fromZigbee_1.default.command_on,
-            fromZigbee_1.default.command_off,
-            fromZigbee_1.default.command_step,
-            fromZigbee_1.default.command_move,
-            fromZigbee_1.default.command_stop,
-            fromZigbee_1.default.command_step_color_temperature,
+            fz.battery,
+            fz.command_on,
+            fz.command_off,
+            fz.command_step,
+            fz.command_move,
+            fz.command_stop,
+            fz.command_step_color_temperature,
             tuya.fz.on_off_action,
-            fromZigbee_1.default.tuya_operation_mode,
+            fz.tuya_operation_mode,
         ],
-        toZigbee: [toZigbee_1.default.tuya_operation_mode],
+        toZigbee: [tz.tuya_operation_mode],
         onEvent: tuya.onEventSetLocalTime,
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -8514,16 +8511,16 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Smart knob",
         fromZigbee: [
-            fromZigbee_1.default.command_step,
-            fromZigbee_1.default.command_toggle,
-            fromZigbee_1.default.command_move_hue,
-            fromZigbee_1.default.command_step_color_temperature,
-            fromZigbee_1.default.command_stop_move_raw,
-            fromZigbee_1.default.tuya_multi_action,
-            fromZigbee_1.default.tuya_operation_mode,
-            fromZigbee_1.default.battery,
+            fz.command_step,
+            fz.command_toggle,
+            fz.command_move_hue,
+            fz.command_step_color_temperature,
+            fz.command_stop_move_raw,
+            fz.tuya_multi_action,
+            fz.tuya_operation_mode,
+            fz.battery,
         ],
-        toZigbee: [toZigbee_1.default.tuya_operation_mode],
+        toZigbee: [tz.tuya_operation_mode],
         exposes: [
             e.action([
                 "toggle",
@@ -9054,7 +9051,7 @@ exports.definitions = [
         model: "JM-TRH-ZGB-V1",
         vendor: "Tuya",
         description: "Temperature & humidity sensor with clock",
-        fromZigbee: [legacy.fromZigbee.nous_lcd_temperature_humidity_sensor, fromZigbee_1.default.ignore_tuya_set_time],
+        fromZigbee: [legacy.fromZigbee.nous_lcd_temperature_humidity_sensor, fz.ignore_tuya_set_time],
         toZigbee: [legacy.toZigbee.nous_lcd_temperature_humidity_sensor],
         onEvent: tuya.onEventSetLocalTime,
         configure: async (device, coordinatorEndpoint) => {
@@ -9086,7 +9083,7 @@ exports.definitions = [
         model: "ZB-Sm",
         vendor: "Tuya",
         description: "Tubular motor",
-        fromZigbee: [legacy.fromZigbee.zb_sm_cover, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.zb_sm_cover, fz.ignore_basic_report],
         toZigbee: [legacy.toZigbee.zb_sm_cover],
         onEvent: tuya.onEventSetTime,
         exposes: [
@@ -9136,7 +9133,7 @@ exports.definitions = [
         model: "KCTW1Z",
         vendor: "Tuya",
         description: "Temperature & humidity sensor with LCD",
-        fromZigbee: [fromZigbee_1.default.temperature, fzLocal.humidity10, fzLocal.temperature_unit, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_tuya_set_time],
+        fromZigbee: [fz.temperature, fzLocal.humidity10, fzLocal.temperature_unit, fz.battery, fz.ignore_tuya_set_time],
         toZigbee: [tzLocal.temperature_unit],
         onEvent: tuya.onEventSetLocalTime,
         exposes: [
@@ -9725,8 +9722,8 @@ exports.definitions = [
         vendor: "Tuya",
         description: "1 channel dimmer",
         extend: [m.light({ powerOnBehavior: false, configureReporting: true })],
-        fromZigbee: [tuya.fz.power_on_behavior_1, fromZigbee_1.default.TS110E_switch_type, fromZigbee_1.default.TS110E, fromZigbee_1.default.on_off],
-        toZigbee: [toZigbee_1.default.TS110E_light_onoff_brightness, tuya.tz.power_on_behavior_1, toZigbee_1.default.TS110E_options],
+        fromZigbee: [tuya.fz.power_on_behavior_1, fz.TS110E_switch_type, fz.TS110E, fz.on_off],
+        toZigbee: [tz.TS110E_light_onoff_brightness, tuya.tz.power_on_behavior_1, tz.TS110E_options],
         exposes: [e.power_on_behavior(), tuya.exposes.switchType(), e.min_brightness(), e.max_brightness()],
         configure: tuya.configureMagicPacket,
     },
@@ -9740,8 +9737,8 @@ exports.definitions = [
             tuya.whitelabel("Lonsonho", "QS-Zigbee-D02-TRIAC-LN_1", "1 channel dimmer", ["_TZ3210_ngqk6jia"]),
         ],
         ota: true,
-        fromZigbee: [fromZigbee_1.default.TS110E, fromZigbee_1.default.TS110E_light_type, tuya.fz.power_on_behavior_1, fromZigbee_1.default.on_off],
-        toZigbee: [toZigbee_1.default.TS110E_onoff_brightness, toZigbee_1.default.TS110E_options, tuya.tz.power_on_behavior_1, toZigbee_1.default.light_brightness_move],
+        fromZigbee: [fz.TS110E, fz.TS110E_light_type, tuya.fz.power_on_behavior_1, fz.on_off],
+        toZigbee: [tz.TS110E_onoff_brightness, tz.TS110E_options, tuya.tz.power_on_behavior_1, tz.light_brightness_move],
         exposes: [
             e.light_brightness().withMinBrightness().withMaxBrightness(),
             tuya.exposes.lightType().withAccess(ea.ALL),
@@ -9760,8 +9757,8 @@ exports.definitions = [
         model: "EKAC-T3095Z",
         vendor: "Ekaza",
         description: "1 channel dimmer",
-        fromZigbee: [fromZigbee_1.default.TS110E, tuya.fz.power_on_behavior_1, fromZigbee_1.default.on_off],
-        toZigbee: [toZigbee_1.default.TS110E_onoff_brightness, toZigbee_1.default.TS110E_options, tuya.tz.power_on_behavior_1, toZigbee_1.default.light_brightness_move],
+        fromZigbee: [fz.TS110E, tuya.fz.power_on_behavior_1, fz.on_off],
+        toZigbee: [tz.TS110E_onoff_brightness, tz.TS110E_options, tuya.tz.power_on_behavior_1, tz.light_brightness_move],
         exposes: [e.light_brightness().withMinBrightness().withMaxBrightness(), e.power_on_behavior().withAccess(ea.ALL)],
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
@@ -9783,8 +9780,8 @@ exports.definitions = [
                 configureReporting: true,
             }),
         ],
-        fromZigbee: [tuya.fz.power_on_behavior_1, fromZigbee_1.default.TS110E_switch_type, fromZigbee_1.default.TS110E],
-        toZigbee: [toZigbee_1.default.TS110E_light_onoff_brightness, tuya.tz.power_on_behavior_1, toZigbee_1.default.TS110E_options],
+        fromZigbee: [tuya.fz.power_on_behavior_1, fz.TS110E_switch_type, fz.TS110E],
+        toZigbee: [tz.TS110E_light_onoff_brightness, tuya.tz.power_on_behavior_1, tz.TS110E_options],
         configure: tuya.configureMagicPacket,
         exposes: [
             e.min_brightness().withEndpoint("l1"),
@@ -9801,8 +9798,8 @@ exports.definitions = [
         model: "TS110E_2gang_2",
         vendor: "Tuya",
         description: "2 channel dimmer",
-        fromZigbee: [fromZigbee_1.default.TS110E, fromZigbee_1.default.TS110E_light_type, tuya.fz.power_on_behavior_1, fromZigbee_1.default.on_off],
-        toZigbee: [toZigbee_1.default.TS110E_onoff_brightness, toZigbee_1.default.TS110E_options, tuya.tz.power_on_behavior_1, toZigbee_1.default.light_brightness_move],
+        fromZigbee: [fz.TS110E, fz.TS110E_light_type, tuya.fz.power_on_behavior_1, fz.on_off],
+        toZigbee: [tz.TS110E_onoff_brightness, tz.TS110E_options, tuya.tz.power_on_behavior_1, tz.light_brightness_move],
         meta: { multiEndpoint: true },
         exposes: [
             e.light_brightness().withMinBrightness().withMaxBrightness().withEndpoint("l1"),
@@ -10064,7 +10061,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Smart light & sound siren",
         fromZigbee: [],
-        toZigbee: [toZigbee_1.default.warning, tzLocal.TS0224],
+        toZigbee: [tz.warning, tzLocal.TS0224],
         exposes: [
             e.warning(),
             e.binary("light", ea.STATE_SET, "ON", "OFF").withDescription("Turn the light of the alarm ON/OFF"),
@@ -10084,7 +10081,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Smart button",
         exposes: [e.battery(), e.battery_voltage(), e.action(["single", "double"])],
-        fromZigbee: [tuya.fz.on_off_action, fromZigbee_1.default.battery],
+        fromZigbee: [tuya.fz.on_off_action, fz.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
     },
@@ -10109,7 +10106,7 @@ exports.definitions = [
                 indicatorMode: true,
             }),
         ],
-        fromZigbee: [fromZigbee_1.default.temperature, fzLocal.TS011F_threshold],
+        fromZigbee: [fz.temperature, fzLocal.TS011F_threshold],
         toZigbee: [tzLocal.TS011F_threshold],
         exposes: (device, options) => {
             const exposes = [];
@@ -10359,8 +10356,8 @@ exports.definitions = [
         model: "TS030F",
         vendor: "Tuya",
         description: "Smart blind controller",
-        fromZigbee: [fromZigbee_1.default.cover_position_tilt, fromZigbee_1.default.tuya_cover_options_2],
-        toZigbee: [toZigbee_1.default.cover_position_tilt, toZigbee_1.default.cover_state, tzLocal.TS030F_border, toZigbee_1.default.moes_cover_calibration, toZigbee_1.default.tuya_cover_reversal],
+        fromZigbee: [fz.cover_position_tilt, fz.tuya_cover_options_2],
+        toZigbee: [tz.cover_position_tilt, tz.cover_state, tzLocal.TS030F_border, tz.moes_cover_calibration, tz.tuya_cover_reversal],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genPowerCfg", "closuresWindowCovering"]);
@@ -10533,7 +10530,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_ves1ycwx", "_TZE200_ves1ycwx"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_ves1ycwx", "_TZE284_ves1ycwx", "_TZE200_ves1ycwx"]),
         model: "SPM02",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
@@ -10568,7 +10565,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_qhlxve78", "_TZE204_qhlxve78"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_qhlxve78", "_TZE284_qhlxve78", "_TZE204_qhlxve78"]),
         model: "SPM01V2",
         vendor: "Tuya",
         description: "Smart energy monitor for 1P+N system",
@@ -10644,7 +10641,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_v9hkz2yn", "_TZE200_v9hkz2yn"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_v9hkz2yn", "_TZE284_v9hkz2yn", "_TZE200_v9hkz2yn"]),
         model: "SPM02V2",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
@@ -10978,7 +10975,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_gomuk3dc", "_TZE200_gomuk3dc"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_gomuk3dc", "_TZE284_gomuk3dc", "_TZE200_gomuk3dc"]),
         model: "SDM01V1.5",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
@@ -11047,7 +11044,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_78ioiaml", "_TZE200_78ioiaml"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_78ioiaml", "_TZE284_78ioiaml", "_TZE200_78ioiaml"]),
         model: "SDM02V1",
         vendor: "Tuya",
         description: "Smart energy monitor for 2P+N system",
@@ -11377,7 +11374,7 @@ exports.definitions = [
         model: "SM0202",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1_with_timeout, fromZigbee_1.default.battery],
+        fromZigbee: [fz.ias_occupancy_alarm_1_with_timeout, fz.battery],
         toZigbee: [],
         exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint) => {
@@ -11396,8 +11393,8 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Zigbee fingerbot plus",
         whiteLabel: [tuya.whitelabel("Adaprox", "TS0001_fingerbot_1", "Zigbee fingerbot plus", ["_TZ3210_dse8ogfy"])],
-        fromZigbee: [fromZigbee_1.default.on_off, tuya.fz.datapoints],
-        toZigbee: [toZigbee_1.default.on_off, tuya.tz.datapoints],
+        fromZigbee: [fz.on_off, tuya.fz.datapoints],
+        toZigbee: [tz.on_off, tuya.tz.datapoints],
         exposes: [
             e.switch(),
             e.battery(),
@@ -11659,7 +11656,7 @@ exports.definitions = [
         model: "M9-zigbee-SL",
         vendor: "Tuya",
         description: "Smart Switch (4 gang + 4 scene) with neutral wire and motion sensing",
-        fromZigbee: [tuya.fz.datapoints, fromZigbee_1.default.ias_occupancy_only_alarm_2, tuya.fz.indicator_mode],
+        fromZigbee: [tuya.fz.datapoints, fz.ias_occupancy_only_alarm_2, tuya.fz.indicator_mode],
         toZigbee: [tuya.tz.datapoints, tuya.tz.power_on_behavior_1, tuya.tz.backlight_indicator_mode_1],
         configure: tuya.configureMagicPacket,
         exposes: [
@@ -13391,8 +13388,8 @@ exports.definitions = [
         model: "QS-Zigbee-D04",
         vendor: "LEDRON",
         description: "0-10v dimmer",
-        fromZigbee: [fromZigbee_1.default.TS110E, fromZigbee_1.default.on_off],
-        toZigbee: [toZigbee_1.default.TS110E_onoff_brightness, toZigbee_1.default.TS110E_options, toZigbee_1.default.light_brightness_move],
+        fromZigbee: [fz.TS110E, fz.on_off],
+        toZigbee: [tz.TS110E_onoff_brightness, tz.TS110E_options, tz.light_brightness_move],
         whiteLabel: [tuya.whitelabel("Ledron", "QS-Zigbee-D06-DC", "Dimmer 12-36v", ["_TZ3210_hquixjeg"])],
         exposes: [e.light_brightness().withMinBrightness().withMaxBrightness()],
         configure: async (device, coordinatorEndpoint) => {
@@ -15325,7 +15322,7 @@ exports.definitions = [
         vendor: "LeapMMW",
         description: "Human presence sensor",
         extend: [tuyaBase({ dp: true })],
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.ias_occupancy_alarm_1_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ias_occupancy_alarm_1_report],
         exposes: [
             e.occupancy(),
             e.illuminance(),