@zwave-js/cc 15.21.1 → 15.22.1

package/build/cjs/cc/NotificationCC._validateArgs.d.ts

@@ -1,5 +1,5 @@
-export declare function validateArgs_NotificationCCAPI_sendReport(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext) => T | void;
-export declare function validateArgs_NotificationCCAPI_get(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext) => T | void;
-export declare function validateArgs_NotificationCCAPI_set(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext) => T | void;
-export declare function validateArgs_NotificationCCAPI_getSupportedEvents(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext) => T | void;
+export declare function validateArgs_NotificationCCAPI_sendReport(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext<unknown, (this: unknown, ...args: any) => any>) => void | T;
+export declare function validateArgs_NotificationCCAPI_get(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext<unknown, (this: unknown, ...args: any) => any>) => void | T;
+export declare function validateArgs_NotificationCCAPI_set(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext<unknown, (this: unknown, ...args: any) => any>) => void | T;
+export declare function validateArgs_NotificationCCAPI_getSupportedEvents(): <T extends Function>(__decoratedMethod: T, { kind }: ClassMethodDecoratorContext<unknown, (this: unknown, ...args: any) => any>) => void | T;
 //# sourceMappingURL=NotificationCC._validateArgs.d.ts.map

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

@@ -2,19 +2,19 @@ import type { GetDeviceConfig } from "@zwave-js/config";
 import { CommandClasses, type ControlsCC, Duration, type EndpointId, type GetEndpoint, type GetNode, type GetSupportedCCVersion, type GetValueDB, type MaybeNotKnown, type MessageOrCCLogEntry, type NodeId, type Notification, type NotificationState, type SinglecastCC, type SupervisionResult, type SupportsCC, type ValueMetadataNumeric, type WithAddress } from "@zwave-js/core";
 import { Bytes, type BytesView } from "@zwave-js/shared";
 import { POLL_VALUE, PhysicalCCAPI, type PollValueImplementation } from "../lib/API.js";
-import { CCRaw, CommandClass, type InterviewContext, type PersistValuesContext, type RefreshValuesContext } from "../lib/CommandClass.js";
+import { CCRaw, CommandClass, type InterviewContext, type PersistValuesContext, type RefreshValuesContext, type RefreshValuesOptions } from "../lib/CommandClass.js";
 import { NotificationCommand } from "../lib/_Types.js";
 import type { CCEncodingContext, CCParsingContext } from "../lib/traits.js";
 import { NotificationCCValues } from "./_CCValues.generated.js";
 export { NotificationCCValues };
-export declare function shouldAutoCreateSimpleDoorSensorValue(ctx: GetValueDB, endpoint: EndpointId): boolean;
+export declare function shouldAutoCreateSyntheticDoorSensorValue(ctx: GetValueDB, endpoint: EndpointId): boolean;
 export declare class NotificationCCAPI extends PhysicalCCAPI {
     supportsCommand(cmd: NotificationCommand): MaybeNotKnown<boolean>;
     protected get [POLL_VALUE](): PollValueImplementation;
     sendReport(options: NotificationCCReportOptions): Promise<SupervisionResult | undefined>;
-    get(options: NotificationCCGetOptions): Promise<Pick<NotificationCCReport, "alarmLevel" | "notificationEvent" | "notificationStatus" | "eventParameters" | "sequenceNumber"> | undefined>;
+    get(options: NotificationCCGetOptions): Promise<Pick<NotificationCCReport, "alarmLevel" | "eventParameters" | "notificationEvent" | "notificationStatus" | "sequenceNumber"> | undefined>;
     set(notificationType: number, notificationStatus: boolean): Promise<SupervisionResult | undefined>;
-    getSupported(): Promise<Pick<NotificationCCSupportedReport, "supportsV1Alarm" | "supportedNotificationTypes"> | undefined>;
+    getSupported(): Promise<Pick<NotificationCCSupportedReport, "supportedNotificationTypes" | "supportsV1Alarm"> | undefined>;
     getSupportedEvents(notificationType: number): Promise<MaybeNotKnown<readonly number[]>>;
 }
 export declare function getNotificationEnumBehavior(notification: Notification, valueConfig: NotificationState): "none" | "extend" | "replace";
@@ -31,8 +31,25 @@ export declare class NotificationCC extends CommandClass {
     private determineNotificationMode;
     /** Whether the node implements push or pull notifications */
     static getNotificationMode(ctx: GetValueDB, node: NodeId): MaybeNotKnown<"push" | "pull">;
+    /** Returns the supported notification events for a given notification type */
+    static getSupportedNotificationEvents(ctx: GetValueDB, node: NodeId, type: number): MaybeNotKnown<readonly number[]>;
     interview(ctx: InterviewContext): Promise<void>;
-    refreshValues(ctx: RefreshValuesContext): Promise<void>;
+    /**
+     * Applies the `alarmMapping` compat flag by adding metadata and supported notification
+     * types/events for the alarm mapping targets.
+     */
+    private applyAlarmMappingCompat;
+    /**
+     * Applies the `remapNotifications` compat flag by modifying the supported notification
+     * types/events in cache and creating metadata for remapping targets.
+     */
+    private applyNotificationRemappings;
+    /**
+     * Sets idle values for all supported notification variables that have an idle state
+     * and don't have a value yet.
+     */
+    private initNotificationIdleValues;
+    refreshValues(ctx: RefreshValuesContext, options?: RefreshValuesOptions): Promise<void>;
     shouldRefreshValues(this: SinglecastCC<this>, ctx: GetValueDB & GetSupportedCCVersion & GetDeviceConfig & GetNode<NodeId & GetEndpoint<EndpointId & SupportsCC & ControlsCC>>): boolean;
 }
 export interface NotificationCCSetOptions {

package/build/cjs/cc/NotificationCC.js

@@ -42,9 +42,10 @@ __export(NotificationCC_exports, {
   getNotificationEnumBehavior: () => getNotificationEnumBehavior,
   getNotificationStateValueWithEnum: () => getNotificationStateValueWithEnum,
   getNotificationValueMetadata: () => getNotificationValueMetadata,
-  shouldAutoCreateSimpleDoorSensorValue: () => shouldAutoCreateSimpleDoorSensorValue
+  shouldAutoCreateSyntheticDoorSensorValue: () => shouldAutoCreateSyntheticDoorSensorValue
 });
 module.exports = __toCommonJS(NotificationCC_exports);
+var import_tslib = require("tslib");
 var __validateArgs = __toESM(require("./NotificationCC._validateArgs.js"), 1);
 var import_core = require("@zwave-js/core");
 var import_shared = require("@zwave-js/shared");
@@ -58,48 +59,8 @@ var ccUtils = __toESM(require("../lib/utils.js"), 1);
 var import_ApplicationStatusCC = require("./ApplicationStatusCC.js");
 var import_AssociationGroupInfoCC = require("./AssociationGroupInfoCC.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++) {
-    value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-  }
-  return useValue ? value : void 0;
-};
-var __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;
-  }
-  __name(accept, "accept");
-  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;
-};
 const { validateArgs_NotificationCCAPI_sendReport, validateArgs_NotificationCCAPI_get, validateArgs_NotificationCCAPI_set, validateArgs_NotificationCCAPI_getSupportedEvents } = __validateArgs;
-function shouldAutoCreateSimpleDoorSensorValue(ctx, endpoint) {
+function shouldAutoCreateSyntheticDoorSensorValue(ctx, endpoint) {
   const valueDB = ctx.tryGetValueDB(endpoint.nodeId);
   if (!valueDB)
     return false;
@@ -117,7 +78,7 @@ function shouldAutoCreateSimpleDoorSensorValue(ctx, endpoint) {
     23
   );
 }
-__name(shouldAutoCreateSimpleDoorSensorValue, "shouldAutoCreateSimpleDoorSensorValue");
+__name(shouldAutoCreateSyntheticDoorSensorValue, "shouldAutoCreateSyntheticDoorSensorValue");
 let NotificationCCAPI = (() => {
   let _classDecorators = [(0, import_CommandClassDecorators.API)(import_core.CommandClasses.Notification)];
   let _classDescriptor;
@@ -142,14 +103,14 @@ let NotificationCCAPI = (() => {
       _get_decorators = [validateArgs_NotificationCCAPI_get()];
       _set_decorators = [validateArgs_NotificationCCAPI_set()];
       _getSupportedEvents_decorators = [validateArgs_NotificationCCAPI_getSupportedEvents()];
-      __esDecorate(this, null, _sendReport_decorators, { kind: "method", name: "sendReport", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "sendReport" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.sendReport, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
-      __esDecorate(this, null, _get_decorators, { kind: "method", name: "get", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "get" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.get, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
-      __esDecorate(this, null, _set_decorators, { kind: "method", name: "set", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "set" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.set, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
-      __esDecorate(this, null, _getSupportedEvents_decorators, { kind: "method", name: "getSupportedEvents", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "getSupportedEvents" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.getSupportedEvents, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
-      __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+      (0, import_tslib.__esDecorate)(this, null, _sendReport_decorators, { kind: "method", name: "sendReport", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "sendReport" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.sendReport, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
+      (0, import_tslib.__esDecorate)(this, null, _get_decorators, { kind: "method", name: "get", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "get" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.get, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
+      (0, import_tslib.__esDecorate)(this, null, _set_decorators, { kind: "method", name: "set", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "set" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.set, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
+      (0, import_tslib.__esDecorate)(this, null, _getSupportedEvents_decorators, { kind: "method", name: "getSupportedEvents", static: false, private: false, access: { has: /* @__PURE__ */ __name((obj) => "getSupportedEvents" in obj, "has"), get: /* @__PURE__ */ __name((obj) => obj.getSupportedEvents, "get") }, metadata: _metadata }, null, _instanceExtraInitializers);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCAPI2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     supportsCommand(cmd) {
       switch (cmd) {
@@ -252,7 +213,7 @@ let NotificationCCAPI = (() => {
     }
     constructor() {
       super(...arguments);
-      __runInitializers(this, _instanceExtraInitializers);
+      (0, import_tslib.__runInitializers)(this, _instanceExtraInitializers);
     }
   };
   return NotificationCCAPI2 = _classThis;
@@ -315,10 +276,10 @@ let NotificationCC = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCC2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     // former AlarmCC (v1..v2)
     determineRequiredCCInterviews() {
@@ -370,6 +331,10 @@ let NotificationCC = (() => {
     static getNotificationMode(ctx, node) {
       return ctx.getValueDB(node.id).getValue(import_CCValues_generated.NotificationCCValues.notificationMode.id);
     }
+    /** Returns the supported notification events for a given notification type */
+    static getSupportedNotificationEvents(ctx, node, type) {
+      return ctx.getValueDB(node.id).getValue(import_CCValues_generated.NotificationCCValues.supportedNotificationEvents(type).id);
+    }
     async interview(ctx) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
@@ -449,26 +414,12 @@ let NotificationCC = (() => {
           for (let i = 0; i < supportedNotificationTypes.length; i++) {
             const type = supportedNotificationTypes[i];
             const name = supportedNotificationNames[i];
-            const notification = (0, import_core.getNotification)(type);
             ctx.logNode(node.id, {
               endpoint: this.endpointIndex,
               message: `enabling notifications for ${name}...`,
               direction: "outbound"
             });
             await api.set(type, true);
-            if (notification) {
-              const events = supportedNotificationEvents.get(type);
-              if (events) {
-                for (const variable of notification.variables.filter((v) => !!v.idle)) {
-                  if ([...variable.states.keys()].some((key) => events.includes(key))) {
-                    const value = import_CCValues_generated.NotificationCCValues.notificationVariable(notification.name, variable.name);
-                    if (this.getValue(ctx, value) == void 0) {
-                      this.setValue(ctx, value, 0);
-                    }
-                  }
-                }
-              }
-            }
           }
         }
       }
@@ -476,42 +427,128 @@ let NotificationCC = (() => {
         this.ensureMetadata(ctx, import_CCValues_generated.NotificationCCValues.alarmType);
         this.ensureMetadata(ctx, import_CCValues_generated.NotificationCCValues.alarmLevel);
       }
+      this.applyAlarmMappingCompat(ctx);
+      this.applyNotificationRemappings(ctx);
+      this.initNotificationIdleValues(ctx);
+      this.setInterviewComplete(ctx, true);
+    }
+    /**
+     * Applies the `alarmMapping` compat flag by adding metadata and supported notification
+     * types/events for the alarm mapping targets.
+     */
+    applyAlarmMappingCompat(ctx) {
       const mappings = ctx.getDeviceConfig?.(this.nodeId)?.compat?.alarmMapping;
-      if (mappings) {
-        const supportedNotifications = /* @__PURE__ */ new Map();
-        for (const { to } of mappings) {
-          const notification = (0, import_core.getNotification)(to.notificationType);
-          if (!notification)
-            continue;
-          const valueConfig = (0, import_core.getNotificationValue)(notification, to.notificationEvent);
-          if (!supportedNotifications.has(to.notificationType)) {
-            supportedNotifications.set(to.notificationType, /* @__PURE__ */ new Set());
+      if (!mappings)
+        return;
+      const supportedNotifications = /* @__PURE__ */ new Map();
+      for (const { to } of mappings) {
+        const notification = (0, import_core.getNotification)(to.notificationType);
+        if (!notification)
+          continue;
+        const valueConfig = (0, import_core.getNotificationValue)(notification, to.notificationEvent);
+        if (!supportedNotifications.has(to.notificationType)) {
+          supportedNotifications.set(to.notificationType, /* @__PURE__ */ new Set());
+        }
+        const supportedNotificationTypesSet = supportedNotifications.get(to.notificationType);
+        supportedNotificationTypesSet.add(to.notificationEvent);
+        if (valueConfig?.type !== "state")
+          continue;
+        const notificationValue = import_CCValues_generated.NotificationCCValues.notificationVariable(notification.name, valueConfig.variableName);
+        const metadata = getNotificationValueMetadata(this.getMetadata(ctx, notificationValue), notification, valueConfig);
+        this.setMetadata(ctx, notificationValue, metadata);
+      }
+      this.setValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes, [...supportedNotifications.keys()]);
+      for (const [type, events] of supportedNotifications) {
+        this.setValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationEvents(type), [...events]);
+      }
+    }
+    /**
+     * Applies the `remapNotifications` compat flag by modifying the supported notification
+     * types/events in cache and creating metadata for remapping targets.
+     */
+    applyNotificationRemappings(ctx) {
+      const remappings = ctx.getDeviceConfig?.(this.nodeId)?.compat?.remapNotifications;
+      if (!remappings?.length)
+        return;
+      ctx.logNode(this.nodeId, {
+        message: `Applying notification remapping compat flag...`,
+        direction: "none",
+        level: "verbose"
+      });
+      const supportedTypes = new Set(this.getValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes) ?? []);
+      const supportedEvents = /* @__PURE__ */ new Map();
+      for (const type of supportedTypes) {
+        const events = NotificationCC2.getSupportedNotificationEvents(ctx, this.getNode(ctx), type);
+        if (events) {
+          supportedEvents.set(type, new Set(events));
+        }
+      }
+      for (const mapping of remappings) {
+        const fromEvents = supportedEvents.get(mapping.from.notificationType);
+        if (fromEvents) {
+          fromEvents.delete(mapping.from.notificationEvent);
+          if (fromEvents.size === 0) {
+            supportedEvents.delete(mapping.from.notificationType);
+            supportedTypes.delete(mapping.from.notificationType);
+          }
+        }
+        if (mapping.action.type === "remap") {
+          const to = mapping.action.to;
+          supportedTypes.add(to.notificationType);
+          if (!supportedEvents.has(to.notificationType)) {
+            supportedEvents.set(to.notificationType, /* @__PURE__ */ new Set());
           }
-          const supportedNotificationTypesSet = supportedNotifications.get(to.notificationType);
-          supportedNotificationTypesSet.add(to.notificationEvent);
+          supportedEvents.get(to.notificationType).add(to.notificationEvent);
+        }
+      }
+      this.setValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes, [...supportedTypes]);
+      for (const [type, events] of supportedEvents) {
+        this.setValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationEvents(type), [...events]);
+      }
+      for (const [type, events] of supportedEvents) {
+        const notification = (0, import_core.getNotification)(type);
+        if (!notification)
+          continue;
+        let isFirst = true;
+        for (const value of events) {
+          const valueConfig = (0, import_core.getNotificationValue)(notification, value);
           if (valueConfig?.type !== "state")
             continue;
           const notificationValue = import_CCValues_generated.NotificationCCValues.notificationVariable(notification.name, valueConfig.variableName);
-          const metadata = getNotificationValueMetadata(this.getMetadata(ctx, notificationValue), notification, valueConfig);
+          const metadata = getNotificationValueMetadata(isFirst ? void 0 : this.getMetadata(ctx, notificationValue), notification, valueConfig);
           this.setMetadata(ctx, notificationValue, metadata);
-          if (valueConfig.idle) {
-            if (this.getValue(ctx, notificationValue) == void 0) {
-              this.setValue(ctx, notificationValue, 0);
+          isFirst = false;
+        }
+      }
+    }
+    /**
+     * Sets idle values for all supported notification variables that have an idle state
+     * and don't have a value yet.
+     */
+    initNotificationIdleValues(ctx) {
+      const supportedTypes = this.getValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes) ?? [];
+      for (const type of supportedTypes) {
+        const notification = (0, import_core.getNotification)(type);
+        if (!notification)
+          continue;
+        const events = NotificationCC2.getSupportedNotificationEvents(ctx, this.getNode(ctx), type);
+        if (!events)
+          continue;
+        for (const variable of notification.variables.filter((v) => !!v.idle)) {
+          if ([...variable.states.keys()].some((key) => events.includes(key))) {
+            const value = import_CCValues_generated.NotificationCCValues.notificationVariable(notification.name, variable.name);
+            if (this.getValue(ctx, value) == void 0) {
+              this.setValue(ctx, value, 0);
             }
           }
         }
-        this.setValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes, [...supportedNotifications.keys()]);
-        for (const [type, events] of supportedNotifications) {
-          this.setValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationEvents(type), [...events]);
-        }
       }
-      this.setInterviewComplete(ctx, true);
     }
-    async refreshValues(ctx) {
+    async refreshValues(ctx, options) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
       const api = import_API.CCAPI.create(import_core.CommandClasses.Notification, ctx, endpoint).withOptions({
-        priority: import_core.MessagePriority.NodeQuery
+        priority: options?.priority ?? import_core.MessagePriority.NodeQuery
       });
       const supportedNotificationTypes = this.getValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes) ?? [];
       const supportedNotificationNames = supportedNotificationTypes.map(import_core.getNotificationName);
@@ -563,10 +600,10 @@ let NotificationCCSet = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCSet2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     constructor(options) {
       super(options);
@@ -619,10 +656,10 @@ let NotificationCCReport = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCReport2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     constructor(options) {
       super(options);
@@ -683,7 +720,7 @@ let NotificationCCReport = (() => {
         if (ccVersion >= 2) {
           const supportedNotificationTypes = this.getValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationTypes);
           if ((0, import_typeguards.isArray)(supportedNotificationTypes) && supportedNotificationTypes.includes(this.alarmType)) {
-            const supportedNotificationEvents = this.getValue(ctx, import_CCValues_generated.NotificationCCValues.supportedNotificationEvents(this.alarmType));
+            const supportedNotificationEvents = NotificationCC.getSupportedNotificationEvents(ctx, this.getNode(ctx), this.alarmType);
             if ((0, import_typeguards.isArray)(supportedNotificationEvents) && supportedNotificationEvents.includes(this.alarmLevel)) {
               ctx.logNode(this.nodeId, `treating V1 Alarm frame as Notification Report`);
               this.notificationType = this.alarmType;
@@ -949,10 +986,10 @@ let NotificationCCGet = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCGet2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     constructor(options) {
       super(options);
@@ -1032,10 +1069,10 @@ let NotificationCCSupportedReport = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCSupportedReport2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     constructor(options) {
       super(options);
@@ -1099,10 +1136,10 @@ let NotificationCCSupportedGet = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCSupportedGet2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
   };
   return NotificationCCSupportedGet2 = _classThis;
@@ -1122,10 +1159,10 @@ let NotificationCCEventSupportedReport = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCEventSupportedReport2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     constructor(options) {
       super(options);
@@ -1216,10 +1253,10 @@ let NotificationCCEventSupportedGet = (() => {
     }
     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);
+      (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
       NotificationCCEventSupportedGet2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-      __runInitializers(_classThis, _classExtraInitializers);
+      (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
     constructor(options) {
       super(options);
@@ -1264,6 +1301,6 @@ let NotificationCCEventSupportedGet = (() => {
   getNotificationEnumBehavior,
   getNotificationStateValueWithEnum,
   getNotificationValueMetadata,
-  shouldAutoCreateSimpleDoorSensorValue
+  shouldAutoCreateSyntheticDoorSensorValue
 });
 //# sourceMappingURL=NotificationCC.js.map