sst 2.0.0-rc.45 → 2.0.0-rc.47

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,10 +58,10 @@ 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) => {
+            prefix(evt.properties.requestID);
             const { started } = pending.get(evt.properties.requestID);
             for (let line of evt.properties.message.split("\n")) {
                 Colors.line(prefix(evt.properties.requestID), Colors.dim(("+" + (Date.now() - started) + "ms").padEnd(7)), Colors.dim(line));

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/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,8 +18,10 @@ export const DeploymentUI = (props) => {
                 return;
             setResources((previous) => {
                 if (Stacks.isFinal(event.ResourceStatus)) {
-                    const readable = Stacks.logicalIdToCdkPath(props.assembly, event.StackName, event.LogicalResourceId);
-                    Colors.line(Colors.warning(Colors.prefix), Colors.dim(`${event.StackName} ${readable} ${event.ResourceType}`), 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;
@@ -45,31 +46,29 @@ export const DeploymentUI = (props) => {
     }
     return (React.createElement(Box, { flexDirection: "column" },
         Object.entries(resources).map(([_, evt]) => {
-            const readable = Stacks.logicalIdToCdkPath(props.assembly, evt.StackName, evt.LogicalResourceId);
+            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,
-                    " ",
-                    readable,
-                    " ",
-                    evt.ResourceType,
+                    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) {
     // Print success stacks
-    const success = Object.entries(results)
-        .filter(([_stack, result]) => Object.keys(result.errors).length === 0);
+    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`));
+        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"))
@@ -80,7 +79,7 @@ export function printDeploymentResults(assembly, results) {
                     return false;
                 return true;
             });
-            Colors.line(`   ${Colors.dim(stack)}`);
+            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];
@@ -90,18 +89,29 @@ export function printDeploymentResults(assembly, results) {
         }
     }
     // Print failed stacks
-    const failed = Object.entries(results)
-        .filter(([_stack, result]) => Object.keys(result.errors).length > 0);
+    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 failed) {
-            Colors.line(`   ${Colors.dim(stack)}`);
+            Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
             for (const [id, error] of Object.entries(result.errors)) {
-                const readable = Stacks.logicalIdToCdkPath(assembly, stack, id);
+                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.45",
+  "version": "2.0.0-rc.47",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -1101,17 +1101,6 @@ async function loadAssembly(from) {
   const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
   return new CloudAssembly(from);
 }
-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 logicalId;
-  }
-  return found.split("/").filter(Boolean).slice(1, -1).join("/");
-}
 var init_assembly = __esm({
   "src/stacks/assembly.ts"() {
     "use strict";
@@ -3872,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(
@@ -3889,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";
@@ -4004,7 +4008,6 @@ __export(stacks_exports, {
   isSuccess: () => isSuccess,
   load: () => load,
   loadAssembly: () => loadAssembly,
-  logicalIdToCdkPath: () => logicalIdToCdkPath,
   metadata: () => metadata,
   metadataForStack: () => metadataForStack,
   monitor: () => monitor,
@@ -5134,10 +5137,12 @@ import React, { useState, useEffect } from "react";
 import { Box, Text } from "ink";
 import inkSpinner from "ink-spinner";
 function printDeploymentResults(assembly, results) {
-  const success = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length === 0);
+  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`));
+    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"))
@@ -5148,7 +5153,7 @@ function printDeploymentResults(assembly, results) {
           return false;
         return true;
       });
-      Colors.line(`   ${Colors.dim(stack)}`);
+      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];
@@ -5157,20 +5162,38 @@ function printDeploymentResults(assembly, results) {
       }
     }
   }
-  const failed = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length > 0);
+  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 failed) {
-      Colors.line(`   ${Colors.dim(stack)}`);
+      Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
       for (const [id, error2] of Object.entries(result.errors)) {
-        const readable = stacks_exports.logicalIdToCdkPath(assembly, stack, id);
+        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"() {
@@ -5178,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) => {
@@ -5192,10 +5214,18 @@ var init_deploy2 = __esm({
             return;
           setResources((previous2) => {
             if (stacks_exports.isFinal(event2.ResourceStatus)) {
-              const readable = stacks_exports.logicalIdToCdkPath(props.assembly, event2.StackName, event2.LogicalResourceId);
+              const readable = logicalIdToCdkPath(
+                props.assembly,
+                event2.StackName,
+                event2.LogicalResourceId
+              );
               Colors.line(
                 Colors.warning(Colors.prefix),
-                Colors.dim(`${event2.StackName} ${readable} ${event2.ResourceType}`),
+                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)
               );
               const { [event2.LogicalResourceId]: _, ...next } = previous2;
@@ -5219,9 +5249,13 @@ var init_deploy2 = __esm({
         return "yellow";
       }
       return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, Object.entries(resources).map(([_, evt]) => {
-        const readable = stacks_exports.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), "  ", evt.StackName, " ", readable, " ", 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), "  ")));
+        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..."))));
     };
   }
 });
@@ -5416,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:");
@@ -5981,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"),
@@ -6006,6 +6040,7 @@ var dev = (program2) => program2.command(
         );
       });
       bus.subscribe("worker.stdout", async (evt) => {
+        prefix(evt.properties.requestID);
         const { started } = pending.get(evt.properties.requestID);
         for (let line of evt.properties.message.split("\n")) {
           Colors.line(
@@ -6123,9 +6158,7 @@ var dev = (program2) => program2.command(
         pending = void 0;
         if (lastDeployed)
           console.log();
-        const component = render(
-          /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
-        );
+        const component = render(/* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly }));
         const results = await Stacks.deployMany(assembly.stacks);
         component.clear();
         component.unmount();

package/stacks/assembly.d.ts

@@ -1,3 +1 @@
-import type { CloudAssembly } from "aws-cdk-lib/cx-api";
-export declare function loadAssembly(from: string): Promise<CloudAssembly>;
-export declare function logicalIdToCdkPath(assembly: CloudAssembly, stack: string, logicalId: string): string;
+export declare function loadAssembly(from: string): Promise<import("aws-cdk-lib/cx-api").CloudAssembly>;

package/stacks/assembly.js

@@ -2,14 +2,3 @@ export async function loadAssembly(from) {
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     return new CloudAssembly(from);
 }
-export 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 logicalId;
-    }
-    return found
-        .split("/")
-        .filter(Boolean)
-        .slice(1, -1)
-        .join("/");
-}

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(" ");
+}