@supercheck/cli 0.1.0-beta.7 → 0.1.0-beta.8

package/dist/bin/supercheck.js

@@ -643,6 +643,93 @@ function safeId(value) {
   if (str === "undefined" || str === "null" || str === "") return void 0;
   return str;
 }
+function normalizeAlertConfig(alert) {
+  const normalized = { ...alert };
+  if (normalized.customMessage === "" || normalized.customMessage === null) delete normalized.customMessage;
+  if (normalized.failureThreshold === 1) delete normalized.failureThreshold;
+  if (normalized.recoveryThreshold === 1) delete normalized.recoveryThreshold;
+  for (const key of ["alertOnFailure", "alertOnRecovery", "alertOnSslExpiration", "alertOnSuccess", "alertOnTimeout"]) {
+    if (normalized[key] === false) delete normalized[key];
+  }
+  if (Array.isArray(normalized.notificationProviders) && normalized.notificationProviders.length === 0) {
+    delete normalized.notificationProviders;
+  }
+  return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
+function normalizeMonitorConfig(config) {
+  const normalized = { ...config };
+  delete normalized.sslLastCheckedAt;
+  if (normalized.playwrightOptions && typeof normalized.playwrightOptions === "object") {
+    const opts = { ...normalized.playwrightOptions };
+    if (opts.retries === 0) delete opts.retries;
+    if (opts.timeout === 3e5) delete opts.timeout;
+    if (opts.headless === true) delete opts.headless;
+    normalized.playwrightOptions = Object.keys(opts).length > 0 ? opts : void 0;
+    if (!normalized.playwrightOptions) delete normalized.playwrightOptions;
+  }
+  if (normalized.locationConfig && typeof normalized.locationConfig === "object") {
+    const loc = { ...normalized.locationConfig };
+    const hasLocations = Array.isArray(loc.locations) && loc.locations.length > 0;
+    if (!loc.enabled || !hasLocations) {
+      delete normalized.locationConfig;
+    } else {
+      if (loc.enabled === true) delete loc.enabled;
+      if (loc.strategy === "majority") delete loc.strategy;
+      if (loc.threshold === 50) delete loc.threshold;
+      normalized.locationConfig = Object.keys(loc).length > 0 ? loc : void 0;
+      if (!normalized.locationConfig) delete normalized.locationConfig;
+    }
+  }
+  return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
+function normalizeRemoteRaw(type, raw) {
+  const normalized = { ...raw };
+  delete normalized.createdAt;
+  delete normalized.updatedAt;
+  delete normalized.projectId;
+  delete normalized.organizationId;
+  delete normalized.createdByUserId;
+  if (type === "monitor") {
+    if (normalized.config && typeof normalized.config === "object") {
+      normalized.config = normalizeMonitorConfig(normalized.config);
+      if (!normalized.config) delete normalized.config;
+    }
+    if (normalized.alertConfig && typeof normalized.alertConfig === "object") {
+      normalized.alertConfig = normalizeAlertConfig(normalized.alertConfig);
+      if (!normalized.alertConfig) delete normalized.alertConfig;
+    }
+  }
+  if (type === "job") {
+    if (Array.isArray(normalized.tests)) {
+      normalized.tests = normalized.tests.map((t) => {
+        if (typeof t === "string") return t;
+        if (t && typeof t === "object" && t.id) {
+          const testType = t.type === "performance" || t.type === "k6" ? "k6" : "pw";
+          return `_supercheck_/tests/${t.id}.${testType}.ts`;
+        }
+        return t;
+      });
+    }
+    if (normalized.alertConfig && typeof normalized.alertConfig === "object") {
+      normalized.alertConfig = normalizeAlertConfig(normalized.alertConfig);
+      if (!normalized.alertConfig) delete normalized.alertConfig;
+    }
+    delete normalized.status;
+  }
+  if (type === "variable") {
+    if (normalized.value === void 0 || normalized.value === null) {
+      normalized.value = "";
+    }
+  }
+  if (type === "statusPage") {
+    if (normalized.pageDescription !== void 0 && normalized.description === void 0) {
+      normalized.description = normalized.pageDescription;
+    }
+    delete normalized.pageDescription;
+    if (!normalized.description) delete normalized.description;
+  }
+  return normalized;
+}
 async function fetchRemoteResources(client) {
   const resources = [];
   try {
@@ -653,7 +740,7 @@ async function fetchRemoteResources(client) {
         logger.debug("Skipping job with missing id");
         continue;
       }
-      resources.push({ id, type: "job", name: String(job.name ?? ""), raw: job });
+      resources.push({ id, type: "job", name: String(job.name ?? ""), raw: normalizeRemoteRaw("job", job) });
     }
   } catch (err) {
     logFetchError("jobs", err);
@@ -666,7 +753,7 @@ async function fetchRemoteResources(client) {
         logger.debug("Skipping test with missing id");
         continue;
       }
-      resources.push({ id, type: "test", name: String(test.title ?? ""), raw: test });
+      resources.push({ id, type: "test", name: String(test.title ?? ""), raw: normalizeRemoteRaw("test", test) });
     }
   } catch (err) {
     logFetchError("tests", err);
@@ -679,7 +766,7 @@ async function fetchRemoteResources(client) {
         logger.debug("Skipping monitor with missing id");
         continue;
       }
-      resources.push({ id, type: "monitor", name: String(monitor.name ?? ""), raw: monitor });
+      resources.push({ id, type: "monitor", name: String(monitor.name ?? ""), raw: normalizeRemoteRaw("monitor", monitor) });
     }
   } catch (err) {
     logFetchError("monitors", err);
@@ -692,7 +779,7 @@ async function fetchRemoteResources(client) {
         logger.debug("Skipping variable with missing id");
         continue;
       }
-      resources.push({ id, type: "variable", name: String(v.key ?? ""), raw: v });
+      resources.push({ id, type: "variable", name: String(v.key ?? ""), raw: normalizeRemoteRaw("variable", v) });
     }
   } catch (err) {
     logFetchError("variables", err);
@@ -705,7 +792,7 @@ async function fetchRemoteResources(client) {
         logger.debug("Skipping tag with missing id");
         continue;
       }
-      resources.push({ id, type: "tag", name: String(t.name ?? ""), raw: t });
+      resources.push({ id, type: "tag", name: String(t.name ?? ""), raw: normalizeRemoteRaw("tag", t) });
     }
   } catch (err) {
     logFetchError("tags", err);
@@ -718,7 +805,7 @@ async function fetchRemoteResources(client) {
         logger.debug("Skipping status page with missing id");
         continue;
       }
-      resources.push({ id, type: "statusPage", name: String(sp.name ?? ""), raw: sp });
+      resources.push({ id, type: "statusPage", name: String(sp.name ?? ""), raw: normalizeRemoteRaw("statusPage", sp) });
     }
   } catch (err) {
     logFetchError("status-pages", err);
@@ -2822,18 +2909,37 @@ var diffCommand = new Command11("diff").description("Preview changes between loc
 // src/commands/deploy.ts
 import { Command as Command12 } from "commander";
 import pc4 from "picocolors";
+function prepareBodyForApi(type, body) {
+  const payload = { ...body };
+  if (type === "job") {
+    if (Array.isArray(payload.tests)) {
+      payload.tests = payload.tests.map((t) => {
+        const match = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i.exec(t);
+        return match ? match[1] : t;
+      });
+    }
+  }
+  if (type === "statusPage") {
+    if (payload.description) {
+      payload.pageDescription = payload.description;
+      delete payload.description;
+    }
+  }
+  return payload;
+}
 async function applyChange(client, change) {
   try {
     const endpoint = getApiEndpoint(change.type);
     switch (change.action) {
       case "create": {
-        const body = { ...change.local.definition };
+        const body = prepareBodyForApi(change.type, change.local.definition);
         await client.post(endpoint, body);
         return { success: true };
       }
       case "update": {
         const id = change.id ?? change.remote.id;
-        const { id: _id, ...body } = change.local.definition;
+        const { id: _id, ...rawBody } = change.local.definition;
+        const body = prepareBodyForApi(change.type, rawBody);
         await client.put(`${endpoint}/${id}`, body);
         return { success: true };
       }
@@ -3358,49 +3464,6 @@ function buildStatusPageDefinitions(pages) {
 }
 function generateConfigContent(opts) {
   const parts = [];
-  parts.push("/**");
-  parts.push(" * Supercheck Configuration");
-  parts.push(" * \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-  parts.push(" *");
-  parts.push(" * This file was generated by `supercheck pull`. It is the source of truth");
-  parts.push(" * for your Supercheck project configuration.");
-  parts.push(" *");
-  parts.push(" * Getting Started:");
-  parts.push(" *   1. Install dependencies:");
-  parts.push(" *        npm install -D @supercheck/cli typescript @types/node");
-  parts.push(" *        # If using Playwright tests, also install:");
-  parts.push(" *        npm install -D @playwright/test");
-  parts.push(" *        # If using k6 tests, install k6: https://grafana.com/docs/k6/latest/set-up/install-k6/");
-  parts.push(" *");
-  parts.push(" *   2. Review the configuration below and make any changes you need.");
-  parts.push(" *   3. Preview what will change:  npx supercheck diff");
-  parts.push(" *   4. Deploy your changes:       npx supercheck deploy");
-  parts.push(" *   5. Re-sync from cloud:        npx supercheck pull");
-  parts.push(" *");
-  parts.push(" * CLI Commands:");
-  parts.push(" *   supercheck pull               Pull remote config & test scripts to local");
-  parts.push(" *   supercheck diff               Compare local config vs remote");
-  parts.push(" *   supercheck deploy              Deploy local config to the cloud");
-  parts.push(" *   supercheck destroy             Remove all managed resources from the cloud");
-  parts.push(" *");
-  parts.push(" *   supercheck test list           List all tests");
-  parts.push(" *   supercheck test validate       Validate a local test script");
-  parts.push(" *   supercheck test execute <id>   Execute a test immediately");
-  parts.push(" *");
-  parts.push(" *   supercheck monitor list        List all monitors");
-  parts.push(" *   supercheck job list            List all jobs");
-  parts.push(" *   supercheck job run --id <id>   Run a job immediately");
-  parts.push(" *");
-  parts.push(" *   supercheck config validate     Validate this config file");
-  parts.push(" *   supercheck health              Check API connectivity");
-  parts.push(" *   supercheck whoami              Show current authentication info");
-  parts.push(" *");
-  parts.push(" * CI/CD Integration:");
-  parts.push(" *   Set the SUPERCHECK_TOKEN environment variable in your CI/CD pipeline");
-  parts.push(" *   and run `supercheck deploy` to push changes automatically.");
-  parts.push(" *");
-  parts.push(` * Documentation: https://supercheck.io/docs/app/welcome`);
-  parts.push(" */");
   parts.push(`import { defineConfig } from '@supercheck/cli'`);
   parts.push("");
   parts.push("export default defineConfig({");
@@ -3454,6 +3517,50 @@ function generateConfigContent(opts) {
   }
   parts.push("})");
   parts.push("");
+  parts.push("/**");
+  parts.push(" * Supercheck \u2014 Getting Started");
+  parts.push(" * \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  parts.push(" *");
+  parts.push(" * This file was generated by `supercheck pull`. It is the source of truth");
+  parts.push(" * for your Supercheck project configuration.");
+  parts.push(" *");
+  parts.push(" * Getting Started:");
+  parts.push(" *   1. Install dependencies:");
+  parts.push(" *        npm install -D @supercheck/cli typescript @types/node");
+  parts.push(" *        # If using Playwright tests, also install:");
+  parts.push(" *        npm install -D @playwright/test");
+  parts.push(" *        # If using k6 tests, install k6: https://grafana.com/docs/k6/latest/set-up/install-k6/");
+  parts.push(" *");
+  parts.push(" *   2. Review the configuration above and make any changes you need.");
+  parts.push(" *   3. Preview what will change:  npx supercheck diff");
+  parts.push(" *   4. Deploy your changes:       npx supercheck deploy");
+  parts.push(" *   5. Re-sync from cloud:        npx supercheck pull");
+  parts.push(" *");
+  parts.push(" * CLI Commands:");
+  parts.push(" *   supercheck pull               Pull remote config & test scripts to local");
+  parts.push(" *   supercheck diff               Compare local config vs remote");
+  parts.push(" *   supercheck deploy              Deploy local config to the cloud");
+  parts.push(" *   supercheck destroy             Remove all managed resources from the cloud");
+  parts.push(" *");
+  parts.push(" *   supercheck test list           List all tests");
+  parts.push(" *   supercheck test validate       Validate a local test script");
+  parts.push(" *   supercheck test execute <id>   Execute a test immediately");
+  parts.push(" *");
+  parts.push(" *   supercheck monitor list        List all monitors");
+  parts.push(" *   supercheck job list            List all jobs");
+  parts.push(" *   supercheck job run --id <id>   Run a job immediately");
+  parts.push(" *");
+  parts.push(" *   supercheck config validate     Validate this config file");
+  parts.push(" *   supercheck health              Check API connectivity");
+  parts.push(" *   supercheck whoami              Show current authentication info");
+  parts.push(" *");
+  parts.push(" * CI/CD Integration:");
+  parts.push(" *   Set the SUPERCHECK_TOKEN environment variable in your CI/CD pipeline");
+  parts.push(" *   and run `supercheck deploy` to push changes automatically.");
+  parts.push(" *");
+  parts.push(` * Documentation: https://supercheck.io/docs/app/welcome`);
+  parts.push(" */");
+  parts.push("");
   return parts.join("\n");
 }
 function formatArray(arr, baseIndent) {