@wraps.dev/cli 3.17.1 → 3.17.3

package/dist/cli.js

@@ -22265,6 +22265,12 @@ Saved regions: ${savedRegions.join(", ")}` : "Pass --region or set AWS_REGION.\n
         `Usage: ${usage}`,
         "https://wraps.dev/docs/cli-reference"
       ),
+      invalidFlagUsage: (message, suggestion) => new WrapsError(
+        message,
+        "INVALID_FLAG_USAGE",
+        suggestion,
+        "https://wraps.dev/docs/cli-reference"
+      ),
       pulumiError: (message) => new WrapsError(
         `Infrastructure deployment failed: ${message}`,
         "PULUMI_ERROR",
@@ -47259,7 +47265,8 @@ function parseCliArgs(argv) {
   }
   return {
     flags: flags2,
-    sub: parsed._
+    sub: parsed._,
+    extraPositionals: parsed._.slice(4)
   };
 }
 
@@ -50210,7 +50217,22 @@ function reportInboundDNSCleanup(result, domain) {
     console.log();
   }
 }
+function assertValidInboundFlags(options) {
+  if (options.unexpectedArg) {
+    throw errors.invalidFlagUsage(
+      `Unexpected argument: ${options.unexpectedArg}`,
+      `--root takes no value: "--root ${options.unexpectedArg}" (or "--root=${options.unexpectedArg}") sets --root and discards "${options.unexpectedArg}". To name the parent domain use --domain (inbound add); to pick the label use --subdomain <label> (inbound add) or --domain <label> (inbound init).`
+    );
+  }
+  if (options.root && options.subdomain) {
+    throw errors.invalidFlagUsage(
+      "--root and --subdomain cannot be used together",
+      "--root receives mail on the parent domain itself; --subdomain <label> receives mail on <label>.<parent>. Pick one."
+    );
+  }
+}
 async function inboundInit(options) {
+  assertValidInboundFlags(options);
   if (!isJsonMode()) {
     clack27.intro(
       pc28.bold(
@@ -51116,6 +51138,7 @@ Enable it: ${pc28.cyan("wraps email inbound init")}
   console.log();
 }
 async function inboundAdd(options) {
+  assertValidInboundFlags(options);
   if (!isJsonMode()) {
     clack27.intro(pc28.bold("Add Inbound Receiving Domain"));
   }
@@ -55872,6 +55895,30 @@ import { join as join19 } from "path";
 import * as clack41 from "@clack/prompts";
 import pc42 from "picocolors";
 
+// src/utils/email/template-push-state.ts
+init_esm_shims();
+function isTemplateUnchanged(input) {
+  const { entry, sourceHash, existsRemotely, dashboardConfigured, force } = input;
+  if (force || !entry || entry.localHash !== sourceHash || !existsRemotely) {
+    return false;
+  }
+  return !dashboardConfigured || entry.remoteHash === sourceHash;
+}
+function nextTemplateEntry(input) {
+  const { previous, sourceHash, sesTemplateName, sesOk, apiResult, now } = input;
+  const apiOk = apiResult?.success === true;
+  if (!(sesOk || apiOk)) {
+    return;
+  }
+  return {
+    id: apiOk ? apiResult?.id : previous?.id,
+    localHash: sourceHash,
+    remoteHash: apiOk ? sourceHash : previous?.remoteHash,
+    sesTemplateName,
+    lastPushed: now
+  };
+}
+
 // src/utils/email/template-render.ts
 init_esm_shims();
 async function renderTemplateWithProxy(Component) {
@@ -56073,14 +56120,20 @@ async function templatesPush(options) {
   const compiled = [];
   const unchanged = [];
   const compileErrors = [];
+  const dashboardConfigured = checkApiTarget(target).ok;
   for (const file of templateFiles) {
     const slug = file.replace(/\.tsx?$/, "");
     const filePath = join19(templatesDir, file);
     const source = await readFile8(filePath, "utf-8");
     const sourceHash = sha256(source);
-    const localHashMatches = lockfile.templates[slug]?.localHash === sourceHash;
     const existsRemotely = remoteTemplateSlugs === null || remoteTemplateSlugs.has(slug);
-    if (!options.force && localHashMatches && existsRemotely) {
+    if (isTemplateUnchanged({
+      entry: lockfile.templates[slug],
+      sourceHash,
+      existsRemotely,
+      dashboardConfigured,
+      force: options.force === true
+    })) {
       unchanged.push(slug);
       continue;
     }
@@ -56154,17 +56207,16 @@ async function templatesPush(options) {
   const sesSucceeded = compiled.filter((t) => !sesFailed.has(t.slug));
   const apiResults = sesSucceeded.length > 0 ? await pushToAPI(sesSucceeded, target, progress, options.force, org?.id) : [];
   for (const t of compiled) {
-    const sesOk = sesResults.find((r6) => r6.slug === t.slug)?.success;
-    const apiResult = apiResults.find((r6) => r6.slug === t.slug);
-    const apiOk = apiResult?.success;
-    if (sesOk || apiOk) {
-      lockfile.templates[t.slug] = {
-        id: apiResult?.id,
-        localHash: t.sourceHash,
-        remoteHash: t.sourceHash,
-        sesTemplateName: t.sesTemplateName,
-        lastPushed: (/* @__PURE__ */ new Date()).toISOString()
-      };
+    const entry = nextTemplateEntry({
+      previous: lockfile.templates[t.slug],
+      sourceHash: t.sourceHash,
+      sesTemplateName: t.sesTemplateName,
+      sesOk: sesResults.find((r6) => r6.slug === t.slug)?.success === true,
+      apiResult: apiResults.find((r6) => r6.slug === t.slug),
+      now: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    if (entry) {
+      lockfile.templates[t.slug] = entry;
     }
   }
   lockfile.lastSync = (/* @__PURE__ */ new Date()).toISOString();
@@ -71942,7 +71994,7 @@ if (process.argv.includes("--help") || process.argv.includes("-h")) {
 }
 var parsedCli = parseCliArgs(process.argv);
 var flags = parsedCli.flags;
-var { sub } = parsedCli;
+var { sub, extraPositionals } = parsedCli;
 var [primaryCommand, subCommand] = sub;
 setJsonMode(flags.json === true);
 if (!primaryCommand) {
@@ -72126,6 +72178,12 @@ async function run() {
     telemetry.markNotificationShown();
   }
   try {
+    if (extraPositionals.length > 0) {
+      throw errors.invalidFlagUsage(
+        `Unrecognized argument${extraPositionals.length > 1 ? "s" : ""}: ${extraPositionals.join(" ")}`,
+        "A boolean flag (such as --root or --json) takes no value, so a value after it is discarded. Check the flags before these arguments, or run the command with --help."
+      );
+    }
     if (primaryCommand === "email" && subCommand) {
       switch (subCommand) {
         case "init":
@@ -72263,7 +72321,8 @@ async function run() {
                 root: flags.root,
                 yes: flags.yes,
                 preview: flags.preview,
-                json: flags.json
+                json: flags.json,
+                unexpectedArg: sub[3]
               });
               break;
             case "destroy":
@@ -72300,7 +72359,8 @@ async function run() {
                 root: flags.root,
                 domain: flags.domain,
                 yes: flags.yes,
-                json: flags.json
+                json: flags.json,
+                unexpectedArg: sub[3]
               });
               break;
             case "remove":
@@ -72556,13 +72616,17 @@ async function run() {
               break;
             case "validate":
               await workflowsValidate({
-                workflow: flags.workflow,
+                // Positional slug (`wraps email workflows validate my-slug`)
+                // falls back to --workflow, matching templates push.
+                workflow: sub[3] || flags.workflow,
                 json: flags.json
               });
               break;
             case "push":
               await workflowsPush({
-                workflow: flags.workflow,
+                // Positional slug (`wraps email workflows push my-slug`)
+                // falls back to --workflow, matching templates push.
+                workflow: sub[3] || flags.workflow,
                 dryRun: flags.dryRun,
                 draft: flags.draft,
                 force: flags.force,