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

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

@@ -1,38 +1,31 @@
-import { type MaybeUnknown, type WithAddress } from "@zwave-js/core";
+import { type CCEncodingContext, type CCParsingContext } from "@zwave-js/cc";
+import { type GetDeviceConfig } from "@zwave-js/config";
+import { type GetNode, type GetSupportedCCVersion, type GetValueDB, type MaybeUnknown, type WithAddress } from "@zwave-js/core";
 import { CommandClasses, type ControlsCC, type EndpointId, type GetEndpoint, type MaybeNotKnown, type MessageOrCCLogEntry, type NodeId, type SinglecastCC, type SupervisionResult, type SupportsCC } from "@zwave-js/core/safe";
-import type { CCEncodingContext, CCParsingContext, GetDeviceConfig, GetNode, GetSupportedCCVersion, GetValueDB } from "@zwave-js/host/safe";
 import { Bytes } from "@zwave-js/shared/safe";
 import { type AllOrNone } from "@zwave-js/shared/safe";
 import { POLL_VALUE, PhysicalCCAPI, type PollValueImplementation, SET_VALUE, SET_VALUE_HOOKS, type SetValueImplementation, type SetValueImplementationHooksFactory } from "../lib/API.js";
 import { type CCRaw, CommandClass, type InterviewContext, type PersistValuesContext, type RefreshValuesContext } from "../lib/CommandClass.js";
 import { MeterCommand, type MeterReading, RateType } from "../lib/_Types.js";
 export declare const MeterCCValues: Readonly<{
-    value: ((meterType: number, rateType: RateType, scale: number) => {
-        readonly meta: {
-            readonly ccSpecific: {
-                readonly meterType: number;
-                readonly rateType: RateType;
-                readonly scale: number;
-            };
-            readonly writeable: false;
-            readonly type: "number";
-            readonly readable: true;
-        };
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "value";
-            propertyKey: number;
+    type: {
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "type";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
-            readonly property: "value";
-            readonly propertyKey: number;
+            readonly property: "type";
         };
-    }) & {
         is: (valueId: import("@zwave-js/core").ValueID) => boolean;
-        readonly options: {
-            readonly internal: false;
+        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;
@@ -40,36 +33,24 @@ export declare const MeterCCValues: Readonly<{
             readonly autoCreate: true;
         };
     };
-    resetSingle: ((meterType: number, rateType: RateType, scale: number) => {
-        readonly meta: {
-            readonly label: `Reset (${string})` | `Reset (Consumption, ${string})` | `Reset (Production, ${string})`;
-            readonly states: {
-                readonly true: "Reset";
-            };
-            readonly ccSpecific: {
-                readonly meterType: number;
-                readonly rateType: RateType;
-                readonly scale: number;
-            };
-            readonly readable: false;
-            readonly type: "boolean";
-            readonly writeable: true;
-        };
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "reset";
-            propertyKey: number;
+    supportsReset: {
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "supportsReset";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
-            readonly property: "reset";
-            readonly propertyKey: number;
+            readonly property: "supportsReset";
         };
-    }) & {
         is: (valueId: import("@zwave-js/core").ValueID) => boolean;
-        readonly options: {
-            readonly internal: false;
+        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;
@@ -77,28 +58,24 @@ export declare const MeterCCValues: Readonly<{
             readonly autoCreate: true;
         };
     };
-    resetAll: {
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "reset";
+    supportedScales: {
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "supportedScales";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
-            readonly property: "reset";
+            readonly property: "supportedScales";
         };
-        readonly is: (valueId: import("@zwave-js/core").ValueID) => boolean;
-        readonly meta: {
-            readonly label: "Reset accumulated values";
-            readonly states: {
-                readonly true: "Reset";
-            };
-            readonly readable: false;
-            readonly type: "boolean";
+        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        readonly meta: Readonly<{
+            readonly type: "any";
+            readonly readable: true;
             readonly writeable: true;
-        };
-        readonly options: {
-            readonly internal: false;
+        }>;
+        options: {
+            readonly internal: true;
             readonly minVersion: 1;
             readonly secret: false;
             readonly stateful: true;
@@ -107,103 +84,127 @@ export declare const MeterCCValues: Readonly<{
         };
     };
     supportedRateTypes: {
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "supportedRateTypes";
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "supportedRateTypes";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
             readonly property: "supportedRateTypes";
         };
-        readonly is: (valueId: import("@zwave-js/core").ValueID) => boolean;
-        readonly meta: {
+        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        readonly meta: Readonly<{
             readonly type: "any";
             readonly readable: true;
             readonly writeable: true;
-        };
-        readonly options: {
-            readonly stateful: true;
-            readonly secret: false;
+        }>;
+        options: {
+            readonly internal: true;
             readonly minVersion: 1;
+            readonly secret: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly internal: true;
         };
     };
-    supportedScales: {
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "supportedScales";
+    resetAll: {
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "reset";
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
-            readonly property: "supportedScales";
+            readonly property: "reset";
         };
-        readonly is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
         readonly meta: {
-            readonly type: "any";
-            readonly readable: true;
+            readonly label: "Reset accumulated values";
+            readonly states: {
+                readonly true: "Reset";
+            };
+            readonly readable: false;
+            readonly type: "boolean";
             readonly writeable: true;
         };
-        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 internal: true;
         };
     };
-    supportsReset: {
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "supportsReset";
+    resetSingle: ((meterType: number, rateType: RateType, scale: number) => {
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "reset";
+            readonly propertyKey: number;
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
-            readonly property: "supportsReset";
+            readonly property: "reset";
+            readonly propertyKey: number;
         };
-        readonly is: (valueId: import("@zwave-js/core").ValueID) => boolean;
         readonly meta: {
-            readonly type: "any";
-            readonly readable: true;
+            readonly label: `Reset (Consumption, ${string})` | `Reset (Production, ${string})` | `Reset (${string})`;
+            readonly states: {
+                readonly true: "Reset";
+            };
+            readonly ccSpecific: {
+                readonly meterType: number;
+                readonly rateType: RateType;
+                readonly scale: number;
+            };
+            readonly readable: false;
+            readonly type: "boolean";
             readonly writeable: true;
         };
-        readonly options: {
-            readonly stateful: true;
-            readonly secret: false;
+    }) & {
+        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        options: {
+            readonly internal: false;
             readonly minVersion: 1;
+            readonly secret: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly internal: true;
         };
     };
-    type: {
-        readonly id: {
-            commandClass: CommandClasses.Meter;
-            property: "type";
+    value: ((meterType: number, rateType: RateType, scale: number) => {
+        id: {
+            readonly commandClass: CommandClasses.Meter;
+            readonly property: "value";
+            readonly propertyKey: number;
         };
-        readonly endpoint: (endpoint?: number | undefined) => {
+        endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Meter;
             readonly endpoint: number;
-            readonly property: "type";
+            readonly property: "value";
+            readonly propertyKey: number;
         };
-        readonly is: (valueId: import("@zwave-js/core").ValueID) => boolean;
         readonly meta: {
-            readonly type: "any";
+            readonly ccSpecific: {
+                readonly meterType: number;
+                readonly rateType: RateType;
+                readonly scale: number;
+            };
+            readonly writeable: false;
+            readonly type: "number";
             readonly readable: true;
-            readonly writeable: true;
         };
-        readonly options: {
-            readonly stateful: true;
-            readonly secret: false;
+    }) & {
+        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        options: {
+            readonly internal: false;
             readonly minVersion: 1;
+            readonly secret: false;
+            readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
-            readonly internal: true;
         };
     };
 }>;
@@ -265,7 +266,7 @@ export declare class MeterCCReport extends MeterCC {
     previousValue: MaybeNotKnown<number>;
     rateType: RateType;
     deltaTime: MaybeUnknown<number>;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface MeterCCGetOptions {
@@ -277,7 +278,7 @@ export declare class MeterCCGet extends MeterCC {
     static from(raw: CCRaw, ctx: CCParsingContext): MeterCCGet;
     rateType: RateType | undefined;
     scale: number | undefined;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export interface MeterCCSupportedReportOptions {
@@ -294,7 +295,7 @@ export declare class MeterCCSupportedReport extends MeterCC {
     readonly supportedScales: readonly number[];
     readonly supportedRateTypes: readonly RateType[];
     persistValues(ctx: PersistValuesContext): boolean;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 export declare class MeterCCSupportedGet extends MeterCC {
@@ -312,7 +313,7 @@ export declare class MeterCCReset extends MeterCC {
     scale: number | undefined;
     rateType: RateType | undefined;
     targetValue: number | undefined;
-    serialize(ctx: CCEncodingContext): Bytes;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry;
 }
 //# sourceMappingURL=MeterCC.d.ts.map

package/build/cjs/cc/MeterCC.js

@@ -36,7 +36,7 @@ __export(MeterCC_exports, {
   MeterCCReset: () => MeterCCReset,
   MeterCCSupportedGet: () => MeterCCSupportedGet,
   MeterCCSupportedReport: () => MeterCCSupportedReport,
-  MeterCCValues: () => MeterCCValues,
+  MeterCCValues: () => import_CCValues_generated.MeterCCValues,
   isAccumulatedValue: () => isAccumulatedValue
 });
 module.exports = __toCommonJS(MeterCC_exports);
@@ -46,10 +46,12 @@ var import_safe = require("@zwave-js/core/safe");
 var import_safe2 = require("@zwave-js/shared/safe");
 var import_safe3 = require("@zwave-js/shared/safe");
 var import_API = require("../lib/API.js");
+var import_CCValueUtils = require("../lib/CCValueUtils.js");
 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++) {
@@ -91,52 +93,6 @@ var __esDecorate = function(ctor, descriptorIn, decorators, contextIn, initializ
   done = true;
 };
 const { validateArgs_MeterCCAPI_get, validateArgs_MeterCCAPI_sendReport, validateArgs_MeterCCAPI_getAll, validateArgs_MeterCCAPI_sendSupportedReport, validateArgs_MeterCCAPI_reset } = __validateArgs;
-const MeterCCValues = Object.freeze({
-  ...import_Values.V.defineStaticCCValues(import_safe.CommandClasses.Meter, {
-    ...import_Values.V.staticProperty("type", void 0, { internal: true }),
-    ...import_Values.V.staticProperty("supportsReset", void 0, { internal: true }),
-    ...import_Values.V.staticProperty("supportedScales", void 0, { internal: true }),
-    ...import_Values.V.staticProperty("supportedRateTypes", void 0, {
-      internal: true
-    }),
-    ...import_Values.V.staticPropertyWithName("resetAll", "reset", {
-      ...import_safe.ValueMetadata.WriteOnlyBoolean,
-      label: `Reset accumulated values`,
-      states: {
-        true: "Reset"
-      }
-    })
-  }),
-  ...import_Values.V.defineDynamicCCValues(import_safe.CommandClasses.Meter, {
-    ...import_Values.V.dynamicPropertyAndKeyWithName("resetSingle", "reset", toPropertyKey, ({ property, propertyKey }) => property === "reset" && typeof propertyKey === "number", (meterType, rateType, scale) => ({
-      ...import_safe.ValueMetadata.WriteOnlyBoolean,
-      // This is only a placeholder label. A config manager is needed to
-      // determine the actual label.
-      label: `Reset (${rateType === import_Types.RateType.Consumed ? "Consumption, " : rateType === import_Types.RateType.Produced ? "Production, " : ""}${(0, import_safe3.num2hex)(scale)})`,
-      states: {
-        true: "Reset"
-      },
-      ccSpecific: {
-        meterType,
-        rateType,
-        scale
-      }
-    })),
-    ...import_Values.V.dynamicPropertyAndKeyWithName("value", "value", toPropertyKey, ({ property, propertyKey }) => property === "value" && typeof propertyKey === "number", (meterType, rateType, scale) => ({
-      ...import_safe.ValueMetadata.ReadOnlyNumber,
-      // Label and unit can only be determined with a config manager
-      ccSpecific: {
-        meterType,
-        rateType,
-        scale
-      }
-    }))
-  })
-});
-function toPropertyKey(meterType, rateType, scale) {
-  return meterType << 16 | scale << 8 | rateType;
-}
-__name(toPropertyKey, "toPropertyKey");
 function splitPropertyKey(key) {
   return {
     rateType: key & 255,
@@ -341,9 +297,9 @@ let MeterCCAPI = (() => {
     async getAll(accumulatedOnly = false) {
       const valueDB = this.tryGetValueDB();
       if (this.version >= 2) {
-        const meterType = valueDB?.getValue(MeterCCValues.type.endpoint(this.endpoint.index));
-        const supportedScales = valueDB?.getValue(MeterCCValues.supportedScales.endpoint(this.endpoint.index)) ?? [];
-        const supportedRateTypes = valueDB?.getValue(MeterCCValues.supportedRateTypes.endpoint(this.endpoint.index)) ?? [];
+        const meterType = valueDB?.getValue(import_CCValues_generated.MeterCCValues.type.endpoint(this.endpoint.index));
+        const supportedScales = valueDB?.getValue(import_CCValues_generated.MeterCCValues.supportedScales.endpoint(this.endpoint.index)) ?? [];
+        const supportedRateTypes = valueDB?.getValue(import_CCValues_generated.MeterCCValues.supportedRateTypes.endpoint(this.endpoint.index)) ?? [];
         const rateTypes = supportedRateTypes.length ? supportedRateTypes : [void 0];
         const ret = [];
         for (const rateType of rateTypes) {
@@ -428,7 +384,7 @@ let MeterCCAPI = (() => {
         return;
       if (typeof propertyKey === "number") {
         const { meterType, rateType, scale } = splitPropertyKey(propertyKey);
-        const readingValueId = MeterCCValues.value(meterType, rateType, scale).endpoint(this.endpoint.index);
+        const readingValueId = import_CCValues_generated.MeterCCValues.value(meterType, rateType, scale).endpoint(this.endpoint.index);
         return {
           optimisticallyUpdateRelatedValues: /* @__PURE__ */ __name((supervisedAndSuccessful) => {
             if (!supervisedAndSuccessful)
@@ -453,7 +409,7 @@ let MeterCCAPI = (() => {
         const valueDB = this.tryGetValueDB();
         if (!valueDB)
           return;
-        const accumulatedValues = valueDB.findValues((vid) => vid.commandClass === this.ccId && vid.endpoint === this.endpoint.index && MeterCCValues.value.is(vid)).filter(({ propertyKey: propertyKey2 }) => {
+        const accumulatedValues = valueDB.findValues((vid) => vid.commandClass === this.ccId && vid.endpoint === this.endpoint.index && import_CCValues_generated.MeterCCValues.value.is(vid)).filter(({ propertyKey: propertyKey2 }) => {
           if (typeof propertyKey2 !== "number")
             return false;
           const { meterType, scale } = splitPropertyKey(propertyKey2);
@@ -479,7 +435,7 @@ let MeterCCAPI = (() => {
   return MeterCCAPI2 = _classThis;
 })();
 let MeterCC = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses.Meter), (0, import_CommandClassDecorators.implementedVersion)(6), (0, import_CommandClassDecorators.ccValues)(MeterCCValues)];
+  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses.Meter), (0, import_CommandClassDecorators.implementedVersion)(6), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.MeterCCValues)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -555,9 +511,9 @@ supports reset:       ${suppResp.supportsReset}`;
         });
         await api.get();
       } else {
-        const type = this.getValue(ctx, MeterCCValues.type) ?? 0;
-        const supportedScales = this.getValue(ctx, MeterCCValues.supportedScales) ?? [];
-        const supportedRateTypes = this.getValue(ctx, MeterCCValues.supportedRateTypes) ?? [];
+        const type = this.getValue(ctx, import_CCValues_generated.MeterCCValues.type) ?? 0;
+        const supportedScales = this.getValue(ctx, import_CCValues_generated.MeterCCValues.supportedScales) ?? [];
+        const supportedRateTypes = this.getValue(ctx, import_CCValues_generated.MeterCCValues.supportedRateTypes) ?? [];
         const rateTypes = supportedRateTypes.length ? supportedRateTypes : [void 0];
         for (const rateType of rateTypes) {
           for (const scale of supportedScales) {
@@ -575,7 +531,7 @@ supports reset:       ${suppResp.supportsReset}`;
       const valueDB = ctx.tryGetValueDB(this.nodeId);
       if (!valueDB)
         return true;
-      const values = this.getDefinedValueIDs(ctx).filter((v) => MeterCCValues.value.is(v));
+      const values = this.getDefinedValueIDs(ctx).filter((v) => import_CCValues_generated.MeterCCValues.value.is(v));
       return values.every((v) => {
         const lastUpdated = valueDB.getTimestamp(v);
         return lastUpdated == void 0 || Date.now() - lastUpdated > import_core.timespan.hours(6);
@@ -586,28 +542,28 @@ supports reset:       ${suppResp.supportsReset}`;
      * This only works AFTER the interview process
      */
     static getMeterTypeCached(ctx, endpoint) {
-      return ctx.getValueDB(endpoint.nodeId).getValue(MeterCCValues.type.endpoint(endpoint.index));
+      return ctx.getValueDB(endpoint.nodeId).getValue(import_CCValues_generated.MeterCCValues.type.endpoint(endpoint.index));
     }
     /**
      * Returns which scales are supported by this meter.
      * This only works AFTER the interview process
      */
     static getSupportedScalesCached(ctx, endpoint) {
-      return ctx.getValueDB(endpoint.nodeId).getValue(MeterCCValues.supportedScales.endpoint(endpoint.index));
+      return ctx.getValueDB(endpoint.nodeId).getValue(import_CCValues_generated.MeterCCValues.supportedScales.endpoint(endpoint.index));
     }
     /**
      * Returns whether reset is supported by this meter.
      * This only works AFTER the interview process
      */
     static supportsResetCached(ctx, endpoint) {
-      return ctx.getValueDB(endpoint.nodeId).getValue(MeterCCValues.supportsReset.endpoint(endpoint.index));
+      return ctx.getValueDB(endpoint.nodeId).getValue(import_CCValues_generated.MeterCCValues.supportsReset.endpoint(endpoint.index));
     }
     /**
      * Returns which rate types are supported by this meter.
      * This only works AFTER the interview process
      */
     static getSupportedRateTypesCached(ctx, endpoint) {
-      return ctx.getValueDB(endpoint.nodeId).getValue(MeterCCValues.supportedRateTypes.endpoint(endpoint.index));
+      return ctx.getValueDB(endpoint.nodeId).getValue(import_CCValues_generated.MeterCCValues.supportedRateTypes.endpoint(endpoint.index));
     }
     translatePropertyKey(ctx, property, propertyKey) {
       if (property === "value" && typeof propertyKey === "number") {
@@ -710,21 +666,21 @@ let MeterCCReport = (() => {
         import_safe.validatePayload.withReason(`Unknown meter type ${(0, import_safe3.num2hex)(this.type)} or corrupted data`)(!!meter);
         import_safe.validatePayload.withReason(`Unknown meter scale ${(0, import_safe3.num2hex)(this.scale)} or corrupted data`)(scale.label !== (0, import_core.getUnknownMeterScale)(this.scale).label);
         if (ccVersion >= 2) {
-          const expectedType = this.getValue(ctx, MeterCCValues.type);
+          const expectedType = this.getValue(ctx, import_CCValues_generated.MeterCCValues.type);
           if (expectedType != void 0) {
             import_safe.validatePayload.withReason("Unexpected meter type or corrupted data")(this.type === expectedType);
           }
-          const supportedScales = this.getValue(ctx, MeterCCValues.supportedScales);
+          const supportedScales = this.getValue(ctx, import_CCValues_generated.MeterCCValues.supportedScales);
           if (supportedScales?.length) {
             import_safe.validatePayload.withReason(`Unsupported meter scale ${scale.label} or corrupted data`)(supportedScales.includes(this.scale));
           }
-          const supportedRateTypes = this.getValue(ctx, MeterCCValues.supportedRateTypes);
+          const supportedRateTypes = this.getValue(ctx, import_CCValues_generated.MeterCCValues.supportedRateTypes);
           if (supportedRateTypes?.length) {
             import_safe.validatePayload.withReason(`Unsupported rate type ${(0, import_safe3.getEnumMemberName)(import_Types.RateType, this.rateType)} or corrupted data`)(supportedRateTypes.includes(this.rateType));
           }
         }
       }
-      const valueValue = MeterCCValues.value(this.type, this.rateType, this.scale);
+      const valueValue = import_CCValues_generated.MeterCCValues.value(this.type, this.rateType, this.scale);
       this.setMetadata(ctx, valueValue, {
         ...valueValue.meta,
         label: getValueLabel(this.type, this.scale, this.rateType),
@@ -881,7 +837,7 @@ let MeterCCGet = (() => {
       }
       if (this.scale != void 0) {
         if (ctx) {
-          const type = this.getValue(ctx, MeterCCValues.type);
+          const type = this.getValue(ctx, import_CCValues_generated.MeterCCValues.type);
           if (type != void 0) {
             message.scale = ((0, import_core.getMeterScale)(type, this.scale) ?? (0, import_core.getUnknownMeterScale)(this.scale)).label;
           }
@@ -898,7 +854,7 @@ let MeterCCGet = (() => {
   return MeterCCGet2 = _classThis;
 })();
 let MeterCCSupportedReport = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.MeterCommand.SupportedReport), (0, import_CommandClassDecorators.ccValueProperty)("type", MeterCCValues.type), (0, import_CommandClassDecorators.ccValueProperty)("supportsReset", MeterCCValues.supportsReset), (0, import_CommandClassDecorators.ccValueProperty)("supportedScales", MeterCCValues.supportedScales), (0, import_CommandClassDecorators.ccValueProperty)("supportedRateTypes", MeterCCValues.supportedRateTypes)];
+  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.MeterCommand.SupportedReport), (0, import_CommandClassDecorators.ccValueProperty)("type", import_CCValues_generated.MeterCCValues.type), (0, import_CommandClassDecorators.ccValueProperty)("supportsReset", import_CCValues_generated.MeterCCValues.supportsReset), (0, import_CommandClassDecorators.ccValueProperty)("supportedScales", import_CCValues_generated.MeterCCValues.supportedScales), (0, import_CommandClassDecorators.ccValueProperty)("supportedRateTypes", import_CCValues_generated.MeterCCValues.supportedRateTypes)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -961,13 +917,13 @@ let MeterCCSupportedReport = (() => {
         return true;
       const ccVersion = (0, import_CommandClass.getEffectiveCCVersion)(ctx, this);
       if (ccVersion < 6) {
-        this.ensureMetadata(ctx, MeterCCValues.resetAll);
+        this.ensureMetadata(ctx, import_CCValues_generated.MeterCCValues.resetAll);
       } else {
         for (const scale of this.supportedScales) {
           if (!isAccumulatedValue(this.type, scale))
             continue;
           for (const rateType of this.supportedRateTypes) {
-            const resetSingleValue = MeterCCValues.resetSingle(this.type, rateType, scale);
+            const resetSingleValue = import_CCValues_generated.MeterCCValues.resetSingle(this.type, rateType, scale);
             this.ensureMetadata(ctx, resetSingleValue, {
               ...resetSingleValue.meta,
               label: `Reset ${getValueLabel(this.type, scale, rateType)}`