chore: live monorepo, fix stuff

zwave-js · Jun 21, 2024 · f47a5f2 · f47a5f2
1 parent 6de5cd3
commit f47a5f2
Show file tree

Hide file tree

Showing 50 changed files with 161 additions and 228 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -27,13 +27,13 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Debug locally",
-			"port": 9229,
 			"runtimeExecutable": "yarn",
 			"runtimeArgs": [
 				"node",
 				"--async-stack-traces",
 				"-r",
 				"./maintenance/esbuild-register.js",
+				"--conditions=@@dev",
 				"${workspaceFolder}/test/run.ts"
 			],
 			"env": {
@@ -43,64 +43,46 @@
 			},
 			"console": "integratedTerminal",
 			"skipFiles": ["<node_internals>/**"],
-			"sourceMaps": true,
-			"preLaunchTask": "npm: build"
+			"sourceMaps": true
+			// "preLaunchTask": "npm: build"
 		},
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Test network mock",
-			"port": 9229,
+			"name": "Generate typed docs",
 			"runtimeExecutable": "yarn",
 			"runtimeArgs": [
 				"node",
 				"--async-stack-traces",
+				"--inspect-brk=9229",
 				"-r",
 				"./maintenance/esbuild-register.js",
-				"${workspaceFolder}/test/mock.ts"
+				"${workspaceFolder}/packages/maintenance/src/generateTypedDocs.ts"
 			],
-			"env": {
-				"NO_CACHE": "true"
-			},
 			"console": "integratedTerminal",
 			"skipFiles": ["<node_internals>/**"],
 			"sourceMaps": true,
+			// This needs the compiled sources (I think)
 			"preLaunchTask": "npm: build"
 		},
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Generate typed docs",
-			"port": 9229,
+			"name": "Decode message",
 			"runtimeExecutable": "yarn",
 			"runtimeArgs": [
 				"node",
 				"--async-stack-traces",
 				"--inspect-brk=9229",
 				"-r",
 				"./maintenance/esbuild-register.js",
-				"${workspaceFolder}/packages/maintenance/src/generateTypedDocs.ts"
+				"--conditions=@@dev",
+				"${workspaceFolder}/test/decodeMessage.ts"
 			],
 			"console": "integratedTerminal",
 			"skipFiles": ["<node_internals>/**"],
 			"sourceMaps": true
-		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Decode message",
-			"port": 9229,
-			"runtimeExecutable": "yarn",
-			"runtimeArgs": [
-				"node",
-				"--async-stack-traces",
-				"--inspect-brk=9229",
-				"${workspaceFolder}/test/debug.js"
-			],
-			"console": "integratedTerminal",
-			"skipFiles": ["<node_internals>/**"],
-			"sourceMaps": true,
-			"preLaunchTask": "npm: build"
+			// "preLaunchTask": "npm: build"
 		},
 		{
 			"type": "node",
@@ -114,34 +96,32 @@
 				"--inspect=9229",
 				"-r",
 				"./maintenance/esbuild-register.js",
+				"--conditions=@@dev",
 				"${workspaceFolder}/packages/config/maintenance/importConfig.ts",
 				"-dm -s zwa"
 			],
-			"console": "integratedTerminal",
-			"disableOptimisticBPs": true
+			"console": "integratedTerminal"
 		},
 		{
 			"type": "node",
 			"request": "launch",
 			"name": "Run Zniffer",
-			"port": 9229,
 			"runtimeExecutable": "yarn",
 			"runtimeArgs": [
 				"node",
 				"--async-stack-traces",
 				"-r",
 				"./maintenance/esbuild-register.js",
+				"--conditions=@@dev",
 				"${workspaceFolder}/test/run_zniffer.ts"
 			],
 			"env": {
 				"NODE_ENV": "development"
-				// "NO_CACHE": "true"
-				// "LOGLEVEL": "info"
 			},
 			"console": "integratedTerminal",
 			"skipFiles": ["<node_internals>/**"],
-			"sourceMaps": true,
-			"preLaunchTask": "npm: build"
+			"sourceMaps": true
+			// "preLaunchTask": "npm: build"
 		}
 	]
 }
diff --git a/ava.config.cjs b/ava.config.cjs
@@ -3,4 +3,7 @@ module.exports = {
 	extensions: ["ts"],
 	files: ["test/**", "**/*.test.ts", "!build/**"],
 	require: [path.join(__dirname, "./maintenance/esbuild-register.js")],
+	nodeArguments: [
+		"--conditions=@@dev",
+	],
 };
diff --git a/docs/api/CCs/Meter.md b/docs/api/CCs/Meter.md
@@ -7,13 +7,21 @@
 ### `get`
 
 ```ts
-async get(options?: MeterCCGetOptions): Promise<{ rateType: RateType; value: number; previousValue: MaybeNotKnown<number>; deltaTime: MaybeUnknown<number>; type: number; scale: MeterScale; } | undefined>;
+async get(options?: MeterCCGetOptions): Promise<{ rateType: RateType; value: number; previousValue: MaybeNotKnown<number>; deltaTime: MaybeUnknown<number>; type: number; scale: import("/home/dominic/Repositories/node-zwave-js/packages/core/build/index").MeterScale; } | undefined>;
+```
+
+### `sendReport`
+
+```ts
+async sendReport(
+	options: MeterCCReportOptions,
+): Promise<SupervisionResult | undefined>;
 ```
 
 ### `getAll`
 
 ```ts
-async getAll(): Promise<{ rateType: RateType; value: number; previousValue: MaybeNotKnown<number>; deltaTime: MaybeUnknown<number>; type: number; scale: MeterScale; }[]>;
+async getAll(accumulatedOnly: boolean = false): Promise<{ rateType: RateType; value: number; previousValue: MaybeNotKnown<number>; deltaTime: MaybeUnknown<number>; type: number; scale: import("/home/dominic/Repositories/node-zwave-js/packages/core/build/index").MeterScale; }[]>;
 ```
 
 ### `getSupported`
@@ -22,6 +30,14 @@ async getAll(): Promise<{ rateType: RateType; value: number; previousValue: Mayb
 async getSupported(): Promise<Pick<MeterCCSupportedReport, "type" | "supportsReset" | "supportedScales" | "supportedRateTypes"> | undefined>;
 ```
 
+### `sendSupportedReport`
+
+```ts
+async sendSupportedReport(
+	options: MeterCCSupportedReportOptions,
+): Promise<void>;
+```
+
 ### `reset`
 
 ```ts
@@ -50,7 +66,7 @@ async reset(
 - **secret:** false
 - **value type:** `"boolean"`
 
-### `resetSingle(meterType: number)`
+### `resetSingle(meterType: number, rateType: RateType, scale: number)`
 
 ```ts
 {
@@ -61,7 +77,7 @@ async reset(
 }
 ```
 
-- **label:** `Reset (${string})`
+- **label:** `Reset (${string})` | `Reset (Consumption, ${string})` | `Reset (Production, ${string})`
 - **min. CC version:** 1
 - **readable:** false
 - **writeable:** true

diff --git a/docs/api/driver.md b/docs/api/driver.md
@@ -899,6 +899,7 @@ interface ZWaveOptions extends ZWaveHostOptions {
 		 */
 		unresponsiveControllerRecovery?: boolean;
 	};
+
 	preferences: {
 		/**
 		 * The preferred scales to use when querying sensors. The key is either:

diff --git a/package.json b/package.json
@@ -137,8 +137,8 @@
     "extract-api": "FORCE_COLOR=1 yarn turbo run extract-api",
     "accept-api": "yarn extract-api -- --local",
     "monopack": "yarn exec monopack",
-    "check-references": "workspaces-to-typescript-project-references --check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.build.json",
-    "sync-references": "workspaces-to-typescript-project-references && workspaces-to-typescript-project-references --tsconfigPath tsconfig.build.json && yarn fmt > /dev/null"
+    "check-references": "workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.build.json",
+    "sync-references": "workspaces-to-typescript-project-references --tsconfigPath tsconfig.build.json && yarn fmt > /dev/null"
   },
   "readme": "README.md",
   "config": {

diff --git a/packages/cc/package.json b/packages/cc/package.json
@@ -6,23 +6,26 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
+  "type": "commonjs",
   "exports": {
     ".": {
+      "@@dev": "./src/index.ts",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
     "./safe": {
+      "@@dev": "./src/index_safe.ts",
       "types": "./build/index_safe.d.ts",
       "default": "./build/index_safe.js"
     },
     "./cc": {
+      "@@dev": "./src/cc/index.ts",
       "types": "./build/cc/index.d.ts",
       "default": "./build/cc/index.js"
     },
     "./package.json": "./package.json",
     "./*": {
+      "@@dev": "./src/cc/*.ts",
       "types": "./build/cc/*.d.ts",
       "default": "./build/cc/*.js"
     }

diff --git a/packages/cc/tsconfig.build.json b/packages/cc/tsconfig.build.json
@@ -3,7 +3,9 @@
 	"extends": "./tsconfig.json",
 	"compilerOptions": {
 		"rootDir": "src",
-		"outDir": "build"
+		"outDir": "build",
+		// Do not use the @@dev export for compiling
+		"customConditions": []
 	},
 	"references": [
 		{

diff --git a/packages/cc/tsconfig.json b/packages/cc/tsconfig.json
@@ -8,29 +8,6 @@
 			}
 		]
 	},
-	"references": [
-		{
-			"path": "../core"
-		},
-		{
-			"path": "../host"
-		},
-		{
-			"path": "../serial"
-		},
-		{
-			"path": "../shared"
-		},
-		{
-			"path": "../maintenance"
-		},
-		{
-			"path": "../testing"
-		},
-		{
-			"path": "../transformers"
-		}
-	],
 	"include": ["maintenance/**/*.ts", "src/**/*.ts"],
 	"exclude": ["build/**", "node_modules/**"]
 }
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -5,14 +5,15 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
+  "type": "commonjs",
   "exports": {
     ".": {
+      "@@dev": "./src/index.ts",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
     "./safe": {
+      "@@dev": "./src/index_safe.ts",
       "types": "./build/index_safe.d.ts",
       "default": "./build/index_safe.js"
     },

diff --git a/packages/config/tsconfig.build.json b/packages/config/tsconfig.build.json
@@ -3,7 +3,9 @@
 	"extends": "./tsconfig.json",
 	"compilerOptions": {
 		"rootDir": "src",
-		"outDir": "build"
+		"outDir": "build",
+		// Do not use the @@dev export for compiling
+		"customConditions": []
 	},
 	"references": [
 		{

diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
@@ -2,17 +2,6 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {},
-	"references": [
-		{
-			"path": "../core"
-		},
-		{
-			"path": "../shared"
-		},
-		{
-			"path": "../maintenance"
-		}
-	],
 	"include": ["maintenance/**/*.ts", "src/**/*.ts"],
 	"exclude": ["build/**", "node_modules/**"]
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -6,18 +6,20 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
+  "type": "commonjs",
   "exports": {
     ".": {
+      "@@dev": "./src/index.ts",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
     "./safe": {
+      "@@dev": "./src/index_safe.ts",
       "types": "./build/index_safe.d.ts",
       "default": "./build/index_safe.js"
     },
     "./test": {
+      "@@dev": "./src/index_test.ts",
       "types": "./build/index_test.d.ts",
       "default": "./build/index_test.js"
     },

diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json
@@ -5,7 +5,9 @@
 		"rootDir": "src",
 		"outDir": "build",
 		// Some @internal members need to be accessed from other modules in this monorepo
-		"stripInternal": false
+		"stripInternal": false,
+		// Do not use the @@dev export for compiling
+		"customConditions": []
 	},
 	"references": [
 		{

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -2,11 +2,6 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {},
-	"references": [
-		{
-			"path": "../shared"
-		}
-	],
 	"include": ["src/**/*.ts"],
 	"exclude": ["build/**", "node_modules/**"]
 }
diff --git a/packages/eslint-plugin/tsconfig.build.json b/packages/eslint-plugin/tsconfig.build.json
@@ -3,7 +3,9 @@
 	"extends": "./tsconfig.json",
 	"compilerOptions": {
 		"rootDir": "src",
-		"outDir": "build"
+		"outDir": "build",
+		// Do not use the @@dev export for compiling
+		"customConditions": []
 	},
 	"references": [
 		{

diff --git a/packages/eslint-plugin/tsconfig.json b/packages/eslint-plugin/tsconfig.json
@@ -4,11 +4,6 @@
 	"compilerOptions": {
 		"types": ["node", "@typescript-eslint/utils"]
 	},
-	"references": [
-		{
-			"path": "../core"
-		}
-	],
 	"include": [
 		"src/**/*.ts"
 	],
-Original file line number
+Diff line change
@@ Expand Up / @@ -899,6 +899,7 @@ interface ZWaveOptions extends ZWaveHostOptions { @@
     		 */
     		unresponsiveControllerRecovery?: boolean;
     	};
     	preferences: {
     		/**
     		 * The preferred scales to use when querying sensors. The key is either:
@@ Expand Down @@