@zwave-js/config 14.0.0-beta.1 → 14.0.0-beta.4

package/build/{devices → esm/devices}/CompatConfig.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompatOverrideQueries = exports.CompatMapAlarm = exports.CompatAddCC = exports.ConditionalCompatConfig = void 0;
-const safe_1 = require("@zwave-js/core/safe");
-const safe_2 = require("@zwave-js/shared/safe");
-const typeguards_1 = require("alcalzone-shared/typeguards");
-const utils_safe_1 = require("../utils_safe");
-const ConditionalItem_1 = require("./ConditionalItem");
-class ConditionalCompatConfig {
+import { getCCName, stripUndefined, } from "@zwave-js/core/safe";
+import { pick } from "@zwave-js/shared/safe";
+import { isArray, isObject } from "alcalzone-shared/typeguards/index.js";
+import { throwInvalidConfig, tryParseCCId } from "../utils_safe.js";
+import { conditionApplies } from "./ConditionalItem.js";
+export class ConditionalCompatConfig {
     valueIdRegex = /^\$value\$\[.+\]$/;
     constructor(filename, definition) {
         this.condition = definition.$if;
         if (definition.queryOnWakeup != undefined) {
-            if (!(0, typeguards_1.isArray)(definition.queryOnWakeup)
-                || !definition.queryOnWakeup.every((cmd) => (0, typeguards_1.isArray)(cmd)
+            if (!isArray(definition.queryOnWakeup)
+                || !definition.queryOnWakeup.every((cmd) => isArray(cmd)
                     && cmd.length >= 2
                     && typeof cmd[0] === "string"
                     && typeof cmd[1] === "string"
@@ -21,7 +18,7 @@ class ConditionalCompatConfig {
                         .every((arg) => typeof arg === "string"
                         || typeof arg === "number"
                         || typeof arg === "boolean"))) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option queryOnWakeup`);
             }
             // Parse "smart" values into partial Value IDs
@@ -39,15 +36,15 @@ error in compat option queryOnWakeup`);
         }
         if (definition.disableAutoRefresh != undefined) {
             if (definition.disableAutoRefresh !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option disableAutoRefresh must be true or omitted`);
             }
             this.disableAutoRefresh = definition.disableAutoRefresh;
         }
         if (definition.disableCallbackFunctionTypeCheck != undefined) {
-            if (!(0, typeguards_1.isArray)(definition.disableCallbackFunctionTypeCheck)
+            if (!isArray(definition.disableCallbackFunctionTypeCheck)
                 || !definition.disableCallbackFunctionTypeCheck.every((d) => typeof d === "number" && d % 1 === 0 && d > 0)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 when present, compat option disableCallbackFunctionTypeCheck msut be an array of positive integers`);
             }
             this.disableCallbackFunctionTypeCheck =
@@ -55,7 +52,7 @@ when present, compat option disableCallbackFunctionTypeCheck msut be an array of
         }
         if (definition.disableStrictEntryControlDataValidation != undefined) {
             if (definition.disableStrictEntryControlDataValidation !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option disableStrictEntryControlDataValidation must be true or omitted`);
             }
             this.disableStrictEntryControlDataValidation =
@@ -63,7 +60,7 @@ compat option disableStrictEntryControlDataValidation must be true or omitted`);
         }
         if (definition.disableStrictMeasurementValidation != undefined) {
             if (definition.disableStrictMeasurementValidation !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option disableStrictMeasurementValidation must be true or omitted`);
             }
             this.disableStrictMeasurementValidation =
@@ -71,7 +68,7 @@ compat option disableStrictMeasurementValidation must be true or omitted`);
         }
         if (definition.encodeCCsUsingTargetVersion != undefined) {
             if (definition.encodeCCsUsingTargetVersion !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option encodeCCsUsingTargetVersion must be true or omitted`);
             }
             this.encodeCCsUsingTargetVersion =
@@ -79,7 +76,7 @@ compat option encodeCCsUsingTargetVersion must be true or omitted`);
         }
         if (definition.forceNotificationIdleReset != undefined) {
             if (definition.forceNotificationIdleReset !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option forceNotificationIdleReset must be true or omitted`);
             }
             this.forceNotificationIdleReset =
@@ -87,12 +84,12 @@ compat option forceNotificationIdleReset must be true or omitted`);
         }
         if (definition.forceSceneControllerGroupCount != undefined) {
             if (typeof definition.forceSceneControllerGroupCount !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option forceSceneControllerGroupCount must be a number!`);
             }
             if (definition.forceSceneControllerGroupCount < 0
                 || definition.forceSceneControllerGroupCount > 255) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option forceSceneControllerGroupCount must be between 0 and 255!`);
             }
             this.forceSceneControllerGroupCount =
@@ -100,21 +97,21 @@ compat option forceSceneControllerGroupCount must be between 0 and 255!`);
         }
         if (definition.mapBasicReport != undefined) {
             if (!isBasicReportMapping(definition.mapBasicReport)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option mapBasicReport contains an invalid value`);
             }
             this.mapBasicReport = definition.mapBasicReport;
         }
         if (definition.mapBasicSet != undefined) {
             if (!isBasicSetMapping(definition.mapBasicSet)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option mapBasicSet contains an invalid value`);
             }
             this.mapBasicSet = definition.mapBasicSet;
         }
         if (definition.preserveRootApplicationCCValueIDs != undefined) {
             if (definition.preserveRootApplicationCCValueIDs !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option preserveRootApplicationCCValueIDs`);
             }
             this.preserveRootApplicationCCValueIDs =
@@ -122,25 +119,25 @@ error in compat option preserveRootApplicationCCValueIDs`);
         }
         if (definition.preserveEndpoints != undefined) {
             if (definition.preserveEndpoints !== "*"
-                && !((0, typeguards_1.isArray)(definition.preserveEndpoints)
+                && !(isArray(definition.preserveEndpoints)
                     && definition.preserveEndpoints.every((d) => typeof d === "number" && d % 1 === 0 && d > 0))) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option preserveEndpoints must be "*" or an array of positive integers`);
             }
             this.preserveEndpoints = definition.preserveEndpoints;
         }
         if (definition.removeEndpoints != undefined) {
             if (definition.removeEndpoints !== "*"
-                && !((0, typeguards_1.isArray)(definition.removeEndpoints)
+                && !(isArray(definition.removeEndpoints)
                     && definition.removeEndpoints.every((d) => typeof d === "number" && d % 1 === 0 && d > 0))) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option removeEndpoints must be "*" or an array of positive integers`);
             }
             this.removeEndpoints = definition.removeEndpoints;
         }
         if (definition.skipConfigurationNameQuery != undefined) {
             if (definition.skipConfigurationNameQuery !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option skipConfigurationNameQuery`);
             }
             this.skipConfigurationNameQuery =
@@ -148,7 +145,7 @@ error in compat option skipConfigurationNameQuery`);
         }
         if (definition.skipConfigurationInfoQuery != undefined) {
             if (definition.skipConfigurationInfoQuery !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option skipConfigurationInfoQuery`);
             }
             this.skipConfigurationInfoQuery =
@@ -156,23 +153,23 @@ error in compat option skipConfigurationInfoQuery`);
         }
         if (definition.treatMultilevelSwitchSetAsEvent != undefined) {
             if (definition.treatMultilevelSwitchSetAsEvent !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option treatMultilevelSwitchSetAsEvent`);
             }
             this.treatMultilevelSwitchSetAsEvent =
                 definition.treatMultilevelSwitchSetAsEvent;
         }
         if (definition.treatSetAsReport != undefined) {
-            if (!((0, typeguards_1.isArray)(definition.treatSetAsReport)
+            if (!(isArray(definition.treatSetAsReport)
                 && definition.treatSetAsReport.every((d) => typeof d === "string"))) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option treatSetAsReport must be an array of strings`);
             }
             this.treatSetAsReport = new Set(definition.treatSetAsReport);
         }
         if (definition.treatDestinationEndpointAsSource != undefined) {
             if (definition.treatDestinationEndpointAsSource !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option treatDestinationEndpointAsSource`);
             }
             this.treatDestinationEndpointAsSource =
@@ -180,19 +177,19 @@ error in compat option treatDestinationEndpointAsSource`);
         }
         if (definition.useUTCInTimeParametersCC != undefined) {
             if (definition.useUTCInTimeParametersCC !== true) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option useUTCInTimeParametersCC must be true or omitted`);
             }
             this.useUTCInTimeParametersCC = definition.useUTCInTimeParametersCC;
         }
         if (definition.manualValueRefreshDelayMs != undefined) {
             if (typeof definition.manualValueRefreshDelayMs !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option manualValueRefreshDelayMs must be a number!`);
             }
             if (definition.manualValueRefreshDelayMs % 1 !== 0
                 || definition.manualValueRefreshDelayMs < 0) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option manualValueRefreshDelayMs must be a non-negative integer!`);
             }
             this.manualValueRefreshDelayMs =
@@ -200,44 +197,44 @@ compat option manualValueRefreshDelayMs must be a non-negative integer!`);
         }
         if (definition.reportTimeout != undefined) {
             if (typeof definition.reportTimeout !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option reportTimeout must be a number!`);
             }
             if (definition.reportTimeout % 1 !== 0
                 || definition.reportTimeout < 1000
                 || definition.reportTimeout > 10000) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option reportTimeout must be an integer between 1000 and 10000!`);
             }
             this.reportTimeout = definition.reportTimeout;
         }
         if (definition.mapRootReportsToEndpoint != undefined) {
             if (typeof definition.mapRootReportsToEndpoint !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option mapRootReportsToEndpoint must be a number!`);
             }
             if (definition.mapRootReportsToEndpoint % 1 !== 0
                 || definition.mapRootReportsToEndpoint < 1) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option mapRootReportsToEndpoint must be a positive integer!`);
             }
             this.mapRootReportsToEndpoint = definition.mapRootReportsToEndpoint;
         }
         if (definition.overrideFloatEncoding != undefined) {
-            if (!(0, typeguards_1.isObject)(definition.overrideFloatEncoding)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+            if (!isObject(definition.overrideFloatEncoding)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option overrideFloatEncoding`);
             }
             this.overrideFloatEncoding = {};
             if ("precision" in definition.overrideFloatEncoding) {
                 if (typeof definition.overrideFloatEncoding.precision
                     != "number") {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 compat option overrideFloatEncoding.precision must be a number!`);
                 }
                 if (definition.overrideFloatEncoding.precision % 1 !== 0
                     || definition.overrideFloatEncoding.precision < 0) {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 compat option overrideFloatEncoding.precision must be a positive integer!`);
                 }
                 this.overrideFloatEncoding.precision =
@@ -245,43 +242,43 @@ compat option overrideFloatEncoding.precision must be a positive integer!`);
             }
             if ("size" in definition.overrideFloatEncoding) {
                 if (typeof definition.overrideFloatEncoding.size != "number") {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 compat option overrideFloatEncoding.size must be a number!`);
                 }
                 if (definition.overrideFloatEncoding.size % 1 !== 0
                     || definition.overrideFloatEncoding.size < 1
                     || definition.overrideFloatEncoding.size > 4) {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 compat option overrideFloatEncoding.size must be an integer between 1 and 4!`);
                 }
                 this.overrideFloatEncoding.size =
                     definition.overrideFloatEncoding.size;
             }
             if (Object.keys(this.overrideFloatEncoding).length === 0) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option overrideFloatEncoding: size and/or precision must be specified!`);
             }
         }
         if (definition.commandClasses != undefined) {
-            if (!(0, typeguards_1.isObject)(definition.commandClasses)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+            if (!isObject(definition.commandClasses)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option commandClasses`);
             }
             if (definition.commandClasses.add != undefined) {
-                if (!(0, typeguards_1.isObject)(definition.commandClasses.add)) {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                if (!isObject(definition.commandClasses.add)) {
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option commandClasses.add`);
                 }
-                else if (!Object.values(definition.commandClasses.add).every((v) => (0, typeguards_1.isObject)(v))) {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                else if (!Object.values(definition.commandClasses.add).every((v) => isObject(v))) {
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 All values in compat option commandClasses.add must be objects`);
                 }
                 const addCCs = new Map();
                 for (const [key, info] of Object.entries(definition.commandClasses.add)) {
                     // Parse the key into a CC ID
-                    const cc = (0, utils_safe_1.tryParseCCId)(key);
+                    const cc = tryParseCCId(key);
                     if (cc == undefined) {
-                        (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                        throwInvalidConfig("devices", `config/devices/${filename}:
 Invalid Command Class "${key}" specified in compat option commandClasses.add!`);
                     }
                     addCCs.set(cc, new CompatAddCC(filename, info));
@@ -289,31 +286,31 @@ Invalid Command Class "${key}" specified in compat option commandClasses.add!`);
                 this.addCCs = addCCs;
             }
             if (definition.commandClasses.remove != undefined) {
-                if (!(0, typeguards_1.isObject)(definition.commandClasses.remove)) {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                if (!isObject(definition.commandClasses.remove)) {
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option commandClasses.remove`);
                 }
                 const removeCCs = new Map();
                 for (const [key, info] of Object.entries(definition.commandClasses.remove)) {
                     // Parse the key into a CC ID
-                    const cc = (0, utils_safe_1.tryParseCCId)(key);
+                    const cc = tryParseCCId(key);
                     if (cc == undefined) {
-                        (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                        throwInvalidConfig("devices", `config/devices/${filename}:
 Invalid Command Class "${key}" specified in compat option commandClasses.remove!`);
                     }
-                    if ((0, typeguards_1.isObject)(info) && "endpoints" in info) {
+                    if (isObject(info) && "endpoints" in info) {
                         if (info.endpoints === "*"
-                            || ((0, typeguards_1.isArray)(info.endpoints)
+                            || (isArray(info.endpoints)
                                 && info.endpoints.every((i) => typeof i === "number"))) {
                             removeCCs.set(cc, info.endpoints);
                         }
                         else {
-                            (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                            throwInvalidConfig("devices", `config/devices/${filename}:
 Compat option commandClasses.remove has an invalid "endpoints" property. Only "*" and numeric arrays are allowed!`);
                         }
                     }
                     else {
-                        (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                        throwInvalidConfig("devices", `config/devices/${filename}:
 All values in compat option commandClasses.remove must be objects with an "endpoints" property!`);
                     }
                 }
@@ -321,16 +318,16 @@ All values in compat option commandClasses.remove must be objects with an "endpo
             }
         }
         if (definition.alarmMapping != undefined) {
-            if (!(0, typeguards_1.isArray)(definition.alarmMapping)
-                || !definition.alarmMapping.every((m) => (0, typeguards_1.isObject)(m))) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+            if (!isArray(definition.alarmMapping)
+                || !definition.alarmMapping.every((m) => isObject(m))) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option alarmMapping must be an array where all items are objects!`);
             }
             this.alarmMapping = definition.alarmMapping.map((m, i) => new CompatMapAlarm(filename, m, i + 1));
         }
         if (definition.overrideQueries != undefined) {
-            if (!(0, typeguards_1.isObject)(definition.overrideQueries)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+            if (!isObject(definition.overrideQueries)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
 compat option overrideQueries must be an object!`);
             }
             this.overrideQueries = new CompatOverrideQueries(filename, definition.overrideQueries);
@@ -365,9 +362,9 @@ compat option overrideQueries must be an object!`);
     queryOnWakeup;
     condition;
     evaluateCondition(deviceId) {
-        if (!(0, ConditionalItem_1.conditionApplies)(this, deviceId))
+        if (!conditionApplies(this, deviceId))
             return;
-        const ret = (0, safe_2.pick)(this, [
+        const ret = pick(this, [
             "alarmMapping",
             "addCCs",
             "removeCCs",
@@ -396,18 +393,17 @@ compat option overrideQueries must be an object!`);
             "useUTCInTimeParametersCC",
             "queryOnWakeup",
         ]);
-        return (0, safe_1.stripUndefined)(ret);
+        return stripUndefined(ret);
     }
 }
-exports.ConditionalCompatConfig = ConditionalCompatConfig;
-class CompatAddCC {
+export class CompatAddCC {
     constructor(filename, definition) {
         const endpoints = new Map();
         const parseEndpointInfo = (endpoint, info) => {
             const parsed = {};
             if (info.isSupported != undefined) {
                 if (typeof info.isSupported !== "boolean") {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 Property isSupported in compat option commandClasses.add, endpoint ${endpoint} must be a boolean!`);
                 }
                 else {
@@ -416,7 +412,7 @@ Property isSupported in compat option commandClasses.add, endpoint ${endpoint} m
             }
             if (info.isControlled != undefined) {
                 if (typeof info.isControlled !== "boolean") {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 Property isControlled in compat option commandClasses.add, endpoint ${endpoint} must be a boolean!`);
                 }
                 else {
@@ -425,7 +421,7 @@ Property isControlled in compat option commandClasses.add, endpoint ${endpoint}
             }
             if (info.secure != undefined) {
                 if (typeof info.secure !== "boolean") {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 Property secure in compat option commandClasses.add, endpoint ${endpoint} must be a boolean!`);
                 }
                 else {
@@ -434,7 +430,7 @@ Property secure in compat option commandClasses.add, endpoint ${endpoint} must b
             }
             if (info.version != undefined) {
                 if (typeof info.version !== "number") {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 Property version in compat option commandClasses.add, endpoint ${endpoint} must be a number!`);
                 }
                 else {
@@ -452,9 +448,9 @@ Property version in compat option commandClasses.add, endpoint ${endpoint} must
             parseEndpointInfo(0, definition);
         }
         // Parse all other endpoints
-        if ((0, typeguards_1.isObject)(definition.endpoints)) {
+        if (isObject(definition.endpoints)) {
             if (!Object.keys(definition.endpoints).every((k) => /^\d+$/.test(k))) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 invalid endpoint index in compat option commandClasses.add`);
             }
             else {
@@ -467,54 +463,53 @@ invalid endpoint index in compat option commandClasses.add`);
     }
     endpoints;
 }
-exports.CompatAddCC = CompatAddCC;
-class CompatMapAlarm {
+export class CompatMapAlarm {
     constructor(filename, definition, index) {
-        if (!(0, typeguards_1.isObject)(definition.from)) {
-            (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+        if (!isObject(definition.from)) {
+            throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "from" must be an object!`);
         }
         else {
             if (typeof definition.from.alarmType !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "from.alarmType" must be a number!`);
             }
             if (definition.from.alarmLevel != undefined
                 && typeof definition.from.alarmLevel !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: if property "from.alarmLevel" is given, it must be a number!`);
             }
         }
-        if (!(0, typeguards_1.isObject)(definition.to)) {
-            (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+        if (!isObject(definition.to)) {
+            throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "to" must be an object!`);
         }
         else {
             if (typeof definition.to.notificationType !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "to.notificationType" must be a number!`);
             }
             if (typeof definition.to.notificationEvent !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "to.notificationEvent" must be a number!`);
             }
             if (definition.to.eventParameters != undefined) {
-                if (!(0, typeguards_1.isObject)(definition.to.eventParameters)) {
-                    (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                if (!isObject(definition.to.eventParameters)) {
+                    throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "to.eventParameters" must be an object!`);
                 }
                 else {
                     for (const [key, val] of Object.entries(definition.to.eventParameters)) {
                         if (typeof val !== "number" && val !== "alarmLevel") {
-                            (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                            throwInvalidConfig("devices", `config/devices/${filename}:
 error in compat option alarmMapping, mapping #${index}: property "to.eventParameters.${key}" must be a number or the literal "alarmLevel"!`);
                         }
                     }
                 }
             }
         }
-        this.from = (0, safe_2.pick)(definition.from, ["alarmType", "alarmLevel"]);
-        this.to = (0, safe_2.pick)(definition.to, [
+        this.from = pick(definition.from, ["alarmType", "alarmLevel"]);
+        this.to = pick(definition.to, [
             "notificationType",
             "notificationEvent",
             "eventParameters",
@@ -523,36 +518,35 @@ error in compat option alarmMapping, mapping #${index}: property "to.eventParame
     from;
     to;
 }
-exports.CompatMapAlarm = CompatMapAlarm;
-class CompatOverrideQueries {
+export class CompatOverrideQueries {
     constructor(filename, definition) {
         const overrides = new Map();
         const parseOverride = (cc, info) => {
             if (typeof info.method !== "string") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
-Property "method" in compat option overrideQueries, CC ${(0, safe_1.getCCName)(cc)} must be a string!`);
+                throwInvalidConfig("devices", `config/devices/${filename}:
+Property "method" in compat option overrideQueries, CC ${getCCName(cc)} must be a string!`);
             }
             else if (info.matchArgs != undefined
-                && !(0, typeguards_1.isArray)(info.matchArgs)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
-Property "matchArgs" in compat option overrideQueries, CC ${(0, safe_1.getCCName)(cc)} must be an array!`);
+                && !isArray(info.matchArgs)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
+Property "matchArgs" in compat option overrideQueries, CC ${getCCName(cc)} must be an array!`);
             }
             else if (!("result" in info)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
-Property "result" is missing in in compat option overrideQueries, CC ${(0, safe_1.getCCName)(cc)}!`);
+                throwInvalidConfig("devices", `config/devices/${filename}:
+Property "result" is missing in in compat option overrideQueries, CC ${getCCName(cc)}!`);
             }
             else if (info.endpoint != undefined
                 && typeof info.endpoint !== "number") {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
-Property "endpoint" in compat option overrideQueries, CC ${(0, safe_1.getCCName)(cc)} must be a number!`);
+                throwInvalidConfig("devices", `config/devices/${filename}:
+Property "endpoint" in compat option overrideQueries, CC ${getCCName(cc)} must be a number!`);
             }
-            else if (info.persistValues && !(0, typeguards_1.isObject)(info.persistValues)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
-Property "persistValues" in compat option overrideQueries, CC ${(0, safe_1.getCCName)(cc)} must be an object!`);
+            else if (info.persistValues && !isObject(info.persistValues)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
+Property "persistValues" in compat option overrideQueries, CC ${getCCName(cc)} must be an object!`);
             }
-            else if (info.extendMetadata && !(0, typeguards_1.isObject)(info.extendMetadata)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
-Property "extendMetadata" in compat option overrideQueries, CC ${(0, safe_1.getCCName)(cc)} must be an object!`);
+            else if (info.extendMetadata && !isObject(info.extendMetadata)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
+Property "extendMetadata" in compat option overrideQueries, CC ${getCCName(cc)} must be an object!`);
             }
             return {
                 endpoint: info.endpoint,
@@ -565,17 +559,17 @@ Property "extendMetadata" in compat option overrideQueries, CC ${(0, safe_1.getC
         };
         for (const [key, value] of Object.entries(definition)) {
             // Parse the key into a CC ID
-            const cc = (0, utils_safe_1.tryParseCCId)(key);
+            const cc = tryParseCCId(key);
             if (cc == undefined) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+                throwInvalidConfig("devices", `config/devices/${filename}:
 Invalid Command Class "${key}" specified in compat option overrideQueries!`);
             }
             let overrideDefinitions;
-            if ((0, typeguards_1.isObject)(value)) {
+            if (isObject(value)) {
                 overrideDefinitions = [value];
             }
-            else if (!(0, typeguards_1.isArray)(value)) {
-                (0, utils_safe_1.throwInvalidConfig)("devices", `config/devices/${filename}:
+            else if (!isArray(value)) {
+                throwInvalidConfig("devices", `config/devices/${filename}:
 Property "${key}" in compat option overrideQueries must be a single override object or an array thereof!`);
             }
             else {
@@ -606,11 +600,10 @@ Property "${key}" in compat option overrideQueries must be a single override obj
                     continue;
                 }
             }
-            return (0, safe_2.pick)(query, ["result", "persistValues", "extendMetadata"]);
+            return pick(query, ["result", "persistValues", "extendMetadata"]);
         }
     }
 }
-exports.CompatOverrideQueries = CompatOverrideQueries;
 const basicReportMappings = [
     false,
     "auto",