From 273e23af0f6efcbcff33ba8e878897dfdc02142b Mon Sep 17 00:00:00 2001
From: Dominic Griesel <dominic.griesel@nabucasa.com>
Date: Thu, 2 Jun 2022 15:29:33 +0200
Subject: [PATCH] fix: add missing exports

---
 .github/workflows/test-and-release.yml     | 22 ++++++++++++++++++++--
 packages/cc/src/index.ts                   |  1 +
 packages/cc/src/index_safe.ts              | 11 -----------
 packages/cc/src/lib/Security2/Extension.ts |  1 +
 packages/zwave-js/src/Node.ts              | 13 +------------
 packages/zwave-js/src/Node_safe.ts         | 13 +------------
 6 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index b393cc6426f..0c6ad21eefb 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -138,8 +138,26 @@ jobs:
       run: yarn run build
 
     # Test that the generated packages are ok
-    - name: Import main entry point
-      run: node -e 'require("zwave-js")'
+    - name: Import main entry points for each package
+      run: |
+        node -e 'require("zwave-js")'
+        node -e 'require("@zwave-js/cc")'
+        node -e 'require("@zwave-js/config")'
+        node -e 'require("@zwave-js/core")'
+        node -e 'require("@zwave-js/host")'
+        node -e 'require("@zwave-js/maintenance")'
+        node -e 'require("@zwave-js/nvmedit")'
+        node -e 'require("@zwave-js/serial")'
+        node -e 'require("@zwave-js/shared")'
+        node -e 'require("@zwave-js/testing")'
+        node -e 'require("zwave-js/safe")'
+        node -e 'require("@zwave-js/cc/safe")'
+        node -e 'require("@zwave-js/config/safe")'
+        node -e 'require("@zwave-js/core/safe")'
+        node -e 'require("@zwave-js/host/safe")'
+        node -e 'require("@zwave-js/nvmedit/safe")'
+        node -e 'require("@zwave-js/serial/safe")'
+        node -e 'require("@zwave-js/shared/safe")'
 
     - name: Run component tests
       run: yarn run test:ci
diff --git a/packages/cc/src/index.ts b/packages/cc/src/index.ts
index 5bfcb50f50e..f2d95270fab 100644
--- a/packages/cc/src/index.ts
+++ b/packages/cc/src/index.ts
@@ -1,4 +1,5 @@
 import "reflect-metadata";
+
 export * from "./cc/index";
 export * from "./lib/API";
 export * from "./lib/CommandClass";
diff --git a/packages/cc/src/index_safe.ts b/packages/cc/src/index_safe.ts
index a6f2c1c0dab..33a530daacf 100644
--- a/packages/cc/src/index_safe.ts
+++ b/packages/cc/src/index_safe.ts
@@ -1,14 +1,3 @@
 /* @noExternalImports */
 
-export {
-	extensionType,
-	getExtensionType,
-	getS2ExtensionConstructor,
-	MGRPExtension,
-	MOSExtension,
-	MPANExtension,
-	Security2Extension,
-	SPANExtension,
-} from "./lib/Security2/Extension";
-export * from "./lib/Security2/shared";
 export * from "./lib/_Types";
diff --git a/packages/cc/src/lib/Security2/Extension.ts b/packages/cc/src/lib/Security2/Extension.ts
index 90b92c0ff93..be61e9d6632 100644
--- a/packages/cc/src/lib/Security2/Extension.ts
+++ b/packages/cc/src/lib/Security2/Extension.ts
@@ -4,6 +4,7 @@ import {
 	ZWaveErrorCodes,
 } from "@zwave-js/core/safe";
 import { getEnumMemberName, TypedClassDecorator } from "@zwave-js/shared/safe";
+import "reflect-metadata";
 
 enum S2ExtensionType {
 	SPAN = 0x01,
diff --git a/packages/zwave-js/src/Node.ts b/packages/zwave-js/src/Node.ts
index 7e2c156bb9c..33b53574036 100644
--- a/packages/zwave-js/src/Node.ts
+++ b/packages/zwave-js/src/Node.ts
@@ -16,15 +16,4 @@ export type {
 } from "./lib/node/NodeStatistics";
 export { VirtualEndpoint } from "./lib/node/VirtualEndpoint";
 export { VirtualNode, VirtualValueID } from "./lib/node/VirtualNode";
-export {
-	InterviewStage,
-	LifelineHealthCheckResult,
-	LifelineHealthCheckSummary,
-	LifelineRoutes,
-	NodeInterviewFailedEventArgs,
-	NodeStatus,
-	RefreshInfoOptions,
-	RouteHealthCheckResult,
-	RouteHealthCheckSummary,
-	ZWaveNodeEvents,
-} from "./lib/node/_Types";
+export * from "./lib/node/_Types";
diff --git a/packages/zwave-js/src/Node_safe.ts b/packages/zwave-js/src/Node_safe.ts
index 958123436f0..534d27c60d8 100644
--- a/packages/zwave-js/src/Node_safe.ts
+++ b/packages/zwave-js/src/Node_safe.ts
@@ -13,15 +13,4 @@ export type {
 	RouteStatistics,
 } from "./lib/node/NodeStatistics";
 export type { VirtualValueID } from "./lib/node/VirtualNode";
-export {
-	InterviewStage,
-	LifelineHealthCheckResult,
-	LifelineHealthCheckSummary,
-	LifelineRoutes,
-	NodeInterviewFailedEventArgs,
-	NodeStatus,
-	RefreshInfoOptions,
-	RouteHealthCheckResult,
-	RouteHealthCheckSummary,
-	ZWaveNodeEvents,
-} from "./lib/node/_Types";
+export * from "./lib/node/_Types";