@griffin-app/griffin-cli 1.0.23 → 1.0.24

package/dist/core/apply.js

@@ -32,6 +32,7 @@ export async function applyDiff(diff, sdk, options) {
             }
         }
         catch (error) {
+            console.log(error);
             terminal.error(error.message);
             errors.push({
                 action,
@@ -77,12 +78,13 @@ async function applyUpdate(action, sdk, applied) {
     //const variables = await loadVariables(environment);
     //const resolvedMonitor = resolveMonitor(monitor, projectId, environment, variables);
     // Use the remote monitor's ID for the update
-    await sdk.putMonitorById({
+    const result = await sdk.putMonitorById({
         path: {
             id: action.remoteMonitor.id,
         },
         body: resolvedMonitor,
     });
+    console.log(JSON.stringify(result.data, null, 2));
     applied.push({
         type: "update",
         monitorName: action.remoteMonitor.name,

package/dist/core/diff.js

@@ -196,12 +196,7 @@ function formatFieldValue(value) {
         if ("every" in value && "unit" in value) {
             return `every ${value.every} ${value.unit.toLowerCase()}`;
         }
-        // For other objects, show a compact representation
-        const keys = Object.keys(value);
-        if (keys.length <= 2) {
-            return JSON.stringify(value);
-        }
-        return `{${keys.length} fields}`;
+        return JSON.stringify(value);
     }
     return String(value);
 }

package/dist/core/monitor-diff.js

@@ -214,6 +214,66 @@ function compareEdges(localEdges, remoteEdges) {
     }
     return changes;
 }
+/** Pattern for hub-assigned platform integration names (e.g. platform-email). */
+const PLATFORM_INTEGRATION_PREFIX = "platform-";
+/**
+ * Normalize notifications for diff: treat hub-assigned platform integration
+ * names (platform-${channelType}) as equivalent to missing integration so the
+ * DSL need not specify them.
+ */
+function normalizeNotificationsForDiff(notifications) {
+    if (!notifications || notifications.length === 0)
+        return undefined;
+    return notifications.map((n) => {
+        const integration = n.integration;
+        if (integration && integration.startsWith(PLATFORM_INTEGRATION_PREFIX)) {
+            const channelType = n.routing?.channelType;
+            const platformName = PLATFORM_INTEGRATION_PREFIX + (channelType ?? "");
+            if (integration === platformName) {
+                const copy = { ...n };
+                delete copy.integration;
+                return copy;
+            }
+        }
+        return n;
+    });
+}
+/** Sort key from trigger + routing only so matching entries line up when comparing. */
+function notificationSortKey(n) {
+    return objectHash({ trigger: n.trigger, routing: n.routing });
+}
+/**
+ * Sort notifications by (trigger, routing) so comparison is order-independent
+ * and matching entries align. Uses only trigger+routing so integration doesn't affect order.
+ */
+function sortNotificationsForDiff(notifications) {
+    if (!notifications || notifications.length === 0)
+        return undefined;
+    return [...notifications].sort((a, b) => {
+        const ka = notificationSortKey(a);
+        const kb = notificationSortKey(b);
+        return ka < kb ? -1 : ka > kb ? 1 : 0;
+    });
+}
+/**
+ * Semantic equality for notification arrays: same set of (trigger, routing), and
+ * when local omits integration we treat remote's integration as a match (hub may assign a name).
+ */
+function notificationsEqual(local, remote) {
+    if (!local && !remote)
+        return true;
+    if (!local || !remote || local.length !== remote.length)
+        return false;
+    for (let i = 0; i < local.length; i++) {
+        const a = local[i];
+        const b = remote[i];
+        if (!deepEqual(a.trigger, b.trigger) || !deepEqual(a.routing, b.routing))
+            return false;
+        if (a.integration !== undefined && a.integration !== b.integration)
+            return false;
+    }
+    return true;
+}
 /**
  * Compare top-level fields: frequency, version, locations
  */
@@ -247,14 +307,17 @@ function compareTopLevel(local, remote) {
             newValue: localLocations,
         });
     }
-    // Compare notifications (normalize empty array to undefined)
-    const localNotifications = local.notifications && local.notifications.length > 0
+    // Compare notifications (normalize empty array to undefined).
+    // Ignore hub-assigned platform integration names (platform-${channelType}) so they
+    // don't cause a diff when the DSL omits integration.
+    // Sort so order is irrelevant — the backend does not impose ordering.
+    const localNotifications = sortNotificationsForDiff(normalizeNotificationsForDiff(local.notifications && local.notifications.length > 0
         ? local.notifications
-        : undefined;
-    const remoteNotifications = remote.notifications && remote.notifications.length > 0
+        : undefined));
+    const remoteNotifications = sortNotificationsForDiff(normalizeNotificationsForDiff(remote.notifications && remote.notifications.length > 0
         ? remote.notifications
-        : undefined;
-    if (!deepEqual(localNotifications, remoteNotifications)) {
+        : undefined));
+    if (!notificationsEqual(localNotifications, remoteNotifications)) {
         changes.push({
             field: "notifications",
             oldValue: remoteNotifications,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@griffin-app/griffin-cli",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "CLI tool for running and managing griffin API tests",
   "type": "module",
   "main": "dist/index.js",