@awarevue/api-types 1.0.73 → 1.0.75

package/dist/alarm-automation.js

@@ -88,28 +88,34 @@ exports.parseAlarmAutomationCode = parseAlarmAutomationCode;
 //         ]
 //     }
 // }
-const encodeComparison = (value) => {
+const encodeValue = (value) => {
     if (typeof value === 'string') {
-        return `== ${JSON.stringify(value)}`;
+        return `${JSON.stringify(value)}`;
     }
     if (typeof value === 'number' || typeof value === 'boolean') {
-        return `== ${String(value)}`;
+        return `${String(value)}`;
     }
     if (Array.isArray(value)) {
-        return `in (${value.map(encodeComparison).join(', ')})`;
+        return `(${value.map(encodeValue).join(', ')})`;
     }
     if (value === null) {
-        return '== null';
+        return 'null';
+    }
+    throw new Error(`Unsupported value type for: ${typeof value}`);
+};
+const encodeComparison = (value) => {
+    if (Array.isArray(value)) {
+        return `in ${encodeValue(value)}`;
     }
-    throw new Error(`Unsupported value type for comparison: ${typeof value}`);
+    return `== ${encodeValue(value)}`;
 };
 const createAlarmRuleBody = (eventKind, behavior, deviceType, eventCriteria, deviceId) => {
     let runIf = 'source.type == "' + deviceType + '"';
     if (deviceId) {
-        runIf += ` && source.id == "${deviceId}"`;
+        runIf += ` and source.id == "${deviceId}"`;
     }
     for (const criterion of eventCriteria) {
-        runIf += ` && event.${criterion.field} ${encodeComparison(criterion.value)}`;
+        runIf += ` and event.${criterion.field} ${encodeComparison(criterion.value)}`;
     }
     return {
         onEvent: eventKind,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awarevue/api-types",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "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.73",
+  "version": "1.0.75",
   "description": "Common types between backend, agent(s) and frontend(s)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",