zigbee-herdsman-converters 21.19.0 → 21.21.0

package/devices/linkind.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
 const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const exposes = __importStar(require("../lib/exposes"));
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const reporting = __importStar(require("../lib/reporting"));
 const globalStore = __importStar(require("../lib/store"));
 const e = exposes.presets;
@@ -132,56 +132,56 @@ const definitions = [
         model: 'ZL1000100-CCT-US-V1A02',
         vendor: 'Linkind',
         description: 'Zigbee LED 9W A19 bulb, dimmable & tunable',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: [153, 370] } })],
+        extend: [m.light({ colorTemp: { range: [153, 370] } })],
     },
     {
         zigbeeModel: ['ZBT-CCTLight-C4700107'],
         model: 'ZL1000400-CCT-EU-2-V1A02',
         vendor: 'Linkind',
         description: 'Zigbee LED 5.4W C35 bulb E14, dimmable & tunable',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: undefined } })],
+        extend: [m.light({ colorTemp: { range: undefined } })],
     },
     {
         zigbeeModel: ['ZBT-CCTLight-M3500107'],
         model: 'ZL00030014',
         vendor: 'Linkind',
         description: 'Zigbee LED 4.8W GU10 bulb, dimmable & tunable',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: [153, 370] } })],
+        extend: [m.light({ colorTemp: { range: [153, 370] } })],
     },
     {
         zigbeeModel: ['ZBT-CCTLight-D115'],
         model: 'ZL13100314',
         vendor: 'Linkind',
         description: 'Ceiling light 28W, 3000 lm, Ø40CM CCT',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: [153, 370] } })],
+        extend: [m.light({ colorTemp: { range: [153, 370] } })],
     },
     {
         zigbeeModel: ['ZBT-CCTLight-BR300107'],
         model: 'ZL100050004',
         vendor: 'Linkind',
         description: 'Zigbee LED 7.4W BR30 bulb E26, dimmable & tunable',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: undefined } })],
+        extend: [m.light({ colorTemp: { range: undefined } })],
     },
     {
         zigbeeModel: ['ZBT-DIMLight-GLS0010'],
         model: 'ZL100010008',
         vendor: 'Linkind',
         description: 'Zigbee LED 9W 2700K A19 bulb, dimmable',
-        extend: [(0, modernExtend_1.light)()],
+        extend: [m.light()],
     },
     {
         zigbeeModel: ['ZBT-DIMLight-D0120'],
         model: 'ZL1000701-27-EU-V1A02',
         vendor: 'Linkind',
         description: 'Zigbee A60 filament bulb 6.3W',
-        extend: [(0, modernExtend_1.light)()],
+        extend: [m.light()],
     },
     {
         zigbeeModel: ['ZBT-DIMLight-A4700003'],
         model: 'ZL1000700-22-EU-V1A02',
         vendor: 'Linkind',
         description: 'Zigbee A60 led filament, dimmable warm light (2200K), E27. 4.2W, 420lm',
-        extend: [(0, modernExtend_1.light)()],
+        extend: [m.light()],
     },
     {
         zigbeeModel: ['ZB-MotionSensor-D0003'],
@@ -230,7 +230,7 @@ const definitions = [
         model: 'ZS190000118',
         vendor: 'Linkind',
         description: 'Control outlet',
-        extend: [(0, modernExtend_1.onOff)()],
+        extend: [m.onOff()],
     },
     {
         zigbeeModel: ['ZB-KeyfodGeneric-D0001'],

package/devices/linkind.js.map

@@ -1 +1 @@
-{"version":3,"file":"linkind.js","sourceRoot":"","sources":["../../src/devices/linkind.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"linkind.js","sourceRoot":"","sources":["../../src/devices/linkind.ts"],"names":[],"mappings":"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"}

package/devices/livingwise.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
 const exposes = __importStar(require("../lib/exposes"));
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const e = exposes.presets;
 const definitions = [
     {
@@ -46,14 +46,14 @@ const definitions = [
         model: 'LVS-ZB500D',
         vendor: 'LivingWise',
         description: 'ZigBee smart dimmer switch',
-        extend: [(0, modernExtend_1.light)()],
+        extend: [m.light()],
     },
     {
         zigbeeModel: ['545df2981b704114945f6df1c780515a'],
         model: 'LVS-ZB15S',
         vendor: 'LivingWise',
         description: 'ZigBee smart in-wall switch',
-        extend: [(0, modernExtend_1.onOff)()],
+        extend: [m.onOff()],
     },
     {
         zigbeeModel: ['e70f96b3773a4c9283c6862dbafb6a99'],
@@ -78,7 +78,7 @@ const definitions = [
         model: 'LVS-ZB15R',
         vendor: 'LivingWise',
         description: 'Zigbee smart outlet',
-        extend: [(0, modernExtend_1.onOff)()],
+        extend: [m.onOff()],
     },
     {
         zigbeeModel: ['75d430d66c164c26ac8601c05932dc94'],

package/devices/livingwise.js.map

@@ -1 +1 @@
-{"version":3,"file":"livingwise.js","sourceRoot":"","sources":["../../src/devices/livingwise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA0C;AAC1C,wDAA0C;AAC1C,sDAAiD;AAGjD,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAE1B,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,4BAA4B;QACzC,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,CAAC;KACpB;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,CAAC;KACpB;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,+BAA+B;QAC5C,UAAU,EAAE,CAAC,oBAAE,CAAC,mBAAmB,CAAC;QACpC,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;KACtD;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,EAAE,kCAAkC,CAAC;QACrF,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,kBAAkB;QAC/B,UAAU,EAAE,CAAC,oBAAE,CAAC,OAAO,EAAE,oBAAE,CAAC,kCAAkC,CAAC;QAC/D,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;KACrE;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,qBAAqB;QAClC,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,CAAC;KACpB;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,mBAAmB;QAChC,UAAU,EAAE,CAAC,oBAAE,CAAC,YAAY,CAAC;QAC7B,OAAO,EAAE;YACL,CAAC,CAAC,MAAM,CAAC;gBACL,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;aACrB,CAAC;SACL;QACD,QAAQ,EAAE,EAAE;KACf;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"livingwise.js","sourceRoot":"","sources":["../../src/devices/livingwise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA0C;AAC1C,wDAA0C;AAC1C,uDAAyC;AAGzC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAE1B,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,4BAA4B;QACzC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;KACtB;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;KACtB;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,+BAA+B;QAC5C,UAAU,EAAE,CAAC,oBAAE,CAAC,mBAAmB,CAAC;QACpC,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;KACtD;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,EAAE,kCAAkC,CAAC;QACrF,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,kBAAkB;QAC/B,UAAU,EAAE,CAAC,oBAAE,CAAC,OAAO,EAAE,oBAAE,CAAC,kCAAkC,CAAC;QAC/D,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;KACrE;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,qBAAqB;QAClC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;KACtB;IACD;QACI,WAAW,EAAE,CAAC,kCAAkC,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,YAAY;QACpB,WAAW,EAAE,mBAAmB;QAChC,UAAU,EAAE,CAAC,oBAAE,CAAC,YAAY,CAAC;QAC7B,OAAO,EAAE;YACL,CAAC,CAAC,MAAM,CAAC;gBACL,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;gBAClB,gBAAgB;gBAChB,eAAe;gBACf,kBAAkB;aACrB,CAAC;SACL;QACD,QAAQ,EAAE,EAAE;KACf;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/lonsonho.js

@@ -40,7 +40,7 @@ const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
 const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const exposes = __importStar(require("../lib/exposes"));
 const legacy = __importStar(require("../lib/legacy"));
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const reporting = __importStar(require("../lib/reporting"));
 const tuya = __importStar(require("../lib/tuya"));
 const e = exposes.presets;
@@ -174,7 +174,7 @@ const definitions = [
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module with neutral',
         extend: [
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2 } }),
+            m.deviceEndpoints({ endpoints: { l1: 1, l2: 2 } }),
             tuya.modernExtend.tuyaLight({ minBrightness: 'attribute', endpointNames: ['l1', 'l2'] }),
         ],
         meta: { multiEndpoint: true },
@@ -189,14 +189,14 @@ const definitions = [
         model: 'QS-Zigbee-D02-TRIAC-2C-L',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module without neutral',
-        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2 } }), (0, modernExtend_1.light)({ endpointNames: ['l1', 'l2'], configureReporting: true })],
+        extend: [m.deviceEndpoints({ endpoints: { l1: 1, l2: 2 } }), m.light({ endpointNames: ['l1', 'l2'], configureReporting: true })],
     },
     {
         zigbeeModel: ['Plug_01'],
         model: '4000116784070',
         vendor: 'Lonsonho',
         description: 'Smart plug EU',
-        extend: [(0, modernExtend_1.onOff)()],
+        extend: [m.onOff()],
     },
     {
         zigbeeModel: ['ZB-RGBCW'],
@@ -210,7 +210,7 @@ const definitions = [
         model: 'ZB-RGBCW',
         vendor: 'Lonsonho',
         description: 'Zigbee 3.0 LED-bulb, RGBW LED',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: [153, 500], startup: false }, color: true, effect: false, powerOnBehavior: false })],
+        extend: [m.light({ colorTemp: { range: [153, 500], startup: false }, color: true, effect: false, powerOnBehavior: false })],
     },
     {
         fingerprint: [
@@ -237,7 +237,7 @@ const definitions = [
         model: 'QS-Zigbee-S05-LN',
         vendor: 'Lonsonho',
         description: '1 gang switch module with neutral wire',
-        extend: [(0, modernExtend_1.onOff)({ powerOnBehavior: false, configureReporting: false })],
+        extend: [m.onOff({ powerOnBehavior: false, configureReporting: false })],
         toZigbee: [toZigbee_1.default.TYZB01_on_off],
     },
     {

package/devices/lonsonho.js.map

@@ -1 +1 @@
-{"version":3,"file":"lonsonho.js","sourceRoot":"","sources":["../../src/devices/lonsonho.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA0C;AAC1C,sEAAwC;AACxC,wDAA0C;AAC1C,sDAAwC;AACxC,sDAAkE;AAClE,4DAA8C;AAC9C,kDAAoC;AAGpC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAC1B,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;AAE1B,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE;YACT,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;YACzD,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;SAC5D;QACD,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,gCAAgC;QAC7C,UAAU,EAAE,CAAC,oBAAE,CAAC,mBAAmB,EAAE,oBAAE,CAAC,kBAAkB,CAAC;QAC3D,QAAQ,EAAE,CAAC,kBAAE,CAAC,WAAW,EAAE,kBAAE,CAAC,mBAAmB,EAAE,kBAAE,CAAC,sBAAsB,EAAE,kBAAE,CAAC,sBAAsB,EAAE,kBAAE,CAAC,mBAAmB,CAAC;QAChI,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,OAAO,EAAE;YACL,CAAC,CAAC,cAAc,EAAE;YAClB,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAClD,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;YAC5C,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;YAC/C,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC;SAC5H;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,gBAAgB;QAC7B,UAAU,EAAE,CAAC,oBAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,8BAA8B,EAAE,oBAAE,CAAC,kBAAkB,CAAC;QACnG,QAAQ,EAAE,CAAC,kBAAE,CAAC,WAAW,EAAE,kBAAE,CAAC,mBAAmB,EAAE,kBAAE,CAAC,sBAAsB,EAAE,kBAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC;QACzI,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,OAAO,EAAE;YACL,CAAC,CAAC,cAAc,EAAE;YAClB,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAClD,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;YAC5C,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC3D,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC;SAC5F;KACJ;IACD;QACI,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;QAC7I,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,2BAA2B;QACxC,UAAU,EAAE,CAAC,oBAAE,CAAC,mBAAmB,EAAE,oBAAE,CAAC,kBAAkB,CAAC;QAC3D,QAAQ,EAAE,CAAC,kBAAE,CAAC,WAAW,EAAE,kBAAE,CAAC,mBAAmB,EAAE,kBAAE,CAAC,sBAAsB,EAAE,kBAAE,CAAC,mBAAmB,CAAC;QACrG,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAC;QAChD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,EAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC;QAC/B,CAAC;QACD,OAAO,EAAE;YACL,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;YACvE,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC;YACxE,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;YAC9G,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC;YAC/G,CAAC,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;YACvC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;YACjE,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;YACpE,CAAC,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC;YACxC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC;YAClE,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC;SACxE;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,8BAA8B;QAC3C,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC,CAAC;QAC5D,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE;YAC7C,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;YAC7D,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACnF,CAAC;KACJ;IACD;QACI,WAAW,EAAE;YACT,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;YACzD,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;SAC5D;QACD,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACtD,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,oBAAE,CAAC,gBAAgB,CAAC;QACxD,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC;KAC1C;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QACzI,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,oBAAE,CAAC,gBAAgB,CAAC;QACxD,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC;QACvC,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,kDAAkD;YAClD,OAAO,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,CAAC;QAC1B,CAAC;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE;YACL,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC;YAC9D,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC;YAC9D,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC;SACjE;QACD,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,oBAAE,CAAC,gBAAgB,CAAC;QACxD,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC;QACvC,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,kDAAkD;YAClD,OAAO,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,CAAC;QACjC,CAAC;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,wBAAwB;QAC/B,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,gDAAgD;QAC7D,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAC,aAAa,EAAE,WAAW,EAAC,CAAC,CAAC;KACtE;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,2BAA2B;QAClC,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,gDAAgD;QAC7D,MAAM,EAAE;YACJ,IAAA,8BAAe,EAAC,EAAC,SAAS,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,EAAC,CAAC;YAC5C,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAC,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAC,CAAC;SACzF;QACD,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE;YAC7C,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;YAC/F,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;YAC/F,+FAA+F;QACnG,CAAC;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,0BAA0B;QACjC,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,mDAAmD;QAChE,MAAM,EAAE,CAAC,IAAA,8BAAe,EAAC,EAAC,SAAS,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,EAAC,CAAC,EAAE,IAAA,oBAAK,EAAC,EAAC,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;KACzH;IACD;QACI,WAAW,EAAE,CAAC,SAAS,CAAC;QACxB,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,eAAe;QAC5B,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,CAAC;KACpB;IACD;QACI,WAAW,EAAE,CAAC,UAAU,CAAC;QACzB,WAAW,EAAE;YACT,EAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAC;YAClD,EAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAC;YACjD,EAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAC;YAClD,EAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,yBAAyB,EAAC;YACjE,EAAC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAC;SACvD;QACD,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,+BAA+B;QAC5C,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAC,CAAC,CAAC;KACxH;IACD;QACI,WAAW,EAAE;YACT,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;YACzD,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;SAC5D;QACD,KAAK,EAAE,qBAAqB;QAC5B,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,wCAAwC;QACrD,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvE,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,CAAC;QAC1B,CAAC;QACD,QAAQ,EAAE,CAAC,kBAAE,CAAC,aAAa,CAAC;QAC5B,UAAU,EAAE,CAAC,oBAAE,CAAC,MAAM,CAAC;QACvB,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE;YAC7C,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACnF,CAAC;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,kBAAkB;QACzB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,wCAAwC;QACrD,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC,CAAC;QACpE,QAAQ,EAAE,CAAC,kBAAE,CAAC,aAAa,CAAC;KAC/B;IACD;QACI,WAAW,EAAE;YACT,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;YACzD,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC;SAC5D;QACD,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,gCAAgC;QAC7C,UAAU,EAAE,CAAC,oBAAE,CAAC,mBAAmB,EAAE,oBAAE,CAAC,kBAAkB,CAAC;QAC3D,QAAQ,EAAE,CAAC,kBAAE,CAAC,WAAW,EAAE,kBAAE,CAAC,mBAAmB,EAAE,kBAAE,CAAC,sBAAsB,EAAE,kBAAE,CAAC,mBAAmB,CAAC;QACrG,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,OAAO,EAAE;YACL,CAAC,CAAC,cAAc,EAAE;YAClB,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAClD,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;YAC5C,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;YAC/C,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC;SAC5F;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,wBAAwB,EAAC,CAAC;QAC9E,KAAK,EAAE,qBAAqB;QAC5B,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,sCAAsC;QACnD,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC;QAChC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC;QAC9B,OAAO,EAAE;YACL,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3D,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3D,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC5C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC;SACjD;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,CAAC;QACjC,CAAC;QACD,IAAI,EAAE;YACF,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE;gBACZ,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;gBAC1C,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBAC5D,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBAChE,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;gBACrD,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBAChE,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;gBAC5C,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;gBAC1C,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBAC5D,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBAChE,CAAC,EAAE,EAAE,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;gBACtD,CAAC,EAAE,EAAE,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBACjE,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;gBAC7C,CAAC,EAAE,EAAE,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC;aACrE;SACJ;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"lonsonho.js","sourceRoot":"","sources":["../../src/devices/lonsonho.ts"],"names":[],"mappings":"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"}

package/devices/ls.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 const exposes = __importStar(require("../lib/exposes"));
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const e = exposes.presets;
 const definitions = [
     {
@@ -42,9 +42,9 @@ const definitions = [
         model: 'A319463',
         vendor: 'LS Deutschland GmbH',
         description: 'Home base',
-        fromZigbee: (0, modernExtend_1.light)({ colorTemp: { range: [153, 454] }, color: true }).fromZigbee,
-        toZigbee: (0, modernExtend_1.light)({ colorTemp: { range: [153, 454] }, color: true }).toZigbee,
-        configure: (0, modernExtend_1.light)({ colorTemp: { range: [153, 454] }, color: true }).configure[0],
+        fromZigbee: m.light({ colorTemp: { range: [153, 454] }, color: true }).fromZigbee,
+        toZigbee: m.light({ colorTemp: { range: [153, 454] }, color: true }).toZigbee,
+        configure: m.light({ colorTemp: { range: [153, 454] }, color: true }).configure[0],
         exposes: (device, options) => {
             if (!device)
                 return [e.light_brightness_colortemp_colorxy([153, 454])];

package/devices/ls.js.map

@@ -1 +1 @@
-{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/devices/ls.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,sDAA0C;AAG1C,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAE1B,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,SAAS,CAAC;QACxB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,qBAAqB;QAC7B,WAAW,EAAE,WAAW;QACxB,UAAU,EAAE,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,UAAU;QAC3E,QAAQ,EAAE,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,QAAQ;QACvE,SAAS,EAAE,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YACzB,IAAI,CAAC,MAAM;gBAAE,OAAO,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YACvE,OAAO;gBACH,GAAG,MAAM,CAAC,SAAS;qBACd,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC;qBAC7B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBACR,OAAO,CAAC,CAAC,kCAAkC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtF,CAAC,CAAC;aACT,CAAC;QACN,CAAC;QACD,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChH,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/devices/ls.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,uDAAyC;AAGzC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAE1B,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,SAAS,CAAC;QACxB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,qBAAqB;QAC7B,WAAW,EAAE,WAAW;QACxB,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,UAAU;QAC7E,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,QAAQ;QACzE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9E,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YACzB,IAAI,CAAC,MAAM;gBAAE,OAAO,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YACvE,OAAO;gBACH,GAAG,MAAM,CAAC,SAAS;qBACd,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC;qBAC7B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBACR,OAAO,CAAC,CAAC,kCAAkC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtF,CAAC,CAAC;aACT,CAAC;QACN,CAAC;QACD,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChH,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/lubeez.js

@@ -1,13 +1,46 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const definitions = [
     {
         zigbeeModel: ['LUBEEZ-12AB'],
         model: '12AB',
         vendor: 'Lubeez',
         description: 'zigbee 3.0 AC dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true })],
+        extend: [m.light({ configureReporting: true })],
     },
 ];
 exports.default = definitions;

package/devices/lubeez.js.map

@@ -1 +1 @@
-{"version":3,"file":"lubeez.js","sourceRoot":"","sources":["../../src/devices/lubeez.ts"],"names":[],"mappings":";;AAAA,sDAA0C;AAG1C,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,aAAa,CAAC;QAC5B,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,sBAAsB;QACnC,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;KAC9C;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"lubeez.js","sourceRoot":"","sources":["../../src/devices/lubeez.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AAGzC,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,aAAa,CAAC;QAC5B,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,sBAAsB;QACnC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;KAChD;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/lumi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lumi.d.ts","sourceRoot":"","sources":["../../src/devices/lumi.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAmDlD,QAAA,MAAM,WAAW,EAAE,oBAAoB,EA2zItC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"lumi.d.ts","sourceRoot":"","sources":["../../src/devices/lumi.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAmDlD,QAAA,MAAM,WAAW,EAAE,oBAAoB,EA2zItC,CAAC;AAEF,eAAe,WAAW,CAAC"}