@wraps.dev/cli 2.17.4 → 2.17.6

package/dist/cli.js

@@ -4447,6 +4447,26 @@ function applyConfigUpdates(existingConfig, updates) {
         ...result.smtpCredentials,
         ...value
       };
+    } else if (key === "inbound" && typeof value === "object") {
+      result.inbound = {
+        ...result.inbound,
+        ...value
+      };
+    } else if (key === "alerts" && typeof value === "object") {
+      const alertUpdate = value;
+      result.alerts = {
+        ...result.alerts,
+        ...alertUpdate,
+        thresholds: {
+          ...result.alerts?.thresholds,
+          ...alertUpdate.thresholds
+        }
+      };
+    } else if (key === "userWebhook" && typeof value === "object") {
+      result.userWebhook = {
+        ...result.userWebhook,
+        ...value
+      };
     } else {
       result[key] = value;
     }
@@ -4517,22 +4537,39 @@ function addServiceToConnection(accountId, region, provider, service, config2, p
   }
   return metadata;
 }
+function shallowMergeWithNestedObjects(existing, updates) {
+  const result = { ...existing };
+  for (const [key, value] of Object.entries(updates)) {
+    if (value === void 0) {
+      continue;
+    }
+    if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+      result[key] = {
+        ...existing[key],
+        ...value
+      };
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 function updateServiceConfig(metadata, service, config2) {
   if (service === "email" && metadata.services.email) {
-    metadata.services.email.config = {
-      ...metadata.services.email.config,
-      ...config2
-    };
+    metadata.services.email.config = applyConfigUpdates(
+      metadata.services.email.config,
+      config2
+    );
   } else if (service === "sms" && metadata.services.sms) {
-    metadata.services.sms.config = {
-      ...metadata.services.sms.config,
-      ...config2
-    };
+    metadata.services.sms.config = shallowMergeWithNestedObjects(
+      metadata.services.sms.config,
+      config2
+    );
   } else if (service === "cdn" && metadata.services.cdn) {
-    metadata.services.cdn.config = {
-      ...metadata.services.cdn.config,
-      ...config2
-    };
+    metadata.services.cdn.config = shallowMergeWithNestedObjects(
+      metadata.services.cdn.config,
+      config2
+    );
   } else {
     throw new Error(`${service} service not configured in metadata`);
   }
@@ -5290,6 +5327,170 @@ var init_output = __esm({
   }
 });
 
+// src/utils/shared/pulumi.ts
+var pulumi_exports = {};
+__export(pulumi_exports, {
+  checkPulumiInstalled: () => checkPulumiInstalled,
+  clearStackLocks: () => clearStackLocks,
+  ensurePulumiInstalled: () => ensurePulumiInstalled,
+  previewWithResourceChanges: () => previewWithResourceChanges,
+  withLockRetry: () => withLockRetry
+});
+import { exec } from "child_process";
+import { existsSync as existsSync6, readdirSync as readdirSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname2, join as join7 } from "path";
+import { promisify } from "util";
+import { PulumiCommand } from "@pulumi/pulumi/automation/index.js";
+function findSdkInstalledPulumi() {
+  const versionsDir = join7(homedir3(), ".pulumi", "versions");
+  if (!existsSync6(versionsDir)) return;
+  const versions = readdirSync2(versionsDir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name).sort().reverse();
+  for (const version of versions) {
+    const binPath = join7(versionsDir, version, "bin", "pulumi");
+    if (existsSync6(binPath)) return dirname2(binPath);
+  }
+  return;
+}
+async function checkPulumiInstalled() {
+  try {
+    await execAsync("pulumi version");
+    return true;
+  } catch {
+    const binDir = findSdkInstalledPulumi();
+    if (binDir) {
+      process.env.PATH = `${binDir}:${process.env.PATH}`;
+      return true;
+    }
+    return false;
+  }
+}
+async function ensurePulumiInstalled() {
+  const isInstalled = await checkPulumiInstalled();
+  if (!isInstalled) {
+    try {
+      const cmd = await PulumiCommand.install();
+      const binDir = dirname2(cmd.command);
+      process.env.PATH = `${binDir}:${process.env.PATH}`;
+      return true;
+    } catch (_error) {
+      throw errors.pulumiNotInstalled();
+    }
+  }
+  return false;
+}
+function mapOperationType(op) {
+  switch (op) {
+    case "create":
+      return "create";
+    case "update":
+      return "update";
+    case "delete":
+      return "delete";
+    case "replace":
+    case "create-replacement":
+    case "delete-replaced":
+      return "replace";
+    case "same":
+    case "read":
+      return "same";
+    default:
+      return "same";
+  }
+}
+async function previewWithResourceChanges(stack, options) {
+  const resourceChanges = [];
+  const seenResources = /* @__PURE__ */ new Set();
+  const result = await stack.preview({
+    diff: options?.diff ?? true,
+    onEvent: (event) => {
+      if (event.resourcePreEvent) {
+        const metadata = event.resourcePreEvent.metadata;
+        if (metadata) {
+          const resourceKey = `${metadata.type}::${metadata.urn}`;
+          if (seenResources.has(resourceKey)) {
+            return;
+          }
+          seenResources.add(resourceKey);
+          if (metadata.type === "pulumi:pulumi:Stack") {
+            return;
+          }
+          const operation = mapOperationType(metadata.op || "same");
+          const urnParts = metadata.urn?.split("::") || [];
+          const name = urnParts.at(-1) || metadata.urn || "unknown";
+          const diffs = [];
+          if (metadata.diffs && metadata.diffs.length > 0) {
+            for (const diff of metadata.diffs) {
+              diffs.push(diff);
+            }
+          }
+          resourceChanges.push({
+            name,
+            type: metadata.type || "unknown",
+            operation,
+            diffs: diffs.length > 0 ? diffs : void 0
+          });
+        }
+      }
+    }
+  });
+  return {
+    ...result,
+    resourceChanges
+  };
+}
+async function clearStackLocks(accountId, region) {
+  const backendUrl = process.env.PULUMI_BACKEND_URL || "";
+  if (backendUrl.startsWith("s3://")) {
+    const { clearS3StackLocks: clearS3StackLocks2 } = await Promise.resolve().then(() => (init_s3_state(), s3_state_exports));
+    return clearS3StackLocks2(accountId, region);
+  }
+  const { clearLocalStackLocks: clearLocalStackLocks2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
+  return clearLocalStackLocks2();
+}
+async function withLockRetry(fn, options) {
+  try {
+    return await fn();
+  } catch (error) {
+    if (!(error instanceof Error)) {
+      throw error;
+    }
+    const parsed = parsePulumiError(error);
+    if (parsed.code !== "STACK_LOCKED") {
+      throw error;
+    }
+    const clack51 = await import("@clack/prompts");
+    const pc54 = (await import("picocolors")).default;
+    if (options.autoConfirm) {
+      clack51.log.warn(
+        "Stack is locked from a previous interrupted run. Auto-clearing..."
+      );
+    } else {
+      const shouldClear = await clack51.confirm({
+        message: `Stack is locked from a previous interrupted run. ${pc54.yellow("Clear the stale lock and retry?")}`,
+        initialValue: true
+      });
+      if (clack51.isCancel(shouldClear) || !shouldClear) {
+        throw errors.stackLocked();
+      }
+    }
+    const cleared = await clearStackLocks(options.accountId, options.region);
+    clack51.log.info(
+      `Cleared ${cleared} lock file${cleared === 1 ? "" : "s"}. Retrying...`
+    );
+    return fn();
+  }
+}
+var execAsync;
+var init_pulumi = __esm({
+  "src/utils/shared/pulumi.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_errors();
+    execAsync = promisify(exec);
+  }
+});
+
 // src/constants.ts
 function getDefaultRegion() {
   return process.env.AWS_REGION || DEFAULT_AWS_REGION;
@@ -10092,161 +10293,10 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack9 from "@clack/prompts";
 import * as pulumi from "@pulumi/pulumi";
 import pc10 from "picocolors";
-
-// src/utils/shared/pulumi.ts
-init_esm_shims();
-init_errors();
-import { exec } from "child_process";
-import { existsSync as existsSync6, readdirSync as readdirSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { dirname as dirname2, join as join7 } from "path";
-import { promisify } from "util";
-import { PulumiCommand } from "@pulumi/pulumi/automation/index.js";
-var execAsync = promisify(exec);
-function findSdkInstalledPulumi() {
-  const versionsDir = join7(homedir3(), ".pulumi", "versions");
-  if (!existsSync6(versionsDir)) return;
-  const versions = readdirSync2(versionsDir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name).sort().reverse();
-  for (const version of versions) {
-    const binPath = join7(versionsDir, version, "bin", "pulumi");
-    if (existsSync6(binPath)) return dirname2(binPath);
-  }
-  return;
-}
-async function checkPulumiInstalled() {
-  try {
-    await execAsync("pulumi version");
-    return true;
-  } catch {
-    const binDir = findSdkInstalledPulumi();
-    if (binDir) {
-      process.env.PATH = `${binDir}:${process.env.PATH}`;
-      return true;
-    }
-    return false;
-  }
-}
-async function ensurePulumiInstalled() {
-  const isInstalled = await checkPulumiInstalled();
-  if (!isInstalled) {
-    try {
-      const cmd = await PulumiCommand.install();
-      const binDir = dirname2(cmd.command);
-      process.env.PATH = `${binDir}:${process.env.PATH}`;
-      return true;
-    } catch (_error) {
-      throw errors.pulumiNotInstalled();
-    }
-  }
-  return false;
-}
-function mapOperationType(op) {
-  switch (op) {
-    case "create":
-      return "create";
-    case "update":
-      return "update";
-    case "delete":
-      return "delete";
-    case "replace":
-    case "create-replacement":
-    case "delete-replaced":
-      return "replace";
-    case "same":
-    case "read":
-      return "same";
-    default:
-      return "same";
-  }
-}
-async function previewWithResourceChanges(stack, options) {
-  const resourceChanges = [];
-  const seenResources = /* @__PURE__ */ new Set();
-  const result = await stack.preview({
-    diff: options?.diff ?? true,
-    onEvent: (event) => {
-      if (event.resourcePreEvent) {
-        const metadata = event.resourcePreEvent.metadata;
-        if (metadata) {
-          const resourceKey = `${metadata.type}::${metadata.urn}`;
-          if (seenResources.has(resourceKey)) {
-            return;
-          }
-          seenResources.add(resourceKey);
-          if (metadata.type === "pulumi:pulumi:Stack") {
-            return;
-          }
-          const operation = mapOperationType(metadata.op || "same");
-          const urnParts = metadata.urn?.split("::") || [];
-          const name = urnParts.at(-1) || metadata.urn || "unknown";
-          const diffs = [];
-          if (metadata.diffs && metadata.diffs.length > 0) {
-            for (const diff of metadata.diffs) {
-              diffs.push(diff);
-            }
-          }
-          resourceChanges.push({
-            name,
-            type: metadata.type || "unknown",
-            operation,
-            diffs: diffs.length > 0 ? diffs : void 0
-          });
-        }
-      }
-    }
-  });
-  return {
-    ...result,
-    resourceChanges
-  };
-}
-async function clearStackLocks(accountId, region) {
-  const backendUrl = process.env.PULUMI_BACKEND_URL || "";
-  if (backendUrl.startsWith("s3://")) {
-    const { clearS3StackLocks: clearS3StackLocks2 } = await Promise.resolve().then(() => (init_s3_state(), s3_state_exports));
-    return clearS3StackLocks2(accountId, region);
-  }
-  const { clearLocalStackLocks: clearLocalStackLocks2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
-  return clearLocalStackLocks2();
-}
-async function withLockRetry(fn, options) {
-  try {
-    return await fn();
-  } catch (error) {
-    if (!(error instanceof Error)) {
-      throw error;
-    }
-    const parsed = parsePulumiError(error);
-    if (parsed.code !== "STACK_LOCKED") {
-      throw error;
-    }
-    const clack51 = await import("@clack/prompts");
-    const pc54 = (await import("picocolors")).default;
-    if (options.autoConfirm) {
-      clack51.log.warn(
-        "Stack is locked from a previous interrupted run. Auto-clearing..."
-      );
-    } else {
-      const shouldClear = await clack51.confirm({
-        message: `Stack is locked from a previous interrupted run. ${pc54.yellow("Clear the stale lock and retry?")}`,
-        initialValue: true
-      });
-      if (clack51.isCancel(shouldClear) || !shouldClear) {
-        throw errors.stackLocked();
-      }
-    }
-    const cleared = await clearStackLocks(options.accountId, options.region);
-    clack51.log.info(
-      `Cleared ${cleared} lock file${cleared === 1 ? "" : "s"}. Retrying...`
-    );
-    return fn();
-  }
-}
-
-// src/commands/cdn/destroy.ts
 async function cdnDestroy(options) {
   await ensurePulumiInstalled();
   const startTime = Date.now();
@@ -11411,6 +11461,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 async function promptCdnPreset() {
   const starterInfo = getPresetInfo2("starter");
   const productionInfo = getPresetInfo2("production");
@@ -12160,6 +12211,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack11 from "@clack/prompts";
 import * as pulumi6 from "@pulumi/pulumi";
 import pc12 from "picocolors";
@@ -12337,6 +12389,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 async function cdnSync(options) {
   await ensurePulumiInstalled();
   const startTime = Date.now();
@@ -12517,6 +12570,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 async function cdnUpgrade(options) {
   await ensurePulumiInstalled();
   const startTime = Date.now();
@@ -12820,6 +12874,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack14 from "@clack/prompts";
 import * as pulumi9 from "@pulumi/pulumi";
 import pc15 from "picocolors";
@@ -17198,6 +17253,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 async function config(options) {
   const startTime = Date.now();
   if (!isJsonMode()) {
@@ -17488,6 +17544,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 
 // src/utils/shared/scanner.ts
 init_esm_shims();
@@ -18084,6 +18141,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack18 from "@clack/prompts";
 import * as pulumi15 from "@pulumi/pulumi";
 import pc19 from "picocolors";
@@ -18156,6 +18214,10 @@ async function emailDestroy(options) {
     );
   }
   const progress = new DeploymentProgress();
+  await progress.execute("Checking Pulumi CLI installation", async () => {
+    const { ensurePulumiInstalled: ensurePulumiInstalled2 } = await Promise.resolve().then(() => (init_pulumi(), pulumi_exports));
+    await ensurePulumiInstalled2();
+  });
   const identity = await progress.execute(
     "Validating AWS credentials",
     async () => validateAWSCredentials()
@@ -19562,6 +19624,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 async function inboundInit(options) {
   if (!isJsonMode()) {
     clack20.intro(
@@ -20716,6 +20779,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 async function init2(options) {
   const startTime = Date.now();
   if (!isJsonMode()) {
@@ -21323,6 +21387,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack24 from "@clack/prompts";
 import * as pulumi18 from "@pulumi/pulumi";
 import pc25 from "picocolors";
@@ -21527,6 +21592,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack25 from "@clack/prompts";
 import * as pulumi19 from "@pulumi/pulumi";
 import pc26 from "picocolors";
@@ -23476,6 +23542,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 async function upgrade(options) {
   const startTime = Date.now();
   let upgradeAction = "";
@@ -23676,13 +23743,17 @@ ${pc30.bold("Current Configuration:")}
       hint: metadata.provider === "vercel" ? `Currently: Vercel (${metadata.vercel?.teamSlug || "configured"})` : `Currently: ${metadata.provider} \u2192 Switch to Vercel OIDC, etc.`
     }
   );
-  upgradeAction = await clack29.select({
-    message: "What would you like to do?",
-    options: upgradeOptions
-  });
-  if (clack29.isCancel(upgradeAction)) {
-    clack29.cancel("Upgrade cancelled.");
-    process.exit(0);
+  if (options.action) {
+    upgradeAction = options.action;
+  } else {
+    upgradeAction = await clack29.select({
+      message: "What would you like to do?",
+      options: upgradeOptions
+    });
+    if (clack29.isCancel(upgradeAction)) {
+      clack29.cancel("Upgrade cancelled.");
+      process.exit(0);
+    }
   }
   let updatedConfig = { ...config2 };
   let newPreset = metadata.services.email?.preset;
@@ -23712,13 +23783,18 @@ ${pc30.bold("Current Configuration:")}
         clack29.log.warn("Already on highest preset (Enterprise)");
         process.exit(0);
       }
-      const selectedPreset = await clack29.select({
-        message: "Select new preset:",
-        options: availablePresets
-      });
-      if (clack29.isCancel(selectedPreset)) {
-        clack29.cancel("Upgrade cancelled.");
-        process.exit(0);
+      let selectedPreset;
+      if (options.preset) {
+        selectedPreset = options.preset;
+      } else {
+        selectedPreset = await clack29.select({
+          message: "Select new preset:",
+          options: availablePresets
+        });
+        if (clack29.isCancel(selectedPreset)) {
+          clack29.cancel("Upgrade cancelled.");
+          process.exit(0);
+        }
       }
       const presetConfig = getPreset(selectedPreset);
       updatedConfig = applyConfigUpdates(config2, presetConfig);
@@ -24735,13 +24811,15 @@ ${pc30.bold("SMTP Credentials for Legacy Systems")}
         "Credentials will be shown ONCE after deployment - save them immediately!"
       );
       console.log("");
-      const confirmCreate = await clack29.confirm({
-        message: "Create SMTP credentials?",
-        initialValue: true
-      });
-      if (clack29.isCancel(confirmCreate) || !confirmCreate) {
-        clack29.log.info("SMTP credentials not created.");
-        process.exit(0);
+      if (!options.yes) {
+        const confirmCreate = await clack29.confirm({
+          message: "Create SMTP credentials?",
+          initialValue: true
+        });
+        if (clack29.isCancel(confirmCreate) || !confirmCreate) {
+          clack29.log.info("SMTP credentials not created.");
+          process.exit(0);
+        }
       }
       updatedConfig = {
         ...config2,
@@ -25054,7 +25132,7 @@ ${pc30.bold("Cost Impact:")}`);
     throw new Error(`Pulumi upgrade failed: ${msg}`);
   }
   let dnsAutoCreated = false;
-  if (outputs.domain && outputs.dkimTokens && outputs.dkimTokens.length > 0) {
+  if (!isJsonMode() && outputs.domain && outputs.dkimTokens && outputs.dkimTokens.length > 0) {
     let dnsProvider = metadata.services.email?.dnsProvider;
     if (!dnsProvider) {
       const availableProviders = await progress.execute(
@@ -27878,6 +27956,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 function buildConsolePolicyDocument(emailConfig, smsConfig) {
   const statements = [];
   statements.push({
@@ -31761,6 +31840,7 @@ init_aws();
 init_fs();
 init_metadata();
 init_output();
+init_pulumi();
 async function dashboard(options) {
   await ensurePulumiInstalled();
   clack36.intro(pc39.bold("Wraps Dashboard"));
@@ -31995,6 +32075,7 @@ init_aws();
 init_fs();
 init_json_output();
 init_output();
+init_pulumi();
 import * as clack38 from "@clack/prompts";
 import * as pulumi23 from "@pulumi/pulumi";
 import pc41 from "picocolors";
@@ -32944,6 +33025,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 async function smsDestroy(options) {
   await ensurePulumiInstalled();
   const startTime = Date.now();
@@ -33177,6 +33259,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 
 // src/utils/sms/costs.ts
 init_esm_shims();
@@ -34236,6 +34319,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 import * as clack42 from "@clack/prompts";
 import * as pulumi27 from "@pulumi/pulumi";
 import pc45 from "picocolors";
@@ -34358,6 +34442,7 @@ init_fs();
 init_json_output();
 init_metadata();
 init_output();
+init_pulumi();
 async function smsSync(options) {
   await ensurePulumiInstalled();
   const startTime = Date.now();
@@ -34795,6 +34880,7 @@ init_json_output();
 init_metadata();
 init_output();
 init_prompts();
+init_pulumi();
 async function smsUpgrade(options) {
   const startTime = Date.now();
   let upgradeAction = "";
@@ -36769,6 +36855,12 @@ args.options([
     description: "Resend verification code",
     defaultValue: false
   },
+  // Email upgrade options
+  {
+    name: "action",
+    description: "Upgrade action (preset, smtp-credentials, events, archiving, etc.)",
+    defaultValue: void 0
+  },
   // Email test options
   {
     name: "scenario",
@@ -37120,7 +37212,9 @@ async function run() {
             region: flags.region,
             yes: flags.yes,
             preview: flags.preview,
-            json: flags.json
+            json: flags.json,
+            action: flags.action,
+            preset: flags.preset
           });
           break;
         case "restore":