@zwave-js/cc 14.0.0-beta.4 → 14.0.0-beta.5

package/build/esm/cc/BasicCC.js

@@ -1,10 +1,37 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
 };
-var BasicCCSet_1, BasicCCReport_1;
 function __assertType(argName, typeName, boundHasError) {
     const { ZWaveError, ZWaveErrorCodes } = require("@zwave-js/core");
     if (boundHasError()) {
@@ -22,7 +49,7 @@ import { Bytes } from "@zwave-js/shared/safe";
 import { pick } from "@zwave-js/shared/safe";
 import { CCAPI, POLL_VALUE, SET_VALUE, SET_VALUE_HOOKS, throwUnsupportedProperty, throwWrongValueType, } from "../lib/API.js";
 import { CommandClass, getEffectiveCCVersion, } from "../lib/CommandClass.js";
-import { API, CCCommand, ccValue, ccValues, commandClass, expectedCCResponse, implementedVersion, useSupervision, } from "../lib/CommandClassDecorators.js";
+import { API, CCCommand, ccValueProperty, ccValues, commandClass, expectedCCResponse, implementedVersion, useSupervision, } from "../lib/CommandClassDecorators.js";
 import { V } from "../lib/Values.js";
 import { BasicCommand } from "../lib/_Types.js";
 export const BasicCCValues = Object.freeze({
@@ -57,334 +84,385 @@ export const BasicCCValues = Object.freeze({
         }),
     }),
 });
-let BasicCCAPI = class BasicCCAPI extends CCAPI {
-    supportsCommand(cmd) {
-        switch (cmd) {
-            case BasicCommand.Get:
-                return this.isSinglecast();
-            case BasicCommand.Set:
-                return true;
+let BasicCCAPI = (() => {
+    let _classDecorators = [API(CommandClasses.Basic)];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = CCAPI;
+    var BasicCCAPI = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            BasicCCAPI = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        return super.supportsCommand(cmd);
-    }
-    get [SET_VALUE]() {
-        return async function ({ property }, value) {
+        supportsCommand(cmd) {
+            switch (cmd) {
+                case BasicCommand.Get:
+                    return this.isSinglecast();
+                case BasicCommand.Set:
+                    return true;
+            }
+            return super.supportsCommand(cmd);
+        }
+        get [SET_VALUE]() {
+            return async function ({ property }, value) {
+                // Enable restoring the previous non-zero value
+                if (property === "restorePrevious") {
+                    property = "targetValue";
+                    value = 255;
+                }
+                if (property !== "targetValue") {
+                    throwUnsupportedProperty(this.ccId, property);
+                }
+                if (typeof value !== "number") {
+                    throwWrongValueType(this.ccId, property, "number", typeof value);
+                }
+                return this.set(value);
+            };
+        }
+        [SET_VALUE_HOOKS] = ({ property }, value, _options) => {
             // Enable restoring the previous non-zero value
             if (property === "restorePrevious") {
                 property = "targetValue";
                 value = 255;
             }
-            if (property !== "targetValue") {
-                throwUnsupportedProperty(this.ccId, property);
-            }
-            if (typeof value !== "number") {
-                throwWrongValueType(this.ccId, property, "number", typeof value);
-            }
-            return this.set(value);
-        };
-    }
-    [SET_VALUE_HOOKS] = ({ property }, value, _options) => {
-        // Enable restoring the previous non-zero value
-        if (property === "restorePrevious") {
-            property = "targetValue";
-            value = 255;
-        }
-        if (property === "targetValue") {
-            const currentValueValueId = BasicCCValues.currentValue.endpoint(this.endpoint.index);
-            return {
-                optimisticallyUpdateRelatedValues: (_supervisedAndSuccessful) => {
-                    // Only update currentValue for valid target values
-                    if (typeof value === "number"
-                        && value >= 0
-                        && value <= 99) {
-                        if (this.isSinglecast()) {
-                            this.tryGetValueDB()?.setValue(currentValueValueId, value);
-                        }
-                        else if (this.isMulticast()) {
-                            // Figure out which nodes were affected by this command
-                            const affectedNodes = this.endpoint.node
-                                .physicalNodes.filter((node) => node
-                                .getEndpoint(this.endpoint.index)
-                                ?.supportsCC(this.ccId));
-                            // and optimistically update the currentValue
-                            for (const node of affectedNodes) {
-                                this.host
-                                    .tryGetValueDB(node.id)
-                                    ?.setValue(currentValueValueId, value);
+            if (property === "targetValue") {
+                const currentValueValueId = BasicCCValues.currentValue.endpoint(this.endpoint.index);
+                return {
+                    optimisticallyUpdateRelatedValues: (_supervisedAndSuccessful) => {
+                        // Only update currentValue for valid target values
+                        if (typeof value === "number"
+                            && value >= 0
+                            && value <= 99) {
+                            if (this.isSinglecast()) {
+                                this.tryGetValueDB()?.setValue(currentValueValueId, value);
+                            }
+                            else if (this.isMulticast()) {
+                                // Figure out which nodes were affected by this command
+                                const affectedNodes = this.endpoint.node
+                                    .physicalNodes.filter((node) => node
+                                    .getEndpoint(this.endpoint.index)
+                                    ?.supportsCC(this.ccId));
+                                // and optimistically update the currentValue
+                                for (const node of affectedNodes) {
+                                    this.host
+                                        .tryGetValueDB(node.id)
+                                        ?.setValue(currentValueValueId, value);
+                                }
                             }
                         }
-                    }
-                },
-                forceVerifyChanges: () => {
-                    // If we don't know the actual value, we need to verify the change, regardless of the supervision result
-                    return value === 255;
-                },
-                verifyChanges: () => {
-                    if (this.isSinglecast()
-                        // We generally don't want to poll for multicasts because of how much traffic it can cause
-                        // However, when setting the value 255 (ON), we don't know the actual state
-                        || (this.isMulticast() && value === 255)) {
-                        // We query currentValue instead of targetValue to make sure that unsolicited updates cancel the scheduled poll
-                        this.schedulePoll(currentValueValueId, value === 255 ? undefined : value);
-                    }
-                },
+                    },
+                    forceVerifyChanges: () => {
+                        // If we don't know the actual value, we need to verify the change, regardless of the supervision result
+                        return value === 255;
+                    },
+                    verifyChanges: () => {
+                        if (this.isSinglecast()
+                            // We generally don't want to poll for multicasts because of how much traffic it can cause
+                            // However, when setting the value 255 (ON), we don't know the actual state
+                            || (this.isMulticast() && value === 255)) {
+                            // We query currentValue instead of targetValue to make sure that unsolicited updates cancel the scheduled poll
+                            this.schedulePoll(currentValueValueId, value === 255 ? undefined : value);
+                        }
+                    },
+                };
+            }
+        };
+        get [POLL_VALUE]() {
+            return async function ({ property }) {
+                switch (property) {
+                    case "currentValue":
+                    case "targetValue":
+                    case "duration":
+                        return (await this.get())?.[property];
+                    default:
+                        throwUnsupportedProperty(this.ccId, property);
+                }
             };
         }
-    };
-    get [POLL_VALUE]() {
-        return async function ({ property }) {
-            switch (property) {
-                case "currentValue":
-                case "targetValue":
-                case "duration":
-                    return (await this.get())?.[property];
-                default:
-                    throwUnsupportedProperty(this.ccId, property);
+        // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+        async get() {
+            this.assertSupportsCommand(BasicCommand, BasicCommand.Get);
+            const cc = new BasicCCGet({
+                nodeId: this.endpoint.nodeId,
+                endpointIndex: this.endpoint.index,
+            });
+            const response = await this.host.sendCommand(cc, this.commandOptions);
+            if (response) {
+                this.tryGetValueDB()?.setValue(BasicCCValues.currentValue.endpoint(this.endpoint.index), response.currentValue);
+                return pick(response, ["currentValue", "targetValue", "duration"]);
             }
-        };
-    }
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    async get() {
-        this.assertSupportsCommand(BasicCommand, BasicCommand.Get);
-        const cc = new BasicCCGet({
-            nodeId: this.endpoint.nodeId,
-            endpointIndex: this.endpoint.index,
-        });
-        const response = await this.host.sendCommand(cc, this.commandOptions);
-        if (response) {
-            this.tryGetValueDB()?.setValue(BasicCCValues.currentValue.endpoint(this.endpoint.index), response.currentValue);
-            return pick(response, ["currentValue", "targetValue", "duration"]);
         }
-    }
-    async set(targetValue) {
-        __assertType("targetValue", "number", __assertType__number.bind(void 0, targetValue));
-        this.assertSupportsCommand(BasicCommand, BasicCommand.Set);
-        const cc = new BasicCCSet({
-            nodeId: this.endpoint.nodeId,
-            endpointIndex: this.endpoint.index,
-            targetValue,
-        });
-        return this.host.sendCommand(cc, this.commandOptions);
-    }
-};
-BasicCCAPI = __decorate([
-    API(CommandClasses.Basic)
-], BasicCCAPI);
+        async set(targetValue) {
+            __assertType("targetValue", "number", __assertType__number.bind(void 0, targetValue));
+            this.assertSupportsCommand(BasicCommand, BasicCommand.Set);
+            const cc = new BasicCCSet({
+                nodeId: this.endpoint.nodeId,
+                endpointIndex: this.endpoint.index,
+                targetValue,
+            });
+            return this.host.sendCommand(cc, this.commandOptions);
+        }
+    };
+    return BasicCCAPI = _classThis;
+})();
 export { BasicCCAPI };
-let BasicCC = class BasicCC extends CommandClass {
-    async interview(ctx) {
-        const node = this.getNode(ctx);
-        const endpoint = this.getEndpoint(ctx);
-        ctx.logNode(node.id, {
-            endpoint: this.endpointIndex,
-            message: `Interviewing ${this.ccName}...`,
-            direction: "none",
-        });
-        // Assume that the endpoint supports Basic CC, so the values get persisted correctly.
-        endpoint.addCC(CommandClasses.Basic, { isSupported: true });
-        // try to query the current state
-        await this.refreshValues(ctx);
-        // Remove Basic CC support again when there was no response
-        if (this.getValue(ctx, BasicCCValues.currentValue) == undefined) {
+let BasicCC = (() => {
+    let _classDecorators = [commandClass(CommandClasses.Basic), implementedVersion(2), ccValues(BasicCCValues)];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = CommandClass;
+    var BasicCC = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            BasicCC = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        async interview(ctx) {
+            const node = this.getNode(ctx);
+            const endpoint = this.getEndpoint(ctx);
             ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
-                message: "No response to Basic Get command, assuming Basic CC is unsupported...",
+                message: `Interviewing ${this.ccName}...`,
+                direction: "none",
             });
-            // SDS14223: A controlling node MUST conclude that the Basic Command Class is not supported by a node (or
-            // endpoint) if no Basic Report is returned.
-            endpoint.addCC(CommandClasses.Basic, { isSupported: false });
-            if (!endpoint.controlsCC(CommandClasses.Basic)) {
-                endpoint.removeCC(CommandClasses.Basic);
+            // Assume that the endpoint supports Basic CC, so the values get persisted correctly.
+            endpoint.addCC(CommandClasses.Basic, { isSupported: true });
+            // try to query the current state
+            await this.refreshValues(ctx);
+            // Remove Basic CC support again when there was no response
+            if (this.getValue(ctx, BasicCCValues.currentValue) == undefined) {
+                ctx.logNode(node.id, {
+                    endpoint: this.endpointIndex,
+                    message: "No response to Basic Get command, assuming Basic CC is unsupported...",
+                });
+                // SDS14223: A controlling node MUST conclude that the Basic Command Class is not supported by a node (or
+                // endpoint) if no Basic Report is returned.
+                endpoint.addCC(CommandClasses.Basic, { isSupported: false });
+                if (!endpoint.controlsCC(CommandClasses.Basic)) {
+                    endpoint.removeCC(CommandClasses.Basic);
+                }
             }
+            // Remember that the interview is complete
+            this.setInterviewComplete(ctx, true);
         }
-        // Remember that the interview is complete
-        this.setInterviewComplete(ctx, true);
-    }
-    async refreshValues(ctx) {
-        const node = this.getNode(ctx);
-        const endpoint = this.getEndpoint(ctx);
-        const api = CCAPI.create(CommandClasses.Basic, ctx, endpoint).withOptions({
-            priority: MessagePriority.NodeQuery,
-        });
-        // try to query the current state
-        ctx.logNode(node.id, {
-            endpoint: this.endpointIndex,
-            message: "querying Basic CC state...",
-            direction: "outbound",
-        });
-        const basicResponse = await api.get();
-        if (basicResponse) {
-            let logMessage = `received Basic CC state:
+        async refreshValues(ctx) {
+            const node = this.getNode(ctx);
+            const endpoint = this.getEndpoint(ctx);
+            const api = CCAPI.create(CommandClasses.Basic, ctx, endpoint).withOptions({
+                priority: MessagePriority.NodeQuery,
+            });
+            // try to query the current state
+            ctx.logNode(node.id, {
+                endpoint: this.endpointIndex,
+                message: "querying Basic CC state...",
+                direction: "outbound",
+            });
+            const basicResponse = await api.get();
+            if (basicResponse) {
+                let logMessage = `received Basic CC state:
 current value:      ${basicResponse.currentValue}`;
-            if (basicResponse.targetValue != undefined) {
-                logMessage += `
+                if (basicResponse.targetValue != undefined) {
+                    logMessage += `
 target value:       ${basicResponse.targetValue}
 remaining duration: ${basicResponse.duration?.toString() ?? "undefined"}`;
+                }
+                ctx.logNode(node.id, {
+                    endpoint: this.endpointIndex,
+                    message: logMessage,
+                    direction: "inbound",
+                });
             }
-            ctx.logNode(node.id, {
-                endpoint: this.endpointIndex,
-                message: logMessage,
-                direction: "inbound",
-            });
         }
-    }
-    getDefinedValueIDs(ctx) {
-        const ret = [];
-        const endpoint = this.getEndpoint(ctx);
-        const compat = ctx.getDeviceConfig?.(endpoint.nodeId)?.compat;
-        if (compat?.mapBasicSet === "event") {
-            // Add the compat event value if it should be exposed
-            ret.push(BasicCCValues.compatEvent.endpoint(endpoint.index));
+        getDefinedValueIDs(ctx) {
+            const ret = [];
+            const endpoint = this.getEndpoint(ctx);
+            const compat = ctx.getDeviceConfig?.(endpoint.nodeId)?.compat;
+            if (compat?.mapBasicSet === "event") {
+                // Add the compat event value if it should be exposed
+                ret.push(BasicCCValues.compatEvent.endpoint(endpoint.index));
+            }
+            if (endpoint.supportsCC(this.ccId)) {
+                // Defer to the base implementation if Basic CC is supported.
+                // This implies that no other actuator CC is supported.
+                ret.push(...super.getDefinedValueIDs(ctx));
+            }
+            else if (endpoint.controlsCC(CommandClasses.Basic)) {
+                // During the interview, we mark Basic CC as controlled only if we want to expose currentValue
+                ret.push(BasicCCValues.currentValue.endpoint(endpoint.index));
+            }
+            return ret;
         }
-        if (endpoint.supportsCC(this.ccId)) {
-            // Defer to the base implementation if Basic CC is supported.
-            // This implies that no other actuator CC is supported.
-            ret.push(...super.getDefinedValueIDs(ctx));
+    };
+    return BasicCC = _classThis;
+})();
+export { BasicCC };
+let BasicCCSet = (() => {
+    let _classDecorators = [CCCommand(BasicCommand.Set), useSupervision()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = BasicCC;
+    var BasicCCSet = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            BasicCCSet = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        else if (endpoint.controlsCC(CommandClasses.Basic)) {
-            // During the interview, we mark Basic CC as controlled only if we want to expose currentValue
-            ret.push(BasicCCValues.currentValue.endpoint(endpoint.index));
+        constructor(options) {
+            super(options);
+            this.targetValue = options.targetValue;
         }
-        return ret;
-    }
-};
-BasicCC = __decorate([
-    commandClass(CommandClasses.Basic),
-    implementedVersion(2) // Update tests in CommandClass.test.ts when changing this
-    ,
-    ccValues(BasicCCValues)
-], BasicCC);
-export { BasicCC };
-let BasicCCSet = BasicCCSet_1 = class BasicCCSet extends BasicCC {
-    constructor(options) {
-        super(options);
-        this.targetValue = options.targetValue;
-    }
-    static from(raw, ctx) {
-        validatePayload(raw.payload.length >= 1);
-        const targetValue = raw.payload[0];
-        return new BasicCCSet_1({
-            nodeId: ctx.sourceNodeId,
-            targetValue,
-        });
-    }
-    targetValue;
-    serialize(ctx) {
-        this.payload = Bytes.from([this.targetValue]);
-        return super.serialize(ctx);
-    }
-    toLogEntry(ctx) {
-        return {
-            ...super.toLogEntry(ctx),
-            message: { "target value": this.targetValue },
-        };
-    }
-};
-BasicCCSet = BasicCCSet_1 = __decorate([
-    CCCommand(BasicCommand.Set),
-    useSupervision()
-], BasicCCSet);
-export { BasicCCSet };
-let BasicCCReport = BasicCCReport_1 = class BasicCCReport extends BasicCC {
-    // @noCCValues See comment in the constructor
-    constructor(options) {
-        super(options);
-        this.currentValue = options.currentValue;
-        this.targetValue = options.targetValue;
-        this.duration = options.duration;
-    }
-    static from(raw, ctx) {
-        validatePayload(raw.payload.length >= 1);
-        const currentValue = 
-        // 0xff is a legacy value for 100% (99)
-        raw.payload[0] === 0xff
-            ? 99
-            : parseMaybeNumber(raw.payload[0]);
-        validatePayload(currentValue !== undefined);
-        let targetValue;
-        let duration;
-        if (raw.payload.length >= 3) {
-            targetValue = parseMaybeNumber(raw.payload[1]);
-            duration = Duration.parseReport(raw.payload[2]);
+        static from(raw, ctx) {
+            validatePayload(raw.payload.length >= 1);
+            const targetValue = raw.payload[0];
+            return new this({
+                nodeId: ctx.sourceNodeId,
+                targetValue,
+            });
         }
-        return new BasicCCReport_1({
-            nodeId: ctx.sourceNodeId,
-            currentValue,
-            targetValue,
-            duration,
-        });
-    }
-    currentValue;
-    targetValue;
-    duration;
-    persistValues(ctx) {
-        // Basic CC Report persists its values itself, since there are some
-        // specific rules when which value may be persisted.
-        // These rules are essentially encoded in the getDefinedValueIDs overload,
-        // so we simply reuse that here.
-        // Figure out which values may be persisted.
-        const definedValueIDs = this.getDefinedValueIDs(ctx);
-        const shouldPersistCurrentValue = definedValueIDs.some((vid) => BasicCCValues.currentValue.is(vid));
-        const shouldPersistTargetValue = definedValueIDs.some((vid) => BasicCCValues.targetValue.is(vid));
-        const shouldPersistDuration = definedValueIDs.some((vid) => BasicCCValues.duration.is(vid));
-        if (this.currentValue !== undefined && shouldPersistCurrentValue) {
-            this.setValue(ctx, BasicCCValues.currentValue, this.currentValue);
+        targetValue;
+        serialize(ctx) {
+            this.payload = Bytes.from([this.targetValue]);
+            return super.serialize(ctx);
         }
-        if (this.targetValue !== undefined && shouldPersistTargetValue) {
-            this.setValue(ctx, BasicCCValues.targetValue, this.targetValue);
+        toLogEntry(ctx) {
+            return {
+                ...super.toLogEntry(ctx),
+                message: { "target value": this.targetValue },
+            };
         }
-        if (this.duration !== undefined && shouldPersistDuration) {
-            this.setValue(ctx, BasicCCValues.duration, this.duration);
+    };
+    return BasicCCSet = _classThis;
+})();
+export { BasicCCSet };
+let BasicCCReport = (() => {
+    let _classDecorators = [CCCommand(BasicCommand.Report), ccValueProperty("currentValue", BasicCCValues.currentValue), ccValueProperty("targetValue", BasicCCValues.targetValue), ccValueProperty("duration", BasicCCValues.duration)];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = BasicCC;
+    var BasicCCReport = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            BasicCCReport = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        return true;
-    }
-    serialize(ctx) {
-        this.payload = Bytes.from([
-            this.currentValue ?? 0xfe,
-            this.targetValue ?? 0xfe,
-            (this.duration ?? Duration.unknown()).serializeReport(),
-        ]);
-        const ccVersion = getEffectiveCCVersion(ctx, this);
-        if (ccVersion < 2 && ctx.getDeviceConfig?.(this.nodeId)?.compat?.encodeCCsUsingTargetVersion) {
-            // When forcing CC version 1, only send the current value
-            this.payload = this.payload.subarray(0, 1);
+        // @noCCValues See comment in the constructor
+        constructor(options) {
+            super(options);
+            this.currentValue = options.currentValue;
+            this.targetValue = options.targetValue;
+            this.duration = options.duration;
         }
-        return super.serialize(ctx);
-    }
-    toLogEntry(ctx) {
-        const message = {
-            "current value": maybeUnknownToString(this.currentValue),
-        };
-        if (this.targetValue !== undefined) {
-            message["target value"] = maybeUnknownToString(this.targetValue);
+        static from(raw, ctx) {
+            validatePayload(raw.payload.length >= 1);
+            const currentValue = 
+            // 0xff is a legacy value for 100% (99)
+            raw.payload[0] === 0xff
+                ? 99
+                : parseMaybeNumber(raw.payload[0]);
+            validatePayload(currentValue !== undefined);
+            let targetValue;
+            let duration;
+            if (raw.payload.length >= 3) {
+                targetValue = parseMaybeNumber(raw.payload[1]);
+                duration = Duration.parseReport(raw.payload[2]);
+            }
+            return new this({
+                nodeId: ctx.sourceNodeId,
+                currentValue,
+                targetValue,
+                duration,
+            });
         }
-        if (this.duration != undefined) {
-            message.duration = this.duration.toString();
+        currentValue;
+        targetValue;
+        duration;
+        persistValues(ctx) {
+            // Basic CC Report persists its values itself, since there are some
+            // specific rules when which value may be persisted.
+            // These rules are essentially encoded in the getDefinedValueIDs overload,
+            // so we simply reuse that here.
+            // Figure out which values may be persisted.
+            const definedValueIDs = this.getDefinedValueIDs(ctx);
+            const shouldPersistCurrentValue = definedValueIDs.some((vid) => BasicCCValues.currentValue.is(vid));
+            const shouldPersistTargetValue = definedValueIDs.some((vid) => BasicCCValues.targetValue.is(vid));
+            const shouldPersistDuration = definedValueIDs.some((vid) => BasicCCValues.duration.is(vid));
+            if (this.currentValue !== undefined && shouldPersistCurrentValue) {
+                this.setValue(ctx, BasicCCValues.currentValue, this.currentValue);
+            }
+            if (this.targetValue !== undefined && shouldPersistTargetValue) {
+                this.setValue(ctx, BasicCCValues.targetValue, this.targetValue);
+            }
+            if (this.duration !== undefined && shouldPersistDuration) {
+                this.setValue(ctx, BasicCCValues.duration, this.duration);
+            }
+            return true;
         }
-        return {
-            ...super.toLogEntry(ctx),
-            message,
-        };
-    }
-};
-__decorate([
-    ccValue(BasicCCValues.currentValue)
-], BasicCCReport.prototype, "currentValue", void 0);
-__decorate([
-    ccValue(BasicCCValues.targetValue)
-], BasicCCReport.prototype, "targetValue", void 0);
-__decorate([
-    ccValue(BasicCCValues.duration)
-], BasicCCReport.prototype, "duration", void 0);
-BasicCCReport = BasicCCReport_1 = __decorate([
-    CCCommand(BasicCommand.Report)
-], BasicCCReport);
+        serialize(ctx) {
+            this.payload = Bytes.from([
+                this.currentValue ?? 0xfe,
+                this.targetValue ?? 0xfe,
+                (this.duration ?? Duration.unknown()).serializeReport(),
+            ]);
+            const ccVersion = getEffectiveCCVersion(ctx, this);
+            if (ccVersion < 2 && ctx.getDeviceConfig?.(this.nodeId)?.compat?.encodeCCsUsingTargetVersion) {
+                // When forcing CC version 1, only send the current value
+                this.payload = this.payload.subarray(0, 1);
+            }
+            return super.serialize(ctx);
+        }
+        toLogEntry(ctx) {
+            const message = {
+                "current value": maybeUnknownToString(this.currentValue),
+            };
+            if (this.targetValue !== undefined) {
+                message["target value"] = maybeUnknownToString(this.targetValue);
+            }
+            if (this.duration != undefined) {
+                message.duration = this.duration.toString();
+            }
+            return {
+                ...super.toLogEntry(ctx),
+                message,
+            };
+        }
+    };
+    return BasicCCReport = _classThis;
+})();
 export { BasicCCReport };
-let BasicCCGet = class BasicCCGet extends BasicCC {
-};
-BasicCCGet = __decorate([
-    CCCommand(BasicCommand.Get),
-    expectedCCResponse(BasicCCReport)
-], BasicCCGet);
+let BasicCCGet = (() => {
+    let _classDecorators = [CCCommand(BasicCommand.Get), expectedCCResponse(BasicCCReport)];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = BasicCC;
+    var BasicCCGet = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            BasicCCGet = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+    };
+    return BasicCCGet = _classThis;
+})();
 export { BasicCCGet };
 //# sourceMappingURL=BasicCC.js.map