refactor: move mock behaviors to improve tree shaking (#7487)

zwave-js · Dec 12, 2024 · 9d5e3fa · 9d5e3fa
1 parent 3f6229b
commit 9d5e3fa
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 22 deletions.
diff --git a/packages/zwave-js/src/Testing.ts b/packages/zwave-js/src/Testing.ts
@@ -1,4 +1,6 @@
+export { createDefaultBehaviors as createDefaultMockControllerBehaviors } from "./lib/controller/MockControllerBehaviors.js";
 export { createAndStartDriverWithMockPort } from "./lib/driver/DriverMock.js";
+export { createDefaultBehaviors as createDefaultMockNodeBehaviors } from "./lib/node/MockNodeBehaviors.js";
 export { MockServer, createMockNodeOptionsFromDump } from "./mockServer.js";
 export type {
 	MockServerControllerOptions,

diff --git a/packages/zwave-js/src/Utils.ts b/packages/zwave-js/src/Utils.ts
@@ -24,7 +24,6 @@ export {
 	getEnumMemberName,
 	num2hex,
 } from "@zwave-js/shared/safe";
-export { createDefaultBehaviors as createDefaultMockControllerBehaviors } from "./lib/controller/MockControllerBehaviors.js";
 export { driverPresets } from "./lib/driver/ZWaveOptions.js";
 export {
 	formatLifelineHealthCheckRound,
@@ -33,4 +32,3 @@ export {
 	formatRouteHealthCheckSummary,
 	healthCheckRatingToWord,
 } from "./lib/node/HealthCheck.js";
-export { createDefaultBehaviors as createDefaultMockNodeBehaviors } from "./lib/node/MockNodeBehaviors.js";
diff --git a/packages/zwave-js/src/lib/controller/Controller.nodes.getOrThrow.test.ts b/packages/zwave-js/src/lib/controller/Controller.nodes.getOrThrow.test.ts
@@ -2,7 +2,7 @@ import { ZWaveErrorCodes, assertZWaveError } from "@zwave-js/core";
 import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../Testing.js";
 import type { Driver } from "../driver/Driver.js";
 import { createAndStartTestingDriver } from "../driver/DriverMock.js";
 import { ZWaveNode } from "../node/Node.js";

diff --git a/packages/zwave-js/src/lib/node/Endpoint.test.ts b/packages/zwave-js/src/lib/node/Endpoint.test.ts
@@ -8,7 +8,7 @@ import {
 } from "@zwave-js/core";
 import { MockController } from "@zwave-js/testing";
 import { afterEach, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../Testing.js";
 import type { Driver } from "../driver/Driver.js";
 import { createAndStartTestingDriver } from "../driver/DriverMock.js";
 import { Endpoint } from "./Endpoint.js";

diff --git a/packages/zwave-js/src/lib/node/VirtualEndpoint.test.ts b/packages/zwave-js/src/lib/node/VirtualEndpoint.test.ts
@@ -25,7 +25,7 @@ import { test as baseTest } from "vitest";
 import {
 	createDefaultMockControllerBehaviors,
 	createDefaultMockNodeBehaviors,
-} from "../../Utils.js";
+} from "../../Testing.js";
 import type { Driver } from "../driver/Driver.js";
 import { createAndStartTestingDriver } from "../driver/DriverMock.js";
 import { ZWaveNode } from "./Node.js";

diff --git a/packages/zwave-js/src/lib/test/cc/API.test.ts b/packages/zwave-js/src/lib/test/cc/API.test.ts
@@ -3,7 +3,7 @@ import { NOT_KNOWN } from "@zwave-js/core";
 import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/cc/CommandClass.persistValues.test.ts b/packages/zwave-js/src/lib/test/cc/CommandClass.persistValues.test.ts
@@ -6,7 +6,7 @@ import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import sinon from "sinon";
 import { afterEach, beforeEach, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/driver/assemblePartialCCs.test.ts b/packages/zwave-js/src/lib/test/driver/assemblePartialCCs.test.ts
@@ -8,7 +8,7 @@ import { CommandClasses, ZWaveError, ZWaveErrorCodes } from "@zwave-js/core";
 import { ApplicationCommandRequest } from "@zwave-js/serial/serialapi";
 import { MockController, MockNode } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 

diff --git a/packages/zwave-js/src/lib/test/driver/computeNetCCPayloadSize.test.ts b/packages/zwave-js/src/lib/test/driver/computeNetCCPayloadSize.test.ts
@@ -5,7 +5,7 @@ import { EncapsulationFlags, TransmitOptions } from "@zwave-js/core";
 import { SendDataRequest } from "@zwave-js/serial/serialapi";
 import { MockController } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 

diff --git a/packages/zwave-js/src/lib/test/driver/hasPendingMessages.test.ts b/packages/zwave-js/src/lib/test/driver/hasPendingMessages.test.ts
@@ -1,7 +1,7 @@
 import { CommandClasses, type ValueID } from "@zwave-js/core";
 import { MockController } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/integrationTestSuiteShared.ts b/packages/zwave-js/src/lib/test/integrationTestSuiteShared.ts
@@ -12,7 +12,7 @@ import { fileURLToPath } from "node:url";
 import {
 	createDefaultMockControllerBehaviors,
 	createDefaultMockNodeBehaviors,
-} from "../../Utils.js";
+} from "../../Testing.js";
 import {
 	type CreateAndStartDriverWithMockPortResult,
 	createAndStartDriverWithMockPort,

diff --git a/packages/zwave-js/src/lib/test/node/Node.ccVersions.test.ts b/packages/zwave-js/src/lib/test/node/Node.ccVersions.test.ts
@@ -1,7 +1,7 @@
 import { CommandClasses } from "@zwave-js/core";
 import { MockController } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.constructor.test.ts b/packages/zwave-js/src/lib/test/node/Node.constructor.test.ts
@@ -4,7 +4,7 @@ import "@zwave-js/cc";
 import { CommandClasses, ValueDB } from "@zwave-js/core";
 import { MockController } from "@zwave-js/testing";
 import { afterEach, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { DeviceClass } from "../../node/DeviceClass.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.createCCInstance.test.ts b/packages/zwave-js/src/lib/test/node/Node.createCCInstance.test.ts
@@ -7,7 +7,7 @@ import {
 import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.getEndpoint.test.ts b/packages/zwave-js/src/lib/test/node/Node.getEndpoint.test.ts
@@ -6,7 +6,7 @@ import {
 import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import { afterEach, beforeEach, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { DeviceClass } from "../../node/DeviceClass.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.getSetValue.test.ts b/packages/zwave-js/src/lib/test/node/Node.getSetValue.test.ts
@@ -5,7 +5,7 @@ import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import sinon from "sinon";
 import { type TaskContext, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.status.test.ts b/packages/zwave-js/src/lib/test/node/Node.status.test.ts
@@ -2,7 +2,7 @@ import { NodeStatus } from "@zwave-js/core";
 import { MockController } from "@zwave-js/testing";
 import sinon from "sinon";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.updateNodeInfo.test.ts b/packages/zwave-js/src/lib/test/node/Node.updateNodeInfo.test.ts
@@ -5,7 +5,7 @@ import { CommandClasses, InterviewStage, NodeStatus } from "@zwave-js/core";
 import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import { afterEach, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.valueEvents.test.ts b/packages/zwave-js/src/lib/test/node/Node.valueEvents.test.ts
@@ -3,7 +3,7 @@ import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import sinon from "sinon";
 import { afterEach, beforeEach, test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/lib/test/node/Node.waitForWakeup.test.ts b/packages/zwave-js/src/lib/test/node/Node.waitForWakeup.test.ts
@@ -7,7 +7,7 @@ import type { ThrowingMap } from "@zwave-js/shared";
 import { MockController } from "@zwave-js/testing";
 import { wait } from "alcalzone-shared/async";
 import { test as baseTest } from "vitest";
-import { createDefaultMockControllerBehaviors } from "../../../Utils.js";
+import { createDefaultMockControllerBehaviors } from "../../../Testing.js";
 import type { Driver } from "../../driver/Driver.js";
 import { createAndStartTestingDriver } from "../../driver/DriverMock.js";
 import { ZWaveNode } from "../../node/Node.js";

diff --git a/packages/zwave-js/src/mockServer.ts b/packages/zwave-js/src/mockServer.ts
@@ -48,10 +48,10 @@ import {
 import { createDeferredPromise } from "alcalzone-shared/deferred-promise";
 import { type AddressInfo, type Server, createServer } from "node:net";
 import {
-	ProtocolVersion,
 	createDefaultMockControllerBehaviors,
 	createDefaultMockNodeBehaviors,
-} from "./Utils.js";
+} from "./Testing.js";
+import { ProtocolVersion } from "./Utils.js";
 import { type CommandClassDump, type NodeDump } from "./lib/node/Dump.js";
 
 export type MockServerControllerOptions =