zigbee-herdsman-converters 23.0.0 → 23.1.0

package/dist/lib/modernExtend.js

@@ -32,9 +32,6 @@ 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.TIME_LOOKUP = void 0;
 exports.setupAttributes = setupAttributes;
@@ -85,8 +82,8 @@ exports.deviceAddCustomCluster = deviceAddCustomCluster;
 exports.ignoreClusterReport = ignoreClusterReport;
 exports.bindCluster = bindCluster;
 const zigbee_herdsman_1 = require("zigbee-herdsman");
-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 logger_1 = require("../lib/logger");
 const globalStore = __importStar(require("../lib/store"));
 const exposes_1 = require("./exposes");
@@ -466,12 +463,12 @@ function onOff(args) {
     const exposes = args.description
         ? (0, utils_1.exposeEndpoints)(exposes_1.presets.switch(args.description), args.endpointNames)
         : (0, utils_1.exposeEndpoints)(exposes_1.presets.switch(), args.endpointNames);
-    const fromZigbee = [args.skipDuplicateTransaction ? fromZigbee_1.default.on_off_skip_duplicate_transaction : fromZigbee_1.default.on_off];
-    const toZigbee = [args?.endpointNames ? { ...toZigbee_1.default.on_off, endpoints: args?.endpointNames } : toZigbee_1.default.on_off];
+    const fromZigbee = [args.skipDuplicateTransaction ? fz.on_off_skip_duplicate_transaction : fz.on_off];
+    const toZigbee = [args?.endpointNames ? { ...tz.on_off, endpoints: args?.endpointNames } : tz.on_off];
     if (args.powerOnBehavior) {
         exposes.push(...(0, utils_1.exposeEndpoints)(exposes_1.presets.power_on_behavior(["off", "on", "toggle", "previous"]), args.endpointNames));
-        fromZigbee.push(fromZigbee_1.default.power_on_behavior);
-        toZigbee.push(toZigbee_1.default.power_on_behavior);
+        fromZigbee.push(fz.power_on_behavior);
+        toZigbee.push(tz.power_on_behavior);
     }
     const result = { exposes, fromZigbee, toZigbee, isModernExtend: true };
     if (args.ota)
@@ -855,37 +852,37 @@ function light(args) {
         }
         : false;
     const lightExpose = (0, utils_1.exposeEndpoints)(exposes_1.presets.light().withBrightness(), args.endpointNames);
-    const fromZigbee = [fromZigbee_1.default.on_off, fromZigbee_1.default.brightness, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.level_config];
+    const fromZigbee = [fz.on_off, fz.brightness, fz.ignore_basic_report, fz.level_config];
     const toZigbee = [
-        args?.endpointNames ? { ...toZigbee_1.default.light_onoff_brightness, endpoints: args?.endpointNames } : toZigbee_1.default.light_onoff_brightness,
-        toZigbee_1.default.ignore_transition,
-        toZigbee_1.default.level_config,
-        toZigbee_1.default.ignore_rate,
-        toZigbee_1.default.light_brightness_move,
-        toZigbee_1.default.light_brightness_step,
+        args?.endpointNames ? { ...tz.light_onoff_brightness, endpoints: args?.endpointNames } : tz.light_onoff_brightness,
+        tz.ignore_transition,
+        tz.level_config,
+        tz.ignore_rate,
+        tz.light_brightness_move,
+        tz.light_brightness_step,
     ];
     const meta = {};
     if (args.colorTemp || argsColor) {
-        fromZigbee.push(fromZigbee_1.default.color_colortemp);
+        fromZigbee.push(fz.color_colortemp);
         if (args.colorTemp && argsColor)
-            toZigbee.push(toZigbee_1.default.light_color_colortemp);
+            toZigbee.push(tz.light_color_colortemp);
         else if (args.colorTemp)
-            toZigbee.push(toZigbee_1.default.light_colortemp);
+            toZigbee.push(tz.light_colortemp);
         else if (argsColor)
-            toZigbee.push(toZigbee_1.default.light_color);
-        toZigbee.push(toZigbee_1.default.light_color_mode, toZigbee_1.default.light_color_options);
+            toZigbee.push(tz.light_color);
+        toZigbee.push(tz.light_color_mode, tz.light_color_options);
     }
     if (args.colorTemp) {
         lightExpose.forEach((e) => e.withColorTemp(args.colorTemp.range));
-        toZigbee.push(toZigbee_1.default.light_colortemp_move, toZigbee_1.default.light_colortemp_step);
+        toZigbee.push(tz.light_colortemp_move, tz.light_colortemp_step);
         if (args.colorTemp.startup) {
-            toZigbee.push(toZigbee_1.default.light_colortemp_startup);
+            toZigbee.push(tz.light_colortemp_startup);
             lightExpose.forEach((e) => e.withColorTempStartup(args.colorTemp.range));
         }
     }
     if (argsColor) {
         lightExpose.forEach((e) => e.withColor(argsColor.modes));
-        toZigbee.push(toZigbee_1.default.light_hue_saturation_move, toZigbee_1.default.light_hue_saturation_step);
+        toZigbee.push(tz.light_hue_saturation_move, tz.light_hue_saturation_step);
         if (argsColor.modes.includes("hs")) {
             meta.supportsHueAndSaturation = true;
         }
@@ -898,7 +895,7 @@ function light(args) {
     }
     if (args.levelConfig) {
         lightExpose.forEach((e) => e.withLevelConfig(args.levelConfig.disabledFeatures ?? []));
-        toZigbee.push(toZigbee_1.default.level_config);
+        toZigbee.push(tz.level_config);
     }
     const exposes = lightExpose;
     if (args.effect) {
@@ -907,12 +904,12 @@ function light(args) {
             effects.values.push("colorloop", "stop_colorloop");
         }
         exposes.push(...(0, utils_1.exposeEndpoints)(effects, args.endpointNames));
-        toZigbee.push(toZigbee_1.default.effect);
+        toZigbee.push(tz.effect);
     }
     if (args.powerOnBehavior) {
         exposes.push(...(0, utils_1.exposeEndpoints)(exposes_1.presets.power_on_behavior(["off", "on", "toggle", "previous"]), args.endpointNames));
-        fromZigbee.push(fromZigbee_1.default.power_on_behavior);
-        toZigbee.push(toZigbee_1.default.power_on_behavior);
+        fromZigbee.push(fz.power_on_behavior);
+        toZigbee.push(tz.power_on_behavior);
     }
     if (args.turnsOffAtBrightness1 !== undefined) {
         meta.turnsOffAtBrightness1 = args.turnsOffAtBrightness1;
@@ -969,7 +966,7 @@ function commandsLevelCtrl(args) {
     const exposes = [
         exposes_1.presets.enum("action", exposes_1.access.STATE, actions).withDescription("Triggered action (e.g. a button click)").withCategory("diagnostic"),
     ];
-    const fromZigbee = [fromZigbee_1.default.command_move_to_level, fromZigbee_1.default.command_move, fromZigbee_1.default.command_step, fromZigbee_1.default.command_stop];
+    const fromZigbee = [fz.command_move_to_level, fz.command_move, fz.command_step, fz.command_stop];
     const result = { exposes, fromZigbee, isModernExtend: true };
     if (args.bind)
         result.configure = [setupConfigureForBinding("genLevelCtrl", "output", args.endpointNames)];
@@ -1008,18 +1005,18 @@ function commandsColorCtrl(args) {
         exposes_1.presets.enum("action", exposes_1.access.STATE, actions).withDescription("Triggered action (e.g. a button click)").withCategory("diagnostic"),
     ];
     const fromZigbee = [
-        fromZigbee_1.default.command_move_color_temperature,
-        fromZigbee_1.default.command_step_color_temperature,
-        fromZigbee_1.default.command_ehanced_move_to_hue_and_saturation,
-        fromZigbee_1.default.command_move_to_hue_and_saturation,
-        fromZigbee_1.default.command_step_hue,
-        fromZigbee_1.default.command_step_saturation,
-        fromZigbee_1.default.command_color_loop_set,
-        fromZigbee_1.default.command_move_to_color_temp,
-        fromZigbee_1.default.command_move_to_color,
-        fromZigbee_1.default.command_move_hue,
-        fromZigbee_1.default.command_move_to_saturation,
-        fromZigbee_1.default.command_move_to_hue,
+        fz.command_move_color_temperature,
+        fz.command_step_color_temperature,
+        fz.command_ehanced_move_to_hue_and_saturation,
+        fz.command_move_to_hue_and_saturation,
+        fz.command_step_hue,
+        fz.command_step_saturation,
+        fz.command_color_loop_set,
+        fz.command_move_to_color_temp,
+        fz.command_move_to_color,
+        fz.command_move_hue,
+        fz.command_move_to_saturation,
+        fz.command_move_to_hue,
     ];
     const result = { exposes, fromZigbee, isModernExtend: true };
     if (args.bind)
@@ -1028,8 +1025,8 @@ function commandsColorCtrl(args) {
 }
 function lightingBallast() {
     const result = {
-        fromZigbee: [fromZigbee_1.default.lighting_ballast_configuration],
-        toZigbee: [toZigbee_1.default.ballast_config],
+        fromZigbee: [fz.lighting_ballast_configuration],
+        toZigbee: [tz.ballast_config],
         exposes: [
             new exposes_1.Numeric("ballast_minimum_level", exposes_1.access.ALL)
                 .withValueMin(1)
@@ -1047,13 +1044,13 @@ function lightingBallast() {
 }
 function lock(args) {
     args = { ...args };
-    const fromZigbee = [fromZigbee_1.default.lock, fromZigbee_1.default.lock_operation_event, fromZigbee_1.default.lock_programming_event, fromZigbee_1.default.lock_pin_code_response, fromZigbee_1.default.lock_user_status_response];
+    const fromZigbee = [fz.lock, fz.lock_operation_event, fz.lock_programming_event, fz.lock_pin_code_response, fz.lock_user_status_response];
     const toZigbee = [
-        { ...toZigbee_1.default.lock, endpoints: args?.endpointNames },
-        toZigbee_1.default.pincode_lock,
-        toZigbee_1.default.lock_userstatus,
-        toZigbee_1.default.lock_auto_relock_time,
-        toZigbee_1.default.lock_sound_volume,
+        { ...tz.lock, endpoints: args?.endpointNames },
+        tz.pincode_lock,
+        tz.lock_userstatus,
+        tz.lock_auto_relock_time,
+        tz.lock_sound_volume,
     ];
     const exposes = [
         exposes_1.presets.lock(),
@@ -1082,8 +1079,8 @@ function windowCovering(args) {
     if (args.controls.includes("tilt"))
         coverExpose = coverExpose.withTilt();
     const exposes = [coverExpose];
-    const fromZigbee = [fromZigbee_1.default.cover_position_tilt];
-    const toZigbee = [{ ...toZigbee_1.default.cover_state, endpoints: args?.endpointNames }, toZigbee_1.default.cover_position_tilt];
+    const fromZigbee = [fz.cover_position_tilt];
+    const toZigbee = [{ ...tz.cover_state, endpoints: args?.endpointNames }, tz.cover_position_tilt];
     const result = { exposes, fromZigbee, toZigbee, isModernExtend: true };
     if (args.configureReporting) {
         const configure = [];
@@ -1104,7 +1101,7 @@ function windowCovering(args) {
         result.meta = meta;
     }
     if (args.coverMode) {
-        result.toZigbee.push(toZigbee_1.default.cover_mode);
+        result.toZigbee.push(tz.cover_mode);
         result.exposes.push(exposes_1.presets.cover_mode());
     }
     if (args.endpointNames) {
@@ -1549,15 +1546,15 @@ function genericMeter(args) {
             exposes.push(exposes_1.presets.energy().withAccess(exposes_1.access.STATE_GET));
         if (args.producedEnergy !== false)
             exposes.push(exposes_1.presets.produced_energy().withAccess(exposes_1.access.STATE_GET));
-        fromZigbee = [args.fzElectricalMeasurement ?? fromZigbee_1.default.electrical_measurement, args.fzMetering ?? fromZigbee_1.default.metering];
+        fromZigbee = [args.fzElectricalMeasurement ?? fz.electrical_measurement, args.fzMetering ?? fz.metering];
         toZigbee = [
-            toZigbee_1.default.electrical_measurement_power,
-            toZigbee_1.default.acvoltage,
-            toZigbee_1.default.accurrent,
-            toZigbee_1.default.currentsummdelivered,
-            toZigbee_1.default.currentsummreceived,
-            toZigbee_1.default.frequency,
-            toZigbee_1.default.powerfactor,
+            tz.electrical_measurement_power,
+            tz.acvoltage,
+            tz.accurrent,
+            tz.currentsummdelivered,
+            tz.currentsummreceived,
+            tz.frequency,
+            tz.powerfactor,
         ];
         delete configureLookup.seMetering.power;
     }
@@ -1568,8 +1565,8 @@ function genericMeter(args) {
             exposes.push(exposes_1.presets.energy().withAccess(exposes_1.access.STATE_GET));
         if (args.producedEnergy !== false)
             exposes.push(exposes_1.presets.produced_energy().withAccess(exposes_1.access.STATE_GET));
-        fromZigbee = [args.fzMetering ?? fromZigbee_1.default.metering];
-        toZigbee = [toZigbee_1.default.metering_power, toZigbee_1.default.currentsummdelivered, toZigbee_1.default.currentsummreceived];
+        fromZigbee = [args.fzMetering ?? fz.metering];
+        toZigbee = [tz.metering_power, tz.currentsummdelivered, tz.currentsummreceived];
         delete configureLookup.haElectricalMeasurement;
     }
     else if (args.cluster === "metering" && args.type === "gas") {
@@ -1577,7 +1574,7 @@ function genericMeter(args) {
             exposes.push(exposes_1.presets.numeric("power", exposes_1.access.STATE_GET).withUnit("m³/h").withDescription("Instantaneous gas flow in m³/h"));
         if (args.energy !== false)
             exposes.push(exposes_1.presets.numeric("energy", exposes_1.access.ALL).withUnit("m³").withDescription("Total gas consumption in m³"));
-        fromZigbee = [args.fzMetering ?? fromZigbee_1.default.gas_metering];
+        fromZigbee = [args.fzMetering ?? fz.gas_metering];
         toZigbee = [
             {
                 key: ["energy"],
@@ -1590,9 +1587,9 @@ function genericMeter(args) {
                     return { state: { energy: value } };
                 },
             },
-            toZigbee_1.default.metering_power,
-            toZigbee_1.default.metering_status,
-            toZigbee_1.default.metering_extended_status,
+            tz.metering_power,
+            tz.metering_status,
+            tz.metering_extended_status,
         ];
         delete configureLookup.haElectricalMeasurement;
     }
@@ -1607,13 +1604,13 @@ function genericMeter(args) {
             exposes.push(exposes_1.presets.ac_frequency().withAccess(exposes_1.access.STATE_GET));
         if (args.powerFactor !== false)
             exposes.push(exposes_1.presets.power_factor().withAccess(exposes_1.access.STATE_GET));
-        fromZigbee = [args.fzElectricalMeasurement ?? fromZigbee_1.default.electrical_measurement];
-        toZigbee = [toZigbee_1.default.electrical_measurement_power, toZigbee_1.default.acvoltage, toZigbee_1.default.accurrent, toZigbee_1.default.frequency, toZigbee_1.default.powerfactor];
+        fromZigbee = [args.fzElectricalMeasurement ?? fz.electrical_measurement];
+        toZigbee = [tz.electrical_measurement_power, tz.acvoltage, tz.accurrent, tz.frequency, tz.powerfactor];
         delete configureLookup.seMetering;
     }
     if (args.threePhase === true) {
         exposes.push(exposes_1.presets.power_phase_b().withAccess(exposes_1.access.STATE_GET), exposes_1.presets.power_phase_c().withAccess(exposes_1.access.STATE_GET), exposes_1.presets.voltage_phase_b().withAccess(exposes_1.access.STATE_GET), exposes_1.presets.voltage_phase_c().withAccess(exposes_1.access.STATE_GET), exposes_1.presets.current_phase_b().withAccess(exposes_1.access.STATE_GET), exposes_1.presets.current_phase_c().withAccess(exposes_1.access.STATE_GET));
-        toZigbee.push(toZigbee_1.default.electrical_measurement_power_phase_b, toZigbee_1.default.electrical_measurement_power_phase_c, toZigbee_1.default.acvoltage_phase_b, toZigbee_1.default.acvoltage_phase_c, toZigbee_1.default.accurrent_phase_b, toZigbee_1.default.accurrent_phase_c);
+        toZigbee.push(tz.electrical_measurement_power_phase_b, tz.electrical_measurement_power_phase_c, tz.acvoltage_phase_b, tz.acvoltage_phase_c, tz.accurrent_phase_b, tz.accurrent_phase_c);
     }
     if (args.endpointNames) {
         exposes = (0, utils_1.flatten)(exposes.map((expose) => args.endpointNames.map((endpoint) => expose.clone().withEndpoint(endpoint))));