sst 2.0.0-rc.44 → 2.0.0-rc.46

package/cli/commands/deploy.js

@@ -44,7 +44,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         Colors.line(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
     }
-    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+    const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
     const results = await Stacks.deployMany(assembly.stacks);
     component.clear();
     component.unmount();

package/cli/commands/dev.js

@@ -39,16 +39,18 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         const colors = ["#01cdfe", "#ff71ce", "#05ffa1", "#b967ff"];
         let index = 0;
         const pending = new Map();
-        function start(requestID) {
+        function prefix(requestID) {
+            const exists = pending.get(requestID);
+            if (exists) {
+                return Colors.hex(exists.color)(Colors.prefix);
+            }
             pending.set(requestID, {
                 requestID,
                 started: Date.now(),
                 color: colors[index % colors.length],
             });
             index++;
-        }
-        function prefix(requestID) {
-            return Colors.hex(pending.get(requestID).color)(Colors.prefix);
+            return prefix(requestID);
         }
         function end(requestID) {
             // index--;
@@ -56,7 +58,6 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             pending.delete(requestID);
         }
         bus.subscribe("function.invoked", async (evt) => {
-            start(evt.properties.requestID);
             Colors.line(prefix(evt.properties.requestID), Colors.dim.bold("Invoked"), Colors.dim(useFunctions().fromID(evt.properties.functionID).handler));
         });
         bus.subscribe("worker.stdout", async (evt) => {
@@ -160,7 +161,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             pending = undefined;
             if (lastDeployed)
                 console.log();
-            const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+            const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
             const results = await Stacks.deployMany(assembly.stacks);
             component.clear();
             component.unmount();

package/cli/commands/plugins/pothos.js

@@ -18,7 +18,6 @@ export const usePothosBuilder = Context.memo(() => {
             await fs.writeFile(route.output, schema);
             // bus.publish("pothos.extracted", { file: route.output });
             await Promise.all(route.commands.map((cmd) => execAsync(cmd)));
-            Colors.line(Colors.prefix);
             Colors.line(Colors.success(`✔`), " Extracted pothos schema");
         }
         catch (ex) {

package/cli/commands/remove.js

@@ -32,7 +32,7 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
     }
-    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+    const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
     const results = await Stacks.removeMany(target);
     component.clear();
     component.unmount();

package/cli/ui/deploy.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" resolution-mode="require"/>
 import { Stacks } from "../../stacks/index.js";
-import { CloudAssembly } from "aws-cdk-lib/cx-api";
+import type { CloudAssembly } from "aws-cdk-lib/cx-api";
 interface Props {
-    stacks: string[];
+    assembly: CloudAssembly;
 }
 export declare const DeploymentUI: (props: Props) => JSX.Element;
 export declare function printDeploymentResults(assembly: CloudAssembly, results: Awaited<ReturnType<typeof Stacks.deployMany>>): void;

package/cli/ui/deploy.js

@@ -4,13 +4,12 @@ import { useBus } from "../../bus.js";
 import { Stacks } from "../../stacks/index.js";
 import inkSpinner from "ink-spinner";
 import { Colors } from "../colors.js";
+import { useProject } from "../../project.js";
 // @ts-ignore
 const { default: Spinner } = inkSpinner;
 export const DeploymentUI = (props) => {
     const [resources, setResources] = useState({});
     useEffect(() => {
-        Colors.gap();
-        Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold(`Deploying...`)}`);
         Colors.gap();
         const bus = useBus();
         const event = bus.subscribe("stack.event", (payload) => {
@@ -19,7 +18,10 @@ export const DeploymentUI = (props) => {
                 return;
             setResources((previous) => {
                 if (Stacks.isFinal(event.ResourceStatus)) {
-                    Colors.line(Colors.warning(Colors.prefix), Colors.dim(`${event.StackName} ${event.ResourceType} ${event.LogicalResourceId}`), Stacks.isFailed(event.ResourceStatus)
+                    const readable = logicalIdToCdkPath(props.assembly, event.StackName, event.LogicalResourceId);
+                    Colors.line(Colors.warning(Colors.prefix), readable
+                        ? Colors.dim(`${stackNameToId(event.StackName)} ${readable} ${event.ResourceType}`)
+                        : Colors.dim(`${stackNameToId(event.StackName)} ${event.ResourceType}`), Stacks.isFailed(event.ResourceStatus)
                         ? Colors.danger(event.ResourceStatus)
                         : Colors.dim(event.ResourceStatus));
                     const { [event.LogicalResourceId]: _, ...next } = previous;
@@ -44,64 +46,72 @@ export const DeploymentUI = (props) => {
     }
     return (React.createElement(Box, { flexDirection: "column" },
         Object.entries(resources).map(([_, evt]) => {
+            const readable = logicalIdToCdkPath(props.assembly, evt.StackName, evt.LogicalResourceId);
             return (React.createElement(Box, { key: evt.LogicalResourceId },
                 React.createElement(Text, null,
                     React.createElement(Spinner, null),
                     "  ",
-                    evt.StackName,
-                    " ",
-                    evt.ResourceType,
-                    " ",
-                    evt.LogicalResourceId,
+                    readable
+                        ? `${stackNameToId(evt.StackName)} ${readable} ${evt.ResourceType}`
+                        : `${stackNameToId(evt.StackName)} ${evt.ResourceType}`,
                     " "),
                 React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus)));
         }),
         Object.entries(resources).length === 0 && (React.createElement(Box, null,
             React.createElement(Text, null,
                 React.createElement(Spinner, null),
-                "  ")))));
+                "  ",
+                React.createElement(Text, { dimColor: true }, "Deploying..."))))));
 };
 export function printDeploymentResults(assembly, results) {
-    Colors.gap();
-    Colors.line(Colors.success(`✔`), Colors.bold(` Deployed`));
-    for (const [stack, result] of Object.entries(results)) {
-        if (Object.values(result.errors).length)
-            continue;
-        const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-            if (key.startsWith("Export"))
-                return false;
-            if (key.includes("SstSiteEnv"))
-                return false;
-            if (key === "SSTMetadata")
-                return false;
-            return true;
-        });
-        Colors.line(`   ${Colors.dim(stack)}`);
-        if (outputs.length > 0) {
-            for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
-                const value = result.outputs[key];
-                Colors.line(`   ${Colors.bold.dim(key)}: ${value}`);
+    // Print success stacks
+    const success = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length === 0);
+    if (success.length) {
+        Colors.gap();
+        Colors.line(Colors.success(`✔`), Colors.bold(` Deployed:`));
+        for (const [stack, result] of success) {
+            const outputs = Object.entries(result.outputs).filter(([key, _]) => {
+                if (key.startsWith("Export"))
+                    return false;
+                if (key.includes("SstSiteEnv"))
+                    return false;
+                if (key === "SSTMetadata")
+                    return false;
+                return true;
+            });
+            Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
+            if (outputs.length > 0) {
+                for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
+                    const value = result.outputs[key];
+                    Colors.line(`   ${Colors.bold.dim(key + ":")} ${value}`);
+                }
             }
         }
     }
-    Colors.gap();
-    if (Object.values(results).flatMap((s) => Object.keys(s.errors)).length) {
+    // Print failed stacks
+    const failed = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length > 0);
+    if (failed.length) {
+        Colors.gap();
         Colors.line(`${Colors.danger(`✖`)}  ${Colors.bold.dim(`Errors`)}`);
-        for (const [stack, result] of Object.entries(results)) {
-            const hasErrors = Object.entries(result.errors).length > 0;
-            if (!hasErrors)
-                continue;
-            Colors.line(`   ${Colors.dim(stack)}`);
+        for (const [stack, result] of failed) {
+            Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
             for (const [id, error] of Object.entries(result.errors)) {
-                const found = Object.entries(assembly.manifest.artifacts?.[stack].metadata || {}).find(([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === id)?.[0] || "";
-                const readable = found
-                    .split("/")
-                    .filter(Boolean)
-                    .slice(1, -1)
-                    .join("/");
-                Colors.line(`  ${Colors.danger.bold(readable)}: ${error}`);
+                const readable = logicalIdToCdkPath(assembly, stack, id) || id;
+                Colors.line(`   ${Colors.danger.bold(readable + ":")} ${error}`);
             }
         }
         Colors.gap();
     }
 }
+function stackNameToId(stack) {
+    const project = useProject();
+    const prefix = `${project.config.stage}-${project.config.name}-`;
+    return stack.startsWith(prefix) ? stack.substring(prefix.length) : stack;
+}
+function logicalIdToCdkPath(assembly, stack, logicalId) {
+    const found = Object.entries(assembly.manifest.artifacts?.[stack].metadata || {}).find(([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === logicalId)?.[0];
+    if (!found) {
+        return;
+    }
+    return found.split("/").filter(Boolean).slice(1, -1).join("/");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.44",
+  "version": "2.0.0-rc.46",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -3861,7 +3861,7 @@ async function synth(opts) {
     if (missing && missing.length) {
       const next = missing.map((x) => x.key);
       if (next.length === previous2.size && next.every((x) => previous2.has(x)))
-        throw new VisibleError(`Could not resolve context values for ${next}`);
+        throw new VisibleError(formatErrorMessage(next.join("")));
       Logger.debug("Looking up context for:", next, "Previous:", previous2);
       previous2 = new Set(next);
       await contextproviders.provideContextValues(
@@ -3878,6 +3878,21 @@ async function synth(opts) {
     return assembly;
   }
 }
+function formatErrorMessage(message) {
+  return formatCustomDomainError(message) || `Could not resolve context values for ${message}`;
+}
+function formatCustomDomainError(message) {
+  const ret = message.match(/hosted-zone:account=\d+:domainName=(\S+):/);
+  if (!ret) {
+    return;
+  }
+  const hostedZone = ret && ret[1];
+  return [
+    `It seems you are configuring custom domains for you URL.`,
+    hostedZone ? `And SST is not able to find the hosted zone "${hostedZone}" in your AWS Route 53 account.` : `And SST is not able to find the hosted zone in your AWS Route 53 account.`,
+    `Please double check and make sure the zone exists, or pass in a different zone.`
+  ].join(" ");
+}
 var init_synth = __esm({
   "src/stacks/synth.ts"() {
     "use strict";
@@ -5122,49 +5137,63 @@ import React, { useState, useEffect } from "react";
 import { Box, Text } from "ink";
 import inkSpinner from "ink-spinner";
 function printDeploymentResults(assembly, results) {
-  Colors.gap();
-  Colors.line(Colors.success(`\u2714`), Colors.bold(` Deployed`));
-  for (const [stack, result] of Object.entries(results)) {
-    if (Object.values(result.errors).length)
-      continue;
-    const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-      if (key.startsWith("Export"))
-        return false;
-      if (key.includes("SstSiteEnv"))
-        return false;
-      if (key === "SSTMetadata")
-        return false;
-      return true;
-    });
-    Colors.line(`   ${Colors.dim(stack)}`);
-    if (outputs.length > 0) {
-      for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
-        const value = result.outputs[key];
-        Colors.line(`   ${Colors.bold.dim(key)}: ${value}`);
+  const success = Object.entries(results).filter(
+    ([_stack, result]) => Object.keys(result.errors).length === 0
+  );
+  if (success.length) {
+    Colors.gap();
+    Colors.line(Colors.success(`\u2714`), Colors.bold(` Deployed:`));
+    for (const [stack, result] of success) {
+      const outputs = Object.entries(result.outputs).filter(([key, _]) => {
+        if (key.startsWith("Export"))
+          return false;
+        if (key.includes("SstSiteEnv"))
+          return false;
+        if (key === "SSTMetadata")
+          return false;
+        return true;
+      });
+      Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
+      if (outputs.length > 0) {
+        for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
+          const value = result.outputs[key];
+          Colors.line(`   ${Colors.bold.dim(key + ":")} ${value}`);
+        }
       }
     }
   }
-  Colors.gap();
-  if (Object.values(results).flatMap((s) => Object.keys(s.errors)).length) {
+  const failed = Object.entries(results).filter(
+    ([_stack, result]) => Object.keys(result.errors).length > 0
+  );
+  if (failed.length) {
+    Colors.gap();
     Colors.line(`${Colors.danger(`\u2716`)}  ${Colors.bold.dim(`Errors`)}`);
-    for (const [stack, result] of Object.entries(results)) {
-      const hasErrors = Object.entries(result.errors).length > 0;
-      if (!hasErrors)
-        continue;
-      Colors.line(`   ${Colors.dim(stack)}`);
+    for (const [stack, result] of failed) {
+      Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
       for (const [id, error2] of Object.entries(result.errors)) {
-        const found = Object.entries(
-          assembly.manifest.artifacts?.[stack].metadata || {}
-        ).find(
-          ([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === id
-        )?.[0] || "";
-        const readable = found.split("/").filter(Boolean).slice(1, -1).join("/");
-        Colors.line(`  ${Colors.danger.bold(readable)}: ${error2}`);
+        const readable = logicalIdToCdkPath(assembly, stack, id) || id;
+        Colors.line(`   ${Colors.danger.bold(readable + ":")} ${error2}`);
       }
     }
     Colors.gap();
   }
 }
+function stackNameToId(stack) {
+  const project = useProject();
+  const prefix = `${project.config.stage}-${project.config.name}-`;
+  return stack.startsWith(prefix) ? stack.substring(prefix.length) : stack;
+}
+function logicalIdToCdkPath(assembly, stack, logicalId) {
+  const found = Object.entries(
+    assembly.manifest.artifacts?.[stack].metadata || {}
+  ).find(
+    ([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === logicalId
+  )?.[0];
+  if (!found) {
+    return;
+  }
+  return found.split("/").filter(Boolean).slice(1, -1).join("/");
+}
 var Spinner, DeploymentUI;
 var init_deploy2 = __esm({
   "src/cli/ui/deploy.tsx"() {
@@ -5172,12 +5201,11 @@ var init_deploy2 = __esm({
     init_bus();
     init_stacks();
     init_colors();
+    init_project();
     ({ default: Spinner } = inkSpinner);
     DeploymentUI = (props) => {
       const [resources, setResources] = useState({});
       useEffect(() => {
-        Colors.gap();
-        Colors.line(`${Colors.primary(`\u279C`)}  ${Colors.bold(`Deploying...`)}`);
         Colors.gap();
         const bus = useBus();
         const event = bus.subscribe("stack.event", (payload) => {
@@ -5186,10 +5214,17 @@ var init_deploy2 = __esm({
             return;
           setResources((previous2) => {
             if (stacks_exports.isFinal(event2.ResourceStatus)) {
+              const readable = logicalIdToCdkPath(
+                props.assembly,
+                event2.StackName,
+                event2.LogicalResourceId
+              );
               Colors.line(
                 Colors.warning(Colors.prefix),
-                Colors.dim(
-                  `${event2.StackName} ${event2.ResourceType} ${event2.LogicalResourceId}`
+                readable ? Colors.dim(
+                  `${stackNameToId(event2.StackName)} ${readable} ${event2.ResourceType}`
+                ) : Colors.dim(
+                  `${stackNameToId(event2.StackName)} ${event2.ResourceType}`
                 ),
                 stacks_exports.isFailed(event2.ResourceStatus) ? Colors.danger(event2.ResourceStatus) : Colors.dim(event2.ResourceStatus)
               );
@@ -5214,8 +5249,13 @@ var init_deploy2 = __esm({
         return "yellow";
       }
       return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, Object.entries(resources).map(([_, evt]) => {
-        return /* @__PURE__ */ React.createElement(Box, { key: evt.LogicalResourceId }, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", evt.StackName, " ", evt.ResourceType, " ", evt.LogicalResourceId, " "), /* @__PURE__ */ React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus));
-      }), Object.entries(resources).length === 0 && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ")));
+        const readable = logicalIdToCdkPath(
+          props.assembly,
+          evt.StackName,
+          evt.LogicalResourceId
+        );
+        return /* @__PURE__ */ React.createElement(Box, { key: evt.LogicalResourceId }, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", readable ? `${stackNameToId(evt.StackName)} ${readable} ${evt.ResourceType}` : `${stackNameToId(evt.StackName)} ${evt.ResourceType}`, " "), /* @__PURE__ */ React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus));
+      }), Object.entries(resources).length === 0 && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Deploying..."))));
     };
   }
 });
@@ -5410,7 +5450,6 @@ var init_pothos2 = __esm({
           });
           await fs15.writeFile(route.output, schema);
           await Promise.all(route.commands.map((cmd) => execAsync4(cmd)));
-          Colors.line(Colors.prefix);
           Colors.line(Colors.success(`\u2714`), " Extracted pothos schema");
         } catch (ex) {
           Colors.line(Colors.danger(`\u2716`), " Failed to extract schema from pothos:");
@@ -5975,22 +6014,23 @@ var dev = (program2) => program2.command(
       const colors = ["#01cdfe", "#ff71ce", "#05ffa1", "#b967ff"];
       let index = 0;
       const pending = /* @__PURE__ */ new Map();
-      function start(requestID) {
+      function prefix(requestID) {
+        const exists = pending.get(requestID);
+        if (exists) {
+          return Colors.hex(exists.color)(Colors.prefix);
+        }
         pending.set(requestID, {
           requestID,
           started: Date.now(),
           color: colors[index % colors.length]
         });
         index++;
-      }
-      function prefix(requestID) {
-        return Colors.hex(pending.get(requestID).color)(Colors.prefix);
+        return prefix(requestID);
       }
       function end(requestID) {
         pending.delete(requestID);
       }
       bus.subscribe("function.invoked", async (evt) => {
-        start(evt.properties.requestID);
         Colors.line(
           prefix(evt.properties.requestID),
           Colors.dim.bold("Invoked"),
@@ -6118,7 +6158,7 @@ var dev = (program2) => program2.command(
         if (lastDeployed)
           console.log();
         const component = render(
-          /* @__PURE__ */ React2.createElement(DeploymentUI2, { stacks: assembly.stacks.map((s) => s.stackName) })
+          /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
         );
         const results = await Stacks.deployMany(assembly.stacks);
         component.clear();
@@ -6301,7 +6341,7 @@ var deploy2 = (program2) => program2.command(
       process.exit(1);
     }
     const component = render(
-      /* @__PURE__ */ React2.createElement(DeploymentUI2, { stacks: assembly.stacks.map((s) => s.stackName) })
+      /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
     );
     const results = await Stacks.deployMany(assembly.stacks);
     component.clear();
@@ -6358,7 +6398,7 @@ var remove2 = (program2) => program2.command(
       process.exit(1);
     }
     const component = render(
-      /* @__PURE__ */ React2.createElement(DeploymentUI2, { stacks: assembly.stacks.map((s) => s.stackName) })
+      /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
     );
     const results = await Stacks.removeMany(target);
     component.clear();

package/stacks/synth.js

@@ -58,7 +58,7 @@ export async function synth(opts) {
         if (missing && missing.length) {
             const next = missing.map((x) => x.key);
             if (next.length === previous.size && next.every((x) => previous.has(x)))
-                throw new VisibleError(`Could not resolve context values for ${next}`);
+                throw new VisibleError(formatErrorMessage(next.join("")));
             Logger.debug("Looking up context for:", next, "Previous:", previous);
             previous = new Set(next);
             await contextproviders.provideContextValues(missing, cfg.context, provider);
@@ -71,3 +71,21 @@ export async function synth(opts) {
         return assembly;
     }
 }
+function formatErrorMessage(message) {
+    return formatCustomDomainError(message)
+        || `Could not resolve context values for ${message}`;
+}
+function formatCustomDomainError(message) {
+    const ret = message.match(/hosted-zone:account=\d+:domainName=(\S+):/);
+    if (!ret) {
+        return;
+    }
+    const hostedZone = ret && ret[1];
+    return [
+        `It seems you are configuring custom domains for you URL.`,
+        hostedZone
+            ? `And SST is not able to find the hosted zone "${hostedZone}" in your AWS Route 53 account.`
+            : `And SST is not able to find the hosted zone in your AWS Route 53 account.`,
+        `Please double check and make sure the zone exists, or pass in a different zone.`,
+    ].join(" ");
+}