@zwave-js/cc 14.3.10 → 15.0.0-beta.1

package/build/cjs/cc/IndicatorCC.d.ts

@@ -1,205 +1,205 @@
-import { CommandClasses, type EndpointId, type MaybeNotKnown, type MessageOrCCLogEntry, type SupervisionResult, type WithAddress } from "@zwave-js/core/safe";
-import type { CCEncodingContext, CCParsingContext, GetValueDB } from "@zwave-js/host/safe";
+import { type CCEncodingContext, type CCParsingContext } from "@zwave-js/cc";
+import { CommandClasses, type EndpointId, type GetValueDB, type MaybeNotKnown, type MessageOrCCLogEntry, type SupervisionResult, type WithAddress } from "@zwave-js/core/safe";
 import { Bytes } from "@zwave-js/shared/safe";
 import { CCAPI, POLL_VALUE, type PollValueImplementation, SET_VALUE, type SetValueImplementation } from "../lib/API.js";
 import { type CCRaw, CommandClass, type InterviewContext, type PersistValuesContext, type RefreshValuesContext } from "../lib/CommandClass.js";
 import { IndicatorCommand, type IndicatorTimeout } from "../lib/_Types.js";
 export declare const IndicatorCCValues: Readonly<{
-    indicatorDescription: ((indicatorId: number) => {
-        readonly meta: {
-            readonly type: "any";
-            readonly readable: true;
-            readonly writeable: true;
-        };
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: number;
+    supportedIndicatorIds: {
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: "supportedIndicatorIds";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: number;
+            readonly property: "supportedIndicatorIds";
         };
-    }) & {
         is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
-        readonly options: {
-            readonly stateful: true;
+        readonly meta: Readonly<{
+            readonly type: "any";
+            readonly readable: true;
+            readonly writeable: true;
+        }>;
+        options: {
+            readonly internal: true;
+            readonly minVersion: 1;
             readonly secret: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly internal: true;
-            readonly minVersion: 4;
         };
     };
-    valueV2: ((indicatorId: number, propertyId: number) => {
+    valueV1: {
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: "value";
+        };
+        endpoint: (endpoint?: number) => {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly endpoint: number;
+            readonly property: "value";
+        };
+        is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
         readonly meta: {
+            readonly label: "Indicator value";
             readonly ccSpecific: {
-                indicatorId: number;
-                propertyId: number;
+                readonly indicatorId: 0;
             };
-            readonly type: "any";
+            readonly min: 0;
+            readonly max: 255;
+            readonly type: "number";
             readonly readable: true;
             readonly writeable: true;
         };
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: number;
-            propertyKey: number;
-        };
-        readonly endpoint: (endpoint?: number | undefined) => {
-            readonly commandClass: CommandClasses.Indicator;
-            readonly endpoint: number;
-            readonly property: number;
-            readonly propertyKey: number;
-        };
-    }) & {
-        is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
-        readonly options: {
-            readonly stateful: true;
-            readonly secret: false;
+        options: {
             readonly internal: false;
+            readonly minVersion: 1;
+            readonly secret: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly minVersion: 2;
         };
     };
-    supportedPropertyIDs: ((indicatorId: number) => {
-        readonly meta: {
-            readonly type: "any";
-            readonly readable: true;
-            readonly writeable: true;
-        };
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: "supportedPropertyIDs";
-            propertyKey: number;
+    identify: {
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: "identify";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: "supportedPropertyIDs";
-            readonly propertyKey: number;
+            readonly property: "identify";
         };
-    }) & {
         is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
-        readonly options: {
-            readonly stateful: true;
+        readonly meta: {
+            readonly label: "Identify";
+            readonly states: {
+                readonly true: "Identify";
+            };
+            readonly readable: false;
+            readonly type: "boolean";
+            readonly writeable: true;
+        };
+        options: {
+            readonly internal: false;
+            readonly minVersion: 3;
             readonly secret: false;
-            readonly minVersion: 1;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly internal: true;
         };
     };
     timeout: {
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: "timeout";
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: "timeout";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
             readonly property: "timeout";
         };
-        readonly is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
+        is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
         readonly meta: {
             readonly label: "Timeout";
             readonly type: "string";
             readonly readable: true;
             readonly writeable: true;
         };
-        readonly options: {
-            readonly stateful: true;
-            readonly secret: false;
+        options: {
             readonly internal: false;
+            readonly minVersion: 3;
+            readonly secret: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly minVersion: 3;
         };
     };
-    identify: {
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: "identify";
+    supportedPropertyIDs: ((indicatorId: number) => {
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: "supportedPropertyIDs";
+            readonly propertyKey: number;
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: "identify";
+            readonly property: "supportedPropertyIDs";
+            readonly propertyKey: number;
         };
-        readonly is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
-        readonly meta: {
-            readonly label: "Identify";
-            readonly states: {
-                readonly true: "Identify";
-            };
-            readonly readable: false;
-            readonly type: "boolean";
+        readonly meta: Readonly<{
+            readonly type: "any";
+            readonly readable: true;
             readonly writeable: true;
-        };
-        readonly options: {
-            readonly stateful: true;
+        }>;
+    }) & {
+        is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
+        options: {
+            readonly internal: true;
+            readonly minVersion: 1;
             readonly secret: false;
-            readonly internal: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly minVersion: 3;
         };
     };
-    valueV1: {
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: "value";
+    valueV2: ((indicatorId: number, propertyId: number) => {
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: number;
+            readonly propertyKey: number;
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: "value";
+            readonly property: number;
+            readonly propertyKey: number;
         };
-        readonly is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
         readonly meta: {
-            readonly label: "Indicator value";
             readonly ccSpecific: {
-                readonly indicatorId: 0;
+                readonly indicatorId: number;
+                readonly propertyId: number;
             };
-            readonly min: 0;
-            readonly max: 255;
-            readonly type: "number";
+            readonly type: "any";
             readonly readable: true;
             readonly writeable: true;
         };
-        readonly options: {
+    }) & {
+        is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
+        options: {
             readonly internal: false;
-            readonly minVersion: 1;
+            readonly minVersion: 2;
             readonly secret: false;
             readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
         };
     };
-    supportedIndicatorIds: {
-        readonly id: {
-            commandClass: CommandClasses.Indicator;
-            property: "supportedIndicatorIds";
+    indicatorDescription: ((indicatorId: number) => {
+        id: {
+            readonly commandClass: CommandClasses.Indicator;
+            readonly property: number;
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: "supportedIndicatorIds";
+            readonly property: number;
         };
-        readonly is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
-        readonly meta: {
+        readonly meta: Readonly<{
             readonly type: "any";
             readonly readable: true;
             readonly writeable: true;
-        };
-        readonly options: {
-            readonly stateful: true;
+        }>;
+    }) & {
+        is: (valueId: import("@zwave-js/core/safe").ValueID) => boolean;
+        options: {
+            readonly internal: true;
+            readonly minVersion: 4;
             readonly secret: false;
-            readonly minVersion: 1;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly internal: true;
         };
     };
 }>;
@@ -259,7 +259,7 @@ export declare class IndicatorCCSet extends IndicatorCC {
     static from(raw: CCRaw, ctx: CCParsingContext): IndicatorCCSet;
     indicator0Value: number | undefined;
     values: IndicatorObject[] | undefined;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export type IndicatorCCReportOptions = {
@@ -274,7 +274,7 @@ export declare class IndicatorCCReport extends IndicatorCC {
     readonly indicator0Value: number | undefined;
     readonly values: IndicatorObject[] | undefined;
     private setIndicatorValue;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface IndicatorCCGetOptions {
@@ -284,7 +284,7 @@ export declare class IndicatorCCGet extends IndicatorCC {
     constructor(options: WithAddress<IndicatorCCGetOptions>);
     static from(raw: CCRaw, ctx: CCParsingContext): IndicatorCCGet;
     indicatorId: number | undefined;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface IndicatorCCSupportedReportOptions {
@@ -299,7 +299,7 @@ export declare class IndicatorCCSupportedReport extends IndicatorCC {
     readonly indicatorId: number;
     readonly nextIndicatorId: number;
     readonly supportedProperties: readonly number[];
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface IndicatorCCSupportedGetOptions {
@@ -309,7 +309,7 @@ export declare class IndicatorCCSupportedGet extends IndicatorCC {
     constructor(options: WithAddress<IndicatorCCSupportedGetOptions>);
     static from(raw: CCRaw, ctx: CCParsingContext): IndicatorCCSupportedGet;
     indicatorId: number;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface IndicatorCCDescriptionReportOptions {
@@ -322,7 +322,7 @@ export declare class IndicatorCCDescriptionReport extends IndicatorCC {
     indicatorId: number;
     description: string;
     persistValues(ctx: PersistValuesContext): boolean;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface IndicatorCCDescriptionGetOptions {
@@ -332,7 +332,7 @@ export declare class IndicatorCCDescriptionGet extends IndicatorCC {
     constructor(options: WithAddress<IndicatorCCDescriptionGetOptions>);
     static from(raw: CCRaw, ctx: CCParsingContext): IndicatorCCDescriptionGet;
     indicatorId: number;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 //# sourceMappingURL=IndicatorCC.d.ts.map

package/build/cjs/cc/IndicatorCC.js

@@ -38,7 +38,7 @@ __export(IndicatorCC_exports, {
   IndicatorCCSet: () => IndicatorCCSet,
   IndicatorCCSupportedGet: () => IndicatorCCSupportedGet,
   IndicatorCCSupportedReport: () => IndicatorCCSupportedReport,
-  IndicatorCCValues: () => IndicatorCCValues
+  IndicatorCCValues: () => import_CCValues_generated.IndicatorCCValues
 });
 module.exports = __toCommonJS(IndicatorCC_exports);
 var __validateArgs = __toESM(require("./IndicatorCC._validateArgs.js"), 1);
@@ -52,6 +52,7 @@ var import_CommandClass = require("../lib/CommandClass.js");
 var import_CommandClassDecorators = require("../lib/CommandClassDecorators.js");
 var import_Values = require("../lib/Values.js");
 var import_Types = require("../lib/_Types.js");
+var import_CCValues_generated = require("./_CCValues.generated.js");
 var __runInitializers = function(thisArg, initializers, value) {
   var useValue = arguments.length > 2;
   for (var i = 0; i < initializers.length; i++) {
@@ -134,57 +135,10 @@ function indicatorObjectsToTimeout(values) {
   };
 }
 __name(indicatorObjectsToTimeout, "indicatorObjectsToTimeout");
-const IndicatorCCValues = Object.freeze({
-  ...import_Values.V.defineStaticCCValues(import_safe.CommandClasses.Indicator, {
-    ...import_Values.V.staticProperty("supportedIndicatorIds", void 0, {
-      internal: true
-    }),
-    ...import_Values.V.staticPropertyWithName("valueV1", "value", {
-      ...import_safe.ValueMetadata.UInt8,
-      label: "Indicator value",
-      ccSpecific: {
-        indicatorId: 0
-      }
-    }),
-    // Convenience values for indicators that are split across multiple properties
-    ...import_Values.V.staticProperty("identify", {
-      ...import_safe.ValueMetadata.WriteOnlyBoolean,
-      label: "Identify",
-      states: {
-        true: "Identify"
-      }
-    }, { minVersion: 3 }),
-    ...import_Values.V.staticProperty("timeout", {
-      ...import_safe.ValueMetadata.String,
-      label: "Timeout"
-    }, { minVersion: 3 })
-  }),
-  ...import_Values.V.defineDynamicCCValues(import_safe.CommandClasses.Indicator, {
-    ...import_Values.V.dynamicPropertyAndKeyWithName("supportedPropertyIDs", "supportedPropertyIDs", (indicatorId) => indicatorId, ({ property, propertyKey }) => property === "supportedPropertyIDs" && typeof propertyKey === "number", void 0, { internal: true }),
-    ...import_Values.V.dynamicPropertyAndKeyWithName(
-      "valueV2",
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      (indicatorId, propertyId) => indicatorId,
-      (indicatorId, propertyId) => propertyId,
-      ({ property, propertyKey }) => typeof property === "number" && typeof propertyKey === "number",
-      // The metadata is highly dependent on the indicator and property
-      // so this is just a baseline
-      (indicatorId, propertyId) => ({
-        ...import_safe.ValueMetadata.Any,
-        ccSpecific: {
-          indicatorId,
-          propertyId
-        }
-      }),
-      { minVersion: 2 }
-    ),
-    ...import_Values.V.dynamicPropertyWithName("indicatorDescription", (indicatorId) => indicatorId, ({ property }) => typeof property === "number", void 0, { internal: true, minVersion: 4 })
-  })
-});
 function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
   const label = overrideIndicatorLabel || getIndicatorName(indicatorId);
   const prop = (0, import_safe.getIndicatorProperty)(propertyId);
-  const baseMetadata = IndicatorCCValues.valueV2(indicatorId, propertyId).meta;
+  const baseMetadata = import_CCValues_generated.IndicatorCCValues.valueV2(indicatorId, propertyId).meta;
   if (!label && !prop) {
     return {
       ...baseMetadata,
@@ -541,7 +495,7 @@ let IndicatorCCAPI = (() => {
   return IndicatorCCAPI2 = _classThis;
 })();
 let IndicatorCC = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses.Indicator), (0, import_CommandClassDecorators.implementedVersion)(4), (0, import_CommandClassDecorators.ccValues)(IndicatorCCValues)];
+  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses.Indicator), (0, import_CommandClassDecorators.implementedVersion)(4), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.IndicatorCCValues)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -592,7 +546,7 @@ let IndicatorCC = (() => {
           supportedIndicatorIds.push(supportedResponse.indicatorId ?? curId);
           curId = supportedResponse.nextIndicatorId;
         } while (curId !== 0);
-        this.setValue(ctx, IndicatorCCValues.supportedIndicatorIds, supportedIndicatorIds);
+        this.setValue(ctx, import_CCValues_generated.IndicatorCCValues.supportedIndicatorIds, supportedIndicatorIds);
         const logMessage = `supported indicator IDs: ${supportedIndicatorIds.join(", ")}`;
         ctx.logNode(node.id, {
           endpoint: this.endpointIndex,
@@ -630,7 +584,7 @@ let IndicatorCC = (() => {
         });
         await api.get();
       } else {
-        const supportedIndicatorIds = this.getValue(ctx, IndicatorCCValues.supportedIndicatorIds) ?? [];
+        const supportedIndicatorIds = this.getValue(ctx, import_CCValues_generated.IndicatorCCValues.supportedIndicatorIds) ?? [];
         for (const indicatorId of supportedIndicatorIds) {
           ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
@@ -659,13 +613,13 @@ let IndicatorCC = (() => {
       return super.translateProperty(ctx, property, propertyKey);
     }
     supportsV2Indicators(ctx) {
-      const supportedIndicatorIds = this.getValue(ctx, IndicatorCCValues.supportedIndicatorIds);
+      const supportedIndicatorIds = this.getValue(ctx, import_CCValues_generated.IndicatorCCValues.supportedIndicatorIds);
       if (!supportedIndicatorIds?.length)
         return false;
-      return supportedIndicatorIds.some((indicatorId) => !!this.getValue(ctx, IndicatorCCValues.supportedPropertyIDs(indicatorId))?.length);
+      return supportedIndicatorIds.some((indicatorId) => !!this.getValue(ctx, import_CCValues_generated.IndicatorCCValues.supportedPropertyIDs(indicatorId))?.length);
     }
     static getSupportedPropertyIDsCached(ctx, endpoint, indicatorId) {
-      return ctx.getValueDB(endpoint.nodeId).getValue(IndicatorCCValues.supportedPropertyIDs(indicatorId).endpoint(endpoint.index));
+      return ctx.getValueDB(endpoint.nodeId).getValue(import_CCValues_generated.IndicatorCCValues.supportedPropertyIDs(indicatorId).endpoint(endpoint.index));
     }
   };
   return IndicatorCC2 = _classThis;
@@ -824,7 +778,7 @@ let IndicatorCCReport = (() => {
         return false;
       if (this.indicator0Value != void 0) {
         if (!this.supportsV2Indicators(ctx)) {
-          const valueV1 = IndicatorCCValues.valueV1;
+          const valueV1 = import_CCValues_generated.IndicatorCCValues.valueV1;
           this.setMetadata(ctx, valueV1);
           this.setValue(ctx, valueV1, this.indicator0Value);
         } else {
@@ -849,7 +803,7 @@ let IndicatorCCReport = (() => {
             timeoutString += `${timeout.minutes}m`;
           if (timeout?.seconds)
             timeoutString += `${timeout.seconds}s`;
-          this.setValue(ctx, IndicatorCCValues.timeout, timeoutString);
+          this.setValue(ctx, import_CCValues_generated.IndicatorCCValues.timeout, timeoutString);
         }
       }
       return true;
@@ -857,12 +811,12 @@ let IndicatorCCReport = (() => {
     indicator0Value;
     values;
     setIndicatorValue(ctx, value) {
-      const overrideIndicatorLabel = isManufacturerDefinedIndicator(value.indicatorId) ? this.getValue(ctx, IndicatorCCValues.indicatorDescription(value.indicatorId)) : void 0;
+      const overrideIndicatorLabel = isManufacturerDefinedIndicator(value.indicatorId) ? this.getValue(ctx, import_CCValues_generated.IndicatorCCValues.indicatorDescription(value.indicatorId)) : void 0;
       const metadata = getIndicatorMetadata(value.indicatorId, value.propertyId, overrideIndicatorLabel);
       if (metadata.type === "boolean") {
         value.value = !!value.value;
       }
-      const valueV2 = IndicatorCCValues.valueV2(value.indicatorId, value.propertyId);
+      const valueV2 = import_CCValues_generated.IndicatorCCValues.valueV2(value.indicatorId, value.propertyId);
       this.setMetadata(ctx, valueV2, metadata);
       this.setValue(ctx, valueV2, value.value);
     }
@@ -1003,7 +957,7 @@ let IndicatorCCSupportedReport = (() => {
       if (!super.persistValues(ctx))
         return false;
       if (this.indicatorId !== 0) {
-        this.setValue(ctx, IndicatorCCValues.supportedPropertyIDs(this.indicatorId), this.supportedProperties);
+        this.setValue(ctx, import_CCValues_generated.IndicatorCCValues.supportedPropertyIDs(this.indicatorId), this.supportedProperties);
       }
       return true;
     }
@@ -1130,7 +1084,7 @@ let IndicatorCCDescriptionReport = (() => {
       if (!super.persistValues(ctx))
         return false;
       if (this.description) {
-        this.setValue(ctx, IndicatorCCValues.indicatorDescription(this.indicatorId), this.description);
+        this.setValue(ctx, import_CCValues_generated.IndicatorCCValues.indicatorDescription(this.indicatorId), this.description);
       }
       return true;
     }