@zwave-js/config 9.0.3 → 9.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/CompatConfig.d.ts +2 -2
- package/build/CompatConfig.d.ts.map +1 -1
- package/build/CompatConfig.js +51 -51
- package/build/CompatConfig.js.map +1 -1
- package/build/ConfigManager.d.ts.map +1 -1
- package/build/ConfigManager.js +239 -7
- package/build/ConfigManager.js.map +1 -1
- package/build/DeviceClasses.d.ts +2 -2
- package/build/DeviceClasses.d.ts.map +1 -1
- package/build/DeviceClasses.js +30 -82
- package/build/DeviceClasses.js.map +1 -1
- package/build/Devices.d.ts.map +1 -1
- package/build/Devices.js +44 -43
- package/build/Devices.js.map +1 -1
- package/build/Indicators.d.ts +2 -2
- package/build/Indicators.d.ts.map +1 -1
- package/build/Indicators.js +9 -64
- package/build/Indicators.js.map +1 -1
- package/build/JsonTemplate.js +10 -10
- package/build/JsonTemplate.js.map +1 -1
- package/build/Logger.d.ts +2 -3
- package/build/Logger.d.ts.map +1 -1
- package/build/Logger.js +4 -5
- package/build/Logger.js.map +1 -1
- package/build/Logger_safe.d.ts +5 -0
- package/build/Logger_safe.d.ts.map +1 -0
- package/build/Logger_safe.js +6 -0
- package/build/Logger_safe.js.map +1 -0
- package/build/Manufacturers.d.ts.map +1 -1
- package/build/Manufacturers.js +6 -5
- package/build/Manufacturers.js.map +1 -1
- package/build/Meters.d.ts +1 -1
- package/build/Meters.d.ts.map +1 -1
- package/build/Meters.js +7 -46
- package/build/Meters.js.map +1 -1
- package/build/Notifications.d.ts +1 -1
- package/build/Notifications.d.ts.map +1 -1
- package/build/Notifications.js +15 -54
- package/build/Notifications.js.map +1 -1
- package/build/Scales.d.ts +1 -1
- package/build/Scales.d.ts.map +1 -1
- package/build/Scales.js +6 -55
- package/build/Scales.js.map +1 -1
- package/build/SensorTypes.d.ts +1 -1
- package/build/SensorTypes.d.ts.map +1 -1
- package/build/SensorTypes.js +9 -47
- package/build/SensorTypes.js.map +1 -1
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -1
- package/build/index.js.map +1 -1
- package/build/index_safe.d.ts +8 -0
- package/build/index_safe.d.ts.map +1 -0
- package/build/index_safe.js +25 -0
- package/build/index_safe.js.map +1 -0
- package/build/utils.d.ts +0 -4
- package/build/utils.d.ts.map +1 -1
- package/build/utils.js +1 -10
- package/build/utils.js.map +1 -1
- package/build/utils_safe.d.ts +5 -0
- package/build/utils_safe.d.ts.map +1 -0
- package/build/utils_safe.js +13 -0
- package/build/utils_safe.js.map +1 -0
- package/package.json +16 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../src/Notifications.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../src/Notifications.ts"],"names":[],"mappings":"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"}
|
package/build/Scales.d.ts
CHANGED
package/build/Scales.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scales.d.ts","sourceRoot":"","sources":["../src/Scales.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Scales.d.ts","sourceRoot":"","sources":["../src/Scales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,uBAAuB,CAAC;AAG5D,oBAAY,UAAU,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG;IACrD,iDAAiD;IACjD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,oBAAY,mBAAmB,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAKpD;AAED,qBAAa,KAAK;gBACE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAgCtD,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,SAAgB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B,SAAgB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CAChD"}
|
package/build/Scales.js
CHANGED
|
@@ -1,57 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.Scale = exports.getDefaultScale =
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const objects_1 = require("alcalzone-shared/objects");
|
|
10
|
-
const typeguards_1 = require("alcalzone-shared/typeguards");
|
|
11
|
-
const fs_extra_1 = require("fs-extra");
|
|
12
|
-
const json5_1 = __importDefault(require("json5"));
|
|
13
|
-
const path_1 = __importDefault(require("path"));
|
|
14
|
-
const utils_1 = require("./utils");
|
|
15
|
-
/** @internal */
|
|
16
|
-
async function loadNamedScalesInternal(externalConfig) {
|
|
17
|
-
const configPath = path_1.default.join((externalConfig && (0, utils_1.externalConfigDir)()) || utils_1.configDir, "scales.json");
|
|
18
|
-
if (!(await (0, fs_extra_1.pathExists)(configPath))) {
|
|
19
|
-
throw new core_1.ZWaveError("The named scales config file does not exist!", core_1.ZWaveErrorCodes.Config_Invalid);
|
|
20
|
-
}
|
|
21
|
-
try {
|
|
22
|
-
const fileContents = await (0, fs_extra_1.readFile)(configPath, "utf8");
|
|
23
|
-
const definition = json5_1.default.parse(fileContents);
|
|
24
|
-
if (!(0, typeguards_1.isObject)(definition)) {
|
|
25
|
-
(0, utils_1.throwInvalidConfig)("named scales", `the dictionary is not an object`);
|
|
26
|
-
}
|
|
27
|
-
const namedScales = new Map();
|
|
28
|
-
for (const [name, scales] of (0, objects_1.entries)(definition)) {
|
|
29
|
-
if (!/[\w\d]+/.test(name)) {
|
|
30
|
-
(0, utils_1.throwInvalidConfig)("named scales", `Name ${name} contains other characters than letters and numbers`);
|
|
31
|
-
}
|
|
32
|
-
const named = new Map();
|
|
33
|
-
named.name = name;
|
|
34
|
-
for (const [key, scaleDefinition] of (0, objects_1.entries)(scales)) {
|
|
35
|
-
if (!utils_1.hexKeyRegexNDigits.test(key)) {
|
|
36
|
-
(0, utils_1.throwInvalidConfig)("named scales", `found invalid key "${key}" in the definition for "${name}". Scales must have lowercase hexadecimal IDs.`);
|
|
37
|
-
}
|
|
38
|
-
const keyNum = parseInt(key.slice(2), 16);
|
|
39
|
-
named.set(keyNum, new Scale(keyNum, scaleDefinition));
|
|
40
|
-
}
|
|
41
|
-
namedScales.set(name, named);
|
|
42
|
-
}
|
|
43
|
-
return namedScales;
|
|
44
|
-
}
|
|
45
|
-
catch (e) {
|
|
46
|
-
if ((0, core_1.isZWaveError)(e)) {
|
|
47
|
-
throw e;
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
(0, utils_1.throwInvalidConfig)("named scales");
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
exports.loadNamedScalesInternal = loadNamedScalesInternal;
|
|
3
|
+
exports.Scale = exports.getDefaultScale = void 0;
|
|
4
|
+
const safe_1 = require("@zwave-js/shared/safe");
|
|
5
|
+
const utils_safe_1 = require("./utils_safe");
|
|
55
6
|
function getDefaultScale(scale) {
|
|
56
7
|
return new Scale(scale, {
|
|
57
8
|
unit: undefined,
|
|
@@ -63,17 +14,17 @@ class Scale {
|
|
|
63
14
|
constructor(key, definition) {
|
|
64
15
|
this.key = key;
|
|
65
16
|
if (typeof definition.label !== "string") {
|
|
66
|
-
(0,
|
|
17
|
+
(0, utils_safe_1.throwInvalidConfig)("named scales", `The label for scale ${(0, safe_1.num2hex)(key)} is not a string!`);
|
|
67
18
|
}
|
|
68
19
|
this.label = definition.label;
|
|
69
20
|
if (definition.unit != undefined &&
|
|
70
21
|
typeof definition.unit !== "string") {
|
|
71
|
-
(0,
|
|
22
|
+
(0, utils_safe_1.throwInvalidConfig)("named scales", `The unit for scale ${(0, safe_1.num2hex)(key)} is not a string!`);
|
|
72
23
|
}
|
|
73
24
|
this.unit = definition.unit;
|
|
74
25
|
if (definition.description != undefined &&
|
|
75
26
|
typeof definition.description !== "string") {
|
|
76
|
-
(0,
|
|
27
|
+
(0, utils_safe_1.throwInvalidConfig)("named scales", `The description for scale ${(0, safe_1.num2hex)(key)} is not a string!`);
|
|
77
28
|
}
|
|
78
29
|
this.description = definition.description;
|
|
79
30
|
}
|
package/build/Scales.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scales.js","sourceRoot":"","sources":["../src/Scales.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Scales.js","sourceRoot":"","sources":["../src/Scales.ts"],"names":[],"mappings":";;;AAAA,gDAA4D;AAC5D,6CAAkD;AAQlD,SAAgB,eAAe,CAAC,KAAa;IAC5C,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE;QACvB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;KAChB,CAAC,CAAC;AACJ,CAAC;AALD,0CAKC;AAED,MAAa,KAAK;IACjB,YAAmB,GAAW,EAAE,UAAsB;QACrD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE;YACzC,IAAA,+BAAkB,EACjB,cAAc,EACd,uBAAuB,IAAA,cAAO,EAAC,GAAG,CAAC,mBAAmB,CACtD,CAAC;SACF;QACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC9B,IACC,UAAU,CAAC,IAAI,IAAI,SAAS;YAC5B,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAClC;YACD,IAAA,+BAAkB,EACjB,cAAc,EACd,sBAAsB,IAAA,cAAO,EAAC,GAAG,CAAC,mBAAmB,CACrD,CAAC;SACF;QACD,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC5B,IACC,UAAU,CAAC,WAAW,IAAI,SAAS;YACnC,OAAO,UAAU,CAAC,WAAW,KAAK,QAAQ,EACzC;YACD,IAAA,+BAAkB,EACjB,cAAc,EACd,6BAA6B,IAAA,cAAO,EAAC,GAAG,CAAC,mBAAmB,CAC5D,CAAC;SACF;QACD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;IAC3C,CAAC;CAMD;AArCD,sBAqCC"}
|
package/build/SensorTypes.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SensorTypes.d.ts","sourceRoot":"","sources":["../src/SensorTypes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"SensorTypes.d.ts","sourceRoot":"","sources":["../src/SensorTypes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAW,MAAM,uBAAuB,CAAC;AAG5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAS,UAAU,EAAE,MAAM,UAAU,CAAC;AAG7C,oBAAY,aAAa,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAI5D,qBAAa,UAAU;gBAErB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,UAAU;IAwDvB,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B,SAAgB,MAAM,EAAE,UAAU,CAAC;CACnC"}
|
package/build/SensorTypes.js
CHANGED
|
@@ -1,56 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.SensorType =
|
|
7
|
-
const
|
|
8
|
-
const
|
|
3
|
+
exports.SensorType = void 0;
|
|
4
|
+
const safe_1 = require("@zwave-js/core/safe");
|
|
5
|
+
const safe_2 = require("@zwave-js/shared/safe");
|
|
9
6
|
const objects_1 = require("alcalzone-shared/objects");
|
|
10
7
|
const typeguards_1 = require("alcalzone-shared/typeguards");
|
|
11
|
-
const fs_extra_1 = require("fs-extra");
|
|
12
|
-
const json5_1 = __importDefault(require("json5"));
|
|
13
|
-
const path_1 = __importDefault(require("path"));
|
|
14
8
|
const Scales_1 = require("./Scales");
|
|
15
|
-
const
|
|
16
|
-
/** @internal */
|
|
17
|
-
async function loadSensorTypesInternal(manager, externalConfig) {
|
|
18
|
-
const configPath = path_1.default.join((externalConfig && (0, utils_1.externalConfigDir)()) || utils_1.configDir, "sensorTypes.json");
|
|
19
|
-
if (!(await (0, fs_extra_1.pathExists)(configPath))) {
|
|
20
|
-
throw new core_1.ZWaveError("The sensor types config file does not exist!", core_1.ZWaveErrorCodes.Config_Invalid);
|
|
21
|
-
}
|
|
22
|
-
try {
|
|
23
|
-
const fileContents = await (0, fs_extra_1.readFile)(configPath, "utf8");
|
|
24
|
-
const definition = json5_1.default.parse(fileContents);
|
|
25
|
-
if (!(0, typeguards_1.isObject)(definition)) {
|
|
26
|
-
(0, utils_1.throwInvalidConfig)("sensor types", `the dictionary is not an object`);
|
|
27
|
-
}
|
|
28
|
-
const sensorTypes = new Map();
|
|
29
|
-
for (const [key, sensorDefinition] of (0, objects_1.entries)(definition)) {
|
|
30
|
-
if (!utils_1.hexKeyRegexNDigits.test(key)) {
|
|
31
|
-
(0, utils_1.throwInvalidConfig)("sensor types", `found invalid key "${key}" at the root. Sensor types must have lowercase hexadecimal IDs.`);
|
|
32
|
-
}
|
|
33
|
-
const keyNum = parseInt(key.slice(2), 16);
|
|
34
|
-
sensorTypes.set(keyNum, new SensorType(manager, keyNum, sensorDefinition));
|
|
35
|
-
}
|
|
36
|
-
return sensorTypes;
|
|
37
|
-
}
|
|
38
|
-
catch (e) {
|
|
39
|
-
if ((0, core_1.isZWaveError)(e)) {
|
|
40
|
-
throw e;
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
(0, utils_1.throwInvalidConfig)("sensor types");
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
exports.loadSensorTypesInternal = loadSensorTypesInternal;
|
|
9
|
+
const utils_safe_1 = require("./utils_safe");
|
|
48
10
|
const namedScalesMarker = "$SCALES:";
|
|
49
11
|
class SensorType {
|
|
50
12
|
constructor(manager, key, definition) {
|
|
51
13
|
this.key = key;
|
|
52
14
|
if (typeof definition.label !== "string")
|
|
53
|
-
(0,
|
|
15
|
+
(0, utils_safe_1.throwInvalidConfig)("sensor types", `label for ${(0, safe_2.num2hex)(key)} is not a string`);
|
|
54
16
|
this.label = definition.label;
|
|
55
17
|
if (typeof definition.scales === "string" &&
|
|
56
18
|
definition.scales.startsWith(namedScalesMarker)) {
|
|
@@ -58,7 +20,7 @@ class SensorType {
|
|
|
58
20
|
const scaleName = definition.scales.substr(namedScalesMarker.length);
|
|
59
21
|
const scales = manager.lookupNamedScaleGroup(scaleName);
|
|
60
22
|
if (!scales) {
|
|
61
|
-
throw new
|
|
23
|
+
throw new safe_1.ZWaveError(`Sensor type ${(0, safe_2.num2hex)(key)} is referencing non-existing named scale "${scaleName}"!`, safe_1.ZWaveErrorCodes.Config_Invalid);
|
|
62
24
|
}
|
|
63
25
|
this.scales = scales;
|
|
64
26
|
}
|
|
@@ -66,10 +28,10 @@ class SensorType {
|
|
|
66
28
|
// This is an inline scale definition
|
|
67
29
|
const scales = new Map();
|
|
68
30
|
if (!(0, typeguards_1.isObject)(definition.scales))
|
|
69
|
-
(0,
|
|
31
|
+
(0, utils_safe_1.throwInvalidConfig)("sensor types", `scale definition for ${(0, safe_2.num2hex)(key)} is not an object`);
|
|
70
32
|
for (const [scaleKey, scaleDefinition] of (0, objects_1.entries)(definition.scales)) {
|
|
71
|
-
if (!
|
|
72
|
-
(0,
|
|
33
|
+
if (!utils_safe_1.hexKeyRegexNDigits.test(scaleKey))
|
|
34
|
+
(0, utils_safe_1.throwInvalidConfig)("sensor types", `found invalid key "${scaleKey}" in sensor type ${(0, safe_2.num2hex)(key)}. Sensor scales must have lowercase hexadecimal IDs.`);
|
|
73
35
|
const scaleKeyNum = parseInt(scaleKey.slice(2), 16);
|
|
74
36
|
scales.set(scaleKeyNum, new Scales_1.Scale(scaleKeyNum, scaleDefinition));
|
|
75
37
|
}
|
package/build/SensorTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SensorTypes.js","sourceRoot":"","sources":["../src/SensorTypes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SensorTypes.js","sourceRoot":"","sources":["../src/SensorTypes.ts"],"names":[],"mappings":";;;AAAA,8CAAkE;AAClE,gDAA4D;AAC5D,sDAAmD;AACnD,4DAAuD;AAEvD,qCAA6C;AAC7C,6CAAsE;AAItE,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAErC,MAAa,UAAU;IACtB,YACC,OAAsB,EACtB,GAAW,EACX,UAAsB;QAEtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ;YACvC,IAAA,+BAAkB,EACjB,cAAc,EACd,aAAa,IAAA,cAAO,EAAC,GAAG,CAAC,kBAAkB,CAC3C,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAE9B,IACC,OAAO,UAAU,CAAC,MAAM,KAAK,QAAQ;YACrC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC9C;YACD,oCAAoC;YACpC,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CACzC,iBAAiB,CAAC,MAAM,CACxB,CAAC;YACF,MAAM,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,EAAE;gBACZ,MAAM,IAAI,iBAAU,CACnB,eAAe,IAAA,cAAO,EACrB,GAAG,CACH,6CAA6C,SAAS,IAAI,EAC3D,sBAAe,CAAC,cAAc,CAC9B,CAAC;aACF;YACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACrB;aAAM;YACN,qCAAqC;YACrC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;YACxC,IAAI,CAAC,IAAA,qBAAQ,EAAC,UAAU,CAAC,MAAM,CAAC;gBAC/B,IAAA,+BAAkB,EACjB,cAAc,EACd,wBAAwB,IAAA,cAAO,EAAC,GAAG,CAAC,mBAAmB,CACvD,CAAC;YACH,KAAK,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,IAAA,iBAAO,EAChD,UAAU,CAAC,MAAM,CACjB,EAAE;gBACF,IAAI,CAAC,+BAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;oBACrC,IAAA,+BAAkB,EACjB,cAAc,EACd,sBAAsB,QAAQ,oBAAoB,IAAA,cAAO,EACxD,GAAG,CACH,uDAAuD,CACxD,CAAC;gBACH,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpD,MAAM,CAAC,GAAG,CACT,WAAW,EACX,IAAI,cAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CACvC,CAAC;aACF;YACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACrB;IACF,CAAC;CAKD;AA/DD,gCA+DC"}
|
package/build/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export * from "./ConfigManager";
|
|
|
2
2
|
export * from "./DeviceClasses";
|
|
3
3
|
export * from "./Devices";
|
|
4
4
|
export * from "./Indicators";
|
|
5
|
-
export
|
|
5
|
+
export * from "./Logger_safe";
|
|
6
6
|
export * from "./Manufacturers";
|
|
7
7
|
export * from "./Meters";
|
|
8
8
|
export * from "./Notifications";
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -19,7 +19,7 @@ __exportStar(require("./ConfigManager"), exports);
|
|
|
19
19
|
__exportStar(require("./DeviceClasses"), exports);
|
|
20
20
|
__exportStar(require("./Devices"), exports);
|
|
21
21
|
__exportStar(require("./Indicators"), exports);
|
|
22
|
-
|
|
22
|
+
__exportStar(require("./Logger_safe"), exports);
|
|
23
23
|
__exportStar(require("./Manufacturers"), exports);
|
|
24
24
|
__exportStar(require("./Meters"), exports);
|
|
25
25
|
__exportStar(require("./Notifications"), exports);
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,4CAA0B;AAC1B,+CAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,4CAA0B;AAC1B,+CAA6B;AAC7B,gDAA8B;AAC9B,kDAAgC;AAChC,2CAAyB;AACzB,kDAAgC;AAChC,2CAAyB;AACzB,gDAA8B;AAC9B,iCAA4C;AAAnC,0GAAA,iBAAiB,OAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index_safe.d.ts","sourceRoot":"","sources":["../src/index_safe.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/* @noExternalImports */
|
|
3
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
|
+
if (k2 === undefined) k2 = k;
|
|
5
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
+
}
|
|
9
|
+
Object.defineProperty(o, k2, desc);
|
|
10
|
+
}) : (function(o, m, k, k2) {
|
|
11
|
+
if (k2 === undefined) k2 = k;
|
|
12
|
+
o[k2] = m[k];
|
|
13
|
+
}));
|
|
14
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
16
|
+
};
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
__exportStar(require("./DeviceClasses"), exports);
|
|
19
|
+
__exportStar(require("./Indicators"), exports);
|
|
20
|
+
__exportStar(require("./Logger_safe"), exports);
|
|
21
|
+
__exportStar(require("./Meters"), exports);
|
|
22
|
+
__exportStar(require("./Notifications"), exports);
|
|
23
|
+
__exportStar(require("./Scales"), exports);
|
|
24
|
+
__exportStar(require("./SensorTypes"), exports);
|
|
25
|
+
//# sourceMappingURL=index_safe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index_safe.js","sourceRoot":"","sources":["../src/index_safe.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;;;;;;;;;;;;;;AAExB,kDAAgC;AAChC,+CAA6B;AAC7B,gDAA8B;AAC9B,2CAAyB;AACzB,kDAAgC;AAChC,2CAAyB;AACzB,gDAA8B"}
|
package/build/utils.d.ts
CHANGED
|
@@ -4,10 +4,6 @@ import type { ConfigLogger } from "./Logger";
|
|
|
4
4
|
export declare const configDir: string;
|
|
5
5
|
/** The (optional) absolute path of an external configuration directory */
|
|
6
6
|
export declare function externalConfigDir(): string | undefined;
|
|
7
|
-
export declare const hexKeyRegexNDigits: RegExp;
|
|
8
|
-
export declare const hexKeyRegex4Digits: RegExp;
|
|
9
|
-
export declare const hexKeyRegex2Digits: RegExp;
|
|
10
|
-
export declare function throwInvalidConfig(which: string, reason?: string): never;
|
|
11
7
|
export declare function getDeviceEntryPredicate(manufacturerId: number, productType: number, productId: number, firmwareVersion?: string): (entry: DeviceConfigIndexEntry) => boolean;
|
|
12
8
|
export declare function getEmbeddedConfigVersion(): Promise<string>;
|
|
13
9
|
export declare type SyncExternalConfigDirResult = {
|
package/build/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,gEAAgE;AAChE,eAAO,MAAM,SAAS,QAAuC,CAAC;AAC9D,0EAA0E;AAC1E,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD;AAED,wBAAgB,uBAAuB,CACtC,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,eAAe,CAAC,EAAE,MAAM,GACtB,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAoB5C;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhE;AAED,oBAAY,2BAA2B,GACpC;IACA,OAAO,EAAE,KAAK,CAAC;CACd,GACD;IACA,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACf,CAAC;AAEL;;GAEG;AACH,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,YAAY,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAsEtC"}
|
package/build/utils.js
CHANGED
|
@@ -26,8 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.syncExternalConfigDir = exports.getEmbeddedConfigVersion = exports.getDeviceEntryPredicate = exports.
|
|
30
|
-
const core_1 = require("@zwave-js/core");
|
|
29
|
+
exports.syncExternalConfigDir = exports.getEmbeddedConfigVersion = exports.getDeviceEntryPredicate = exports.externalConfigDir = exports.configDir = void 0;
|
|
31
30
|
const shared_1 = require("@zwave-js/shared");
|
|
32
31
|
const fs = __importStar(require("fs-extra"));
|
|
33
32
|
const path_1 = __importDefault(require("path"));
|
|
@@ -39,14 +38,6 @@ function externalConfigDir() {
|
|
|
39
38
|
return process.env.ZWAVEJS_EXTERNAL_CONFIG;
|
|
40
39
|
}
|
|
41
40
|
exports.externalConfigDir = externalConfigDir;
|
|
42
|
-
exports.hexKeyRegexNDigits = /^0x[a-f0-9]+$/;
|
|
43
|
-
exports.hexKeyRegex4Digits = /^0x[a-f0-9]{4}$/;
|
|
44
|
-
exports.hexKeyRegex2Digits = /^0x[a-f0-9]{2}$/;
|
|
45
|
-
function throwInvalidConfig(which, reason) {
|
|
46
|
-
throw new core_1.ZWaveError(`The ${which ? which + " " : ""}config file is malformed!` +
|
|
47
|
-
(reason ? `\n${reason}` : ""), core_1.ZWaveErrorCodes.Config_Invalid);
|
|
48
|
-
}
|
|
49
|
-
exports.throwInvalidConfig = throwInvalidConfig;
|
|
50
41
|
function getDeviceEntryPredicate(manufacturerId, productType, productId, firmwareVersion) {
|
|
51
42
|
return (entry) => {
|
|
52
43
|
if (entry.manufacturerId !== (0, shared_1.formatId)(manufacturerId))
|
package/build/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare const hexKeyRegexNDigits: RegExp;
|
|
2
|
+
export declare const hexKeyRegex4Digits: RegExp;
|
|
3
|
+
export declare const hexKeyRegex2Digits: RegExp;
|
|
4
|
+
export declare function throwInvalidConfig(which: string, reason?: string): never;
|
|
5
|
+
//# sourceMappingURL=utils_safe.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils_safe.d.ts","sourceRoot":"","sources":["../src/utils_safe.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,QAAkB,CAAC;AAClD,eAAO,MAAM,kBAAkB,QAAoB,CAAC;AACpD,eAAO,MAAM,kBAAkB,QAAoB,CAAC;AAEpD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAMxE"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.throwInvalidConfig = exports.hexKeyRegex2Digits = exports.hexKeyRegex4Digits = exports.hexKeyRegexNDigits = void 0;
|
|
4
|
+
const safe_1 = require("@zwave-js/core/safe");
|
|
5
|
+
exports.hexKeyRegexNDigits = /^0x[a-f0-9]+$/;
|
|
6
|
+
exports.hexKeyRegex4Digits = /^0x[a-f0-9]{4}$/;
|
|
7
|
+
exports.hexKeyRegex2Digits = /^0x[a-f0-9]{2}$/;
|
|
8
|
+
function throwInvalidConfig(which, reason) {
|
|
9
|
+
throw new safe_1.ZWaveError(`The ${which ? which + " " : ""}config file is malformed!` +
|
|
10
|
+
(reason ? `\n${reason}` : ""), safe_1.ZWaveErrorCodes.Config_Invalid);
|
|
11
|
+
}
|
|
12
|
+
exports.throwInvalidConfig = throwInvalidConfig;
|
|
13
|
+
//# sourceMappingURL=utils_safe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils_safe.js","sourceRoot":"","sources":["../src/utils_safe.ts"],"names":[],"mappings":";;;AAAA,8CAAkE;AAErD,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,kBAAkB,GAAG,iBAAiB,CAAC;AACvC,QAAA,kBAAkB,GAAG,iBAAiB,CAAC;AAEpD,SAAgB,kBAAkB,CAAC,KAAa,EAAE,MAAe;IAChE,MAAM,IAAI,iBAAU,CACnB,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,2BAA2B;QACzD,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAC9B,sBAAe,CAAC,cAAc,CAC9B,CAAC;AACH,CAAC;AAND,gDAMC"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zwave-js/config",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.4",
|
|
4
4
|
"description": "zwave-js: configuration files",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
8
8
|
"keywords": [],
|
|
9
9
|
"main": "build/index.js",
|
|
10
|
+
"exports": {
|
|
11
|
+
".": "./build/index.js",
|
|
12
|
+
"./package.json": "./package.json",
|
|
13
|
+
"./safe": "./build/index_safe.js"
|
|
14
|
+
},
|
|
10
15
|
"types": "build/index.d.ts",
|
|
16
|
+
"typesVersions": {
|
|
17
|
+
"*": {
|
|
18
|
+
"safe": [
|
|
19
|
+
"build/index_safe.d.ts"
|
|
20
|
+
]
|
|
21
|
+
}
|
|
22
|
+
},
|
|
11
23
|
"files": [
|
|
12
24
|
"build/**/*.{js,d.ts,map}",
|
|
13
25
|
"config/"
|
|
@@ -40,8 +52,8 @@
|
|
|
40
52
|
"ts": "node -r esbuild-register"
|
|
41
53
|
},
|
|
42
54
|
"dependencies": {
|
|
43
|
-
"@zwave-js/core": "9.0.
|
|
44
|
-
"@zwave-js/shared": "9.0.
|
|
55
|
+
"@zwave-js/core": "9.0.4",
|
|
56
|
+
"@zwave-js/shared": "9.0.4",
|
|
45
57
|
"alcalzone-shared": "^4.0.1",
|
|
46
58
|
"ansi-colors": "^4.1.1",
|
|
47
59
|
"fs-extra": "^10.0.1",
|
|
@@ -60,7 +72,7 @@
|
|
|
60
72
|
"@types/semver": "^7.3.9",
|
|
61
73
|
"@types/xml2json": "^0.11.4",
|
|
62
74
|
"@types/yargs": "^17.0.10",
|
|
63
|
-
"@zwave-js/maintenance": "9.0.
|
|
75
|
+
"@zwave-js/maintenance": "9.0.4",
|
|
64
76
|
"axios": "^0.26.1",
|
|
65
77
|
"comment-json": "^4.2.2",
|
|
66
78
|
"esbuild": "0.14.29",
|