@awarevue/api-types 1.0.70 → 1.0.71

package/dist/alarm-automation.d.ts

@@ -49,17 +49,19 @@ export type AlarmBehavior = z.infer<typeof sAlarmBehavior>;
 export type AlarmAutomationLevel = z.infer<typeof sAlarmAutomationLevel>;
 export type AlarmAutomationMetadata = z.infer<typeof sAlarmAutomationMetadata>;
 export declare const isAlarmAutomationMetadata: (metadata: unknown) => metadata is AlarmAutomationMetadata;
-export declare const formatByDeviceAutomationCode: (deviceId: string) => string;
-export declare const formatByTypeAutomationCode: (eventKind: DeviceEvent["kind"]) => string;
+export declare const formatByDeviceAutomationCode: (eventKind: DeviceEvent["kind"], deviceId: string) => string;
+export declare const formatByTypeAutomationCode: (eventKind: DeviceEvent["kind"], deviceType: DeviceType) => string;
 export declare const isByDeviceAutomationCode: (code: string) => boolean;
 export declare const isByTypeAutomationCode: (code: string) => boolean;
 export type ParsedByDeviceAutomationCode = {
     type: 'by-device';
     value: string;
+    eventKind: DeviceEvent['kind'];
 };
 export type ParsedByTypeAutomationCode = {
     type: 'by-type';
-    value: DeviceEvent['kind'];
+    value: DeviceType;
+    eventKind: DeviceEvent['kind'];
 };
 export type ParsedAlarmAutomationCode = ParsedByDeviceAutomationCode | ParsedByTypeAutomationCode;
 export declare const parseAlarmAutomationCode: (code: string) => ParsedAlarmAutomationCode | null;

package/dist/alarm-automation.js

@@ -29,12 +29,12 @@ exports.isAlarmAutomationMetadata = isAlarmAutomationMetadata;
 // Alarm assigns automation rules with code that is either:
 // [by-event]:[event-kind]
 // [by-device]:[device-id]
-const formatByDeviceAutomationCode = (deviceId) => {
-    return `by-device:${deviceId}`;
+const formatByDeviceAutomationCode = (eventKind, deviceId) => {
+    return `by-device:${deviceId}:${eventKind}`;
 };
 exports.formatByDeviceAutomationCode = formatByDeviceAutomationCode;
-const formatByTypeAutomationCode = (eventKind) => {
-    return `by-Type:${eventKind}`;
+const formatByTypeAutomationCode = (eventKind, deviceType) => {
+    return `by-type:${deviceType}:${eventKind}`;
 };
 exports.formatByTypeAutomationCode = formatByTypeAutomationCode;
 const isByDeviceAutomationCode = (code) => {
@@ -47,15 +47,25 @@ const isByTypeAutomationCode = (code) => {
 exports.isByTypeAutomationCode = isByTypeAutomationCode;
 const parseAlarmAutomationCode = (code) => {
     if ((0, exports.isByDeviceAutomationCode)(code)) {
+        const parts = code.replace('by-device:', '').split(':');
+        if (parts.length !== 2) {
+            return null; // Invalid format
+        }
         return {
             type: 'by-device',
-            value: code.replace('by-device:', ''),
+            value: parts[0], // deviceId
+            eventKind: parts[1], // eventKind
         };
     }
     if ((0, exports.isByTypeAutomationCode)(code)) {
+        const parts = code.replace('by-type:', '').split(':');
+        if (parts.length !== 2) {
+            return null; // Invalid format
+        }
         return {
             type: 'by-type',
-            value: code.replace('by-type:', ''),
+            value: parts[0], // deviceType
+            eventKind: parts[1], // eventKind
         };
     }
     return null;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awarevue/api-types",
-  "version": "1.0.70",
+  "version": "1.0.71",
   "description": "Common types between backend, agent(s) and frontend(s)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awarevue/api-types",
-  "version": "1.0.70",
+  "version": "1.0.71",
   "description": "Common types between backend, agent(s) and frontend(s)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",