From 2d936c92157b14f41a314a0630a5c35570bc7736 Mon Sep 17 00:00:00 2001
From: Dominic Griesel <d.griesel@gmx.net>
Date: Sun, 27 Jun 2021 13:38:25 +0200
Subject: [PATCH] fix: build

---
 .vscode/settings.json             |  19 ++++-
 package.json                      |   3 +
 packages/config/package.json      |   3 +-
 packages/core/package.json        |   5 +-
 packages/maintenance/package.json |   4 +-
 packages/serial/package.json      |   5 +-
 packages/shared/package.json      |   4 +-
 packages/testing/package.json     |   5 +-
 packages/zwave-js/package.json    |   3 +-
 tsconfig.json                     |   2 +-
 yarn.lock                         | 111 +++++++++++++++++-------------
 11 files changed, 107 insertions(+), 57 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 36e22a5e9200..ef8c051dadc4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -87,7 +87,24 @@
 		"node_modules/zwave-js/index.js": true,
 		"**/cache": true,
 		"packages/zwave-js/**/fingerprint.txt": true,
-		"node_modules/zwave-js/**/fingerprint.txt": true
+		"node_modules/zwave-js/**/fingerprint.txt": true,
+		".husky/**/_": true,
+		"packages/*/package-lock.json": true,
+		".yarn/*": true,
+		".yarn/patches": false,
+		".yarn/releases": false,
+		".yarn/plugins": false,
+		".yarn/sdks": false,
+		".yarn/versions": false,
+		"**/.pnp.*": true,
+		"packages/*/cache": true,
+		"**/.tmp": true,
+		"**/.tmpoh/": true,
+		"**/.tmpozw/": true,
+		"**/.tmpzwa/": true,
+		"**/.secrets": true,
+		"**/.test-payloads": true,
+		"packages/config/config/devices/index.json": true
 	},
 	"files.associations": {
 		"**/config/**/*.json": "jsonc"
diff --git a/package.json b/package.json
index 892fd60d7187..b311fe36f25d 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,8 @@
     "@commitlint/config-conventional": "^12.1.4",
     "@fimbul/mithotyn": "^0.24.0",
     "@fimbul/wotan": "^0.24.0",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
     "@typescript-eslint/eslint-plugin": "^4.26.1",
     "@typescript-eslint/parser": "^4.26.1",
     "@zwave-js/config": "workspace:packages/config",
@@ -54,6 +56,7 @@
     "fs-extra": "^9.0.1",
     "husky": "^6.0.0",
     "jest": "^26.4.2",
+    "jest-extended": "^0.11.5",
     "lerna": "^4.0.0",
     "prettier": "^2.3.1",
     "prettier-plugin-organize-imports": "^2.1.0",
diff --git a/packages/config/package.json b/packages/config/package.json
index 4847f337940e..c7f64bac71cc 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -51,9 +51,10 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
+    "@types/jest": "^26.0.23",
     "@types/js-levenshtein": "^1.1.0",
     "@types/json-logic-js": "^1.2.1",
-    "@types/node": "^15.12.4",
+    "@types/node": "^15.12.5",
     "@types/pegjs": "^0.10.2",
     "@types/semver": "^7.3.6",
     "@types/xml2json": "^0.11.3",
diff --git a/packages/core/package.json b/packages/core/package.json
index efcdaa4b9210..6cd9280ed85a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -49,8 +49,11 @@
     "watch": "yarn run build --watch --pretty"
   },
   "devDependencies": {
-    "@types/node": "^15.12.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
+    "@types/triple-beam": "^1.3.2",
     "esbuild-register": "^2.6.0",
+    "jest-extended": "^0.11.5",
     "typescript": "^4.3.2"
   }
 }
diff --git a/packages/maintenance/package.json b/packages/maintenance/package.json
index 689979f18a19..410c2ea5cdab 100644
--- a/packages/maintenance/package.json
+++ b/packages/maintenance/package.json
@@ -36,7 +36,8 @@
   "devDependencies": {
     "@types/clipboardy": "^2",
     "@types/fs-extra": "^9.0.11",
-    "@types/node": "^15.12.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
     "@types/prettier": "^2",
     "@types/yargs": "^16.0.1",
     "@zwave-js/core": "workspace:packages/core",
@@ -45,6 +46,7 @@
     "clipboardy": "^2.3.0",
     "esbuild-register": "^2.6.0",
     "fs-extra": "^9.0.1",
+    "jest-extended": "^0.11.5",
     "piscina": "^3.1.0",
     "prettier": "^2.3.1",
     "reflect-metadata": "^0.1.13",
diff --git a/packages/serial/package.json b/packages/serial/package.json
index 32bcf870a57a..aa256700e33e 100644
--- a/packages/serial/package.json
+++ b/packages/serial/package.json
@@ -45,10 +45,13 @@
   },
   "devDependencies": {
     "@serialport/binding-mock": "^9.0.7",
-    "@types/node": "^15.12.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
+    "@types/serialport": "^8.0.1",
     "@zwave-js/testing": "workspace:packages/testing",
     "ansi-colors": "^4.1.1",
     "esbuild-register": "^2.6.0",
+    "jest-extended": "^0.11.5",
     "typescript": "^4.3.2"
   }
 }
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 535863b004e4..b37ac0b36da7 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -41,8 +41,10 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
-    "@types/node": "^15.12.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
     "esbuild-register": "^2.6.0",
+    "jest-extended": "^0.11.5",
     "typescript": "^4.3.2"
   }
 }
diff --git a/packages/testing/package.json b/packages/testing/package.json
index c3ddc9503cf0..19be3f463425 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -34,10 +34,13 @@
     "watch": "yarn run build --watch --pretty"
   },
   "devDependencies": {
-    "@types/node": "^15.12.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
+    "@types/triple-beam": "^1.3.2",
     "@zwave-js/core": "workspace:packages/core",
     "ansi-colors": "^4.1.1",
     "esbuild-register": "^2.6.0",
+    "jest-extended": "^0.11.5",
     "triple-beam": "*",
     "typescript": "^4.3.2",
     "winston-transport": "*"
diff --git a/packages/zwave-js/package.json b/packages/zwave-js/package.json
index a1175ca57059..40af375d7554 100644
--- a/packages/zwave-js/package.json
+++ b/packages/zwave-js/package.json
@@ -91,7 +91,8 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
-    "@types/node": "^15.12.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^15.12.5",
     "@types/proper-lockfile": "^4",
     "@types/semver": "^7.3.6",
     "@types/serialport": "^8.0.1",
diff --git a/tsconfig.json b/tsconfig.json
index bf2c7e24eb7d..50b795454f39 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,7 +32,7 @@
 		"strictFunctionTypes": true,
 		"watch": false, // true breaks CI scripts
 		"pretty": true,
-		"types": ["node", "jest-extended"],
+		"types": ["node", "jest", "jest-extended"],
 		"noErrorTruncation": true
 	},
 	"include": [
diff --git a/yarn.lock b/yarn.lock
index ec07ea2798a9..475c89aced94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3752,6 +3752,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jest@npm:^26.0.23":
+  version: 26.0.23
+  resolution: "@types/jest@npm:26.0.23"
+  dependencies:
+    jest-diff: ^26.0.0
+    pretty-format: ^26.0.0
+  checksum: 69db26061e6be34de2a440c8a470b651c53ba6ee0057614a278c4f756ff00281f46cc075b24e5bd761f399f175f49d0a5758b50dd921342a8592461548dea29a
+  languageName: node
+  linkType: hard
+
 "@types/js-levenshtein@npm:^1.1.0":
   version: 1.1.0
   resolution: "@types/js-levenshtein@npm:1.1.0"
@@ -3794,10 +3804,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^15.12.4":
-  version: 15.12.4
-  resolution: "@types/node@npm:15.12.4"
-  checksum: 1731c610eb87d2051d32d0f64f2b14b4e75443ab40ab4882e50fdaa4e5e1013240a6d249213bec1f83b2c3ba24f6d5233159a4deac0bb51751809f5cb6082735
+"@types/node@npm:^15.12.5":
+  version: 15.12.5
+  resolution: "@types/node@npm:15.12.5"
+  checksum: 4550941a5db67f21bf1c54b2f76ef6fb56ced08583b6049fceef5972ef73791225c41b9a30ce36f496fded284dd736973b5e2107f4bd036d41f35550e3af3450
   languageName: node
   linkType: hard
 
@@ -3891,6 +3901,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/triple-beam@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "@types/triple-beam@npm:1.3.2"
+  checksum: dd7b4a563fb710abc992e5d59eac481bed9e303fada2e276e37b00be31c392e03300ee468e57761e616512872e77935f92472877d0704a19688d15a726cee17b
+  languageName: node
+  linkType: hard
+
 "@types/xml2json@npm:^0.11.3":
   version: 0.11.3
   resolution: "@types/xml2json@npm:0.11.3"
@@ -4060,9 +4077,10 @@ __metadata:
   resolution: "@zwave-js/config@workspace:packages/config"
   dependencies:
     "@types/fs-extra": ^9.0.11
+    "@types/jest": ^26.0.23
     "@types/js-levenshtein": ^1.1.0
     "@types/json-logic-js": ^1.2.1
-    "@types/node": ^15.12.4
+    "@types/node": ^15.12.5
     "@types/pegjs": ^0.10.2
     "@types/semver": ^7.3.6
     "@types/xml2json": ^0.11.3
@@ -4095,12 +4113,15 @@ __metadata:
   resolution: "@zwave-js/core@workspace:packages/core"
   dependencies:
     "@alcalzone/jsonl-db": ^1.3.0
-    "@types/node": ^15.12.4
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
+    "@types/triple-beam": ^1.3.2
     "@zwave-js/shared": 7.9.0
     alcalzone-shared: ^3.0.4
     ansi-colors: ^4.1.1
     dayjs: ^1.10.5
     esbuild-register: ^2.6.0
+    jest-extended: ^0.11.5
     logform: "*"
     nrf-intel-hex: ^1.3.0
     triple-beam: "*"
@@ -4117,7 +4138,8 @@ __metadata:
   dependencies:
     "@types/clipboardy": ^2
     "@types/fs-extra": ^9.0.11
-    "@types/node": ^15.12.4
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
     "@types/prettier": ^2
     "@types/yargs": ^16.0.1
     "@zwave-js/core": "workspace:packages/core"
@@ -4126,6 +4148,7 @@ __metadata:
     clipboardy: ^2.3.0
     esbuild-register: ^2.6.0
     fs-extra: ^9.0.1
+    jest-extended: ^0.11.5
     piscina: ^3.1.0
     prettier: ^2.3.1
     reflect-metadata: ^0.1.13
@@ -4152,6 +4175,8 @@ __metadata:
     "@commitlint/config-conventional": ^12.1.4
     "@fimbul/mithotyn": ^0.24.0
     "@fimbul/wotan": ^0.24.0
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
     "@typescript-eslint/eslint-plugin": ^4.26.1
     "@typescript-eslint/parser": ^4.26.1
     "@zwave-js/config": "workspace:packages/config"
@@ -4166,6 +4191,7 @@ __metadata:
     fs-extra: ^9.0.1
     husky: ^6.0.0
     jest: ^26.4.2
+    jest-extended: ^0.11.5
     lerna: ^4.0.0
     prettier: ^2.3.1
     prettier-plugin-organize-imports: ^2.1.0
@@ -4182,13 +4208,16 @@ __metadata:
   dependencies:
     "@sentry/node": ^6.5.1
     "@serialport/binding-mock": ^9.0.7
-    "@types/node": ^15.12.4
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
+    "@types/serialport": ^8.0.1
     "@zwave-js/core": 7.9.0
     "@zwave-js/shared": 7.9.0
     "@zwave-js/testing": "workspace:packages/testing"
     alcalzone-shared: ^3.0.4
     ansi-colors: ^4.1.1
     esbuild-register: ^2.6.0
+    jest-extended: ^0.11.5
     serialport: ^9.1.0
     typescript: ^4.3.2
     winston: ^3.3.3
@@ -4200,10 +4229,12 @@ __metadata:
   resolution: "@zwave-js/shared@workspace:packages/shared"
   dependencies:
     "@types/fs-extra": ^9.0.11
-    "@types/node": ^15.12.4
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
     alcalzone-shared: ^3.0.4
     esbuild-register: ^2.6.0
     fs-extra: ^9.0.1
+    jest-extended: ^0.11.5
     typescript: ^4.3.2
   languageName: unknown
   linkType: soft
@@ -4212,10 +4243,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@zwave-js/testing@workspace:packages/testing"
   dependencies:
-    "@types/node": ^15.12.4
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
+    "@types/triple-beam": ^1.3.2
     "@zwave-js/core": "workspace:packages/core"
     ansi-colors: ^4.1.1
     esbuild-register: ^2.6.0
+    jest-extended: ^0.11.5
     triple-beam: "*"
     typescript: ^4.3.2
     winston-transport: "*"
@@ -7147,20 +7181,20 @@ __metadata:
   linkType: hard
 
 fsevents@^2.1.2:
-  version: 2.3.1
-  resolution: "fsevents@npm:2.3.1"
+  version: 2.3.2
+  resolution: "fsevents@npm:2.3.2"
   dependencies:
     node-gyp: latest
-  checksum: 7992dac7961be985b3c3c64d79f4489278ab179da2cdc190a88085e3526ab6fa0fb1b78d94ab8669649208a0728fdd2dab1f4b522566ace132b687b5e6a341a1
+  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
   languageName: node
   linkType: hard
 
 "fsevents@patch:fsevents@^2.1.2#~builtin<compat/fsevents>":
-  version: 2.3.1
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.1#~builtin<compat/fsevents>::version=2.3.1&hash=1cc4b2"
+  version: 2.3.2
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
   dependencies:
     node-gyp: latest
-  checksum: 69e026dbd99b1e2fe52cbd80c7697f62a2f7f79c5175e99f21c26b7aecc47d979bdbb8af56c5e4eeeeaf66a0f84a0198c60008ed21998a57b147d0ca5dc0d496
+  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
   languageName: node
   linkType: hard
 
@@ -8070,7 +8104,7 @@ fsevents@^2.1.2:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.1.0, is-core-module@npm:^2.2.0":
+"is-core-module@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-core-module@npm:2.2.0"
   dependencies:
@@ -8539,7 +8573,7 @@ fsevents@^2.1.2:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^26.6.2":
+"jest-diff@npm:^26.0.0, jest-diff@npm:^26.6.2":
   version: 26.6.2
   resolution: "jest-diff@npm:26.6.2"
   dependencies:
@@ -11240,7 +11274,7 @@ fsevents@^2.1.2:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^26.6.2":
+"pretty-format@npm:^26.0.0, pretty-format@npm:^26.6.2":
   version: 26.6.2
   resolution: "pretty-format@npm:26.6.2"
   dependencies:
@@ -11851,7 +11885,7 @@ fsevents@^2.1.2:
   languageName: node
   linkType: hard
 
-"resolve@^1.1.6, resolve@^1.14.2":
+"resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1":
   version: 1.20.0
   resolution: "resolve@npm:1.20.0"
   dependencies:
@@ -11861,17 +11895,7 @@ fsevents@^2.1.2:
   languageName: node
   linkType: hard
 
-"resolve@^1.10.0, resolve@^1.14.1, resolve@^1.17.0, resolve@^1.18.1":
-  version: 1.19.0
-  resolution: "resolve@npm:1.19.0"
-  dependencies:
-    is-core-module: ^2.1.0
-    path-parse: ^1.0.6
-  checksum: a05b356e47b85ad3613d9e2a39a824f3c27f4fcad9c9ff6c7cc71a2e314c5904a90ab37481ad0069d03cab9eaaac6eb68aca1bc3355fdb05f1045cd50e2aacea
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.18.1#~builtin<compat/resolve>":
   version: 1.20.0
   resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=00b1ff"
   dependencies:
@@ -11881,16 +11905,6 @@ fsevents@^2.1.2:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.18.1#~builtin<compat/resolve>":
-  version: 1.19.0
-  resolution: "resolve@patch:resolve@npm%3A1.19.0#~builtin<compat/resolve>::version=1.19.0&hash=00b1ff"
-  dependencies:
-    is-core-module: ^2.1.0
-    path-parse: ^1.0.6
-  checksum: 4714fbea90c3a4b9c14af343f255193ab16bce50782309318e01c3e4113e89df69a2a9fb1f1d9f7791c9c5a52a56f10568ce82df92dbbe184557d309a96808e5
-  languageName: node
-  linkType: hard
-
 "restore-cursor@npm:^2.0.0":
   version: 2.0.0
   resolution: "restore-cursor@npm:2.0.0"
@@ -13286,22 +13300,22 @@ fsevents@^2.1.2:
   linkType: hard
 
 typescript@^4.3.2:
-  version: 4.3.2
-  resolution: "typescript@npm:4.3.2"
+  version: 4.3.4
+  resolution: "typescript@npm:4.3.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: c2a86fa03ce03b255adc13ccd70a55173ca6539ae12114feca59f34a4e9bb69f14fb7cd5adc6c2416e568cff05c870b89d1366768ec55fce04fbdffb429a1cee
+  checksum: 75e1f2769c7ff38c718523d05eaf1c2611dbf92c0ab0f85f603ead9bb23416af2009a5dac46e76ef6a207a8508fa53f51b43a41f2a91b1241b53cd744c16128c
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@^4.3.2#~builtin<compat/typescript>":
-  version: 4.3.2
-  resolution: "typescript@patch:typescript@npm%3A4.3.2#~builtin<compat/typescript>::version=4.3.2&hash=d8b4e7"
+  version: 4.3.4
+  resolution: "typescript@patch:typescript@npm%3A4.3.4#~builtin<compat/typescript>::version=4.3.4&hash=d8b4e7"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 3d3dec06ba6e5b05caa292355712ed9db813fa1c2377630b1f24b42e5ee8957f0bcdd5efd1500c970a11a6f684897f5728f5542ac822932227159a0611499a5e
+  checksum: a6b1a3674b60971691b89fa8187a4905e132cb8061724b4bd485e5d5441caa61166fe3bcf2b47aa679a6d860cae823022ca51db713cc3446296274c005dd02e5
   languageName: node
   linkType: hard
 
@@ -13972,7 +13986,8 @@ typescript@^4.3.2:
     "@sentry/integrations": ^6.5.1
     "@sentry/node": ^6.5.1
     "@types/fs-extra": ^9.0.11
-    "@types/node": ^15.12.4
+    "@types/jest": ^26.0.23
+    "@types/node": ^15.12.5
     "@types/proper-lockfile": ^4
     "@types/semver": ^7.3.6
     "@types/serialport": ^8.0.1