sst 2.0.0-rc.31 → 2.0.0-rc.34

package/bus.js

@@ -30,7 +30,7 @@ export const useBus = Context.memo(() => {
         unsubscribe(sub) {
             const arr = subscribers(sub.type);
             const index = arr.indexOf(sub);
-            if (!index)
+            if (index < 0)
                 return;
             arr.splice(index, 1);
         },

package/cli/colors.d.ts

@@ -0,0 +1,7 @@
+import chalk from "chalk";
+export declare const Colors: {
+    primary: chalk.Chalk;
+    link: chalk.Chalk;
+    success: chalk.Chalk;
+    danger: chalk.Chalk;
+};

package/cli/colors.js

@@ -0,0 +1,7 @@
+import chalk from "chalk";
+export const Colors = {
+    primary: chalk.hex("#E27152"),
+    link: chalk.cyan,
+    success: chalk.green,
+    danger: chalk.red,
+};

package/cli/commands/bind.d.ts

@@ -6,6 +6,8 @@ export declare const bind: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     command: string;
 }>;

package/cli/commands/build.d.ts

@@ -6,6 +6,8 @@ export declare const build: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     to: string | undefined;
 }>;

package/cli/commands/console.d.ts

@@ -6,4 +6,6 @@ export declare const consoleCommand: (program: Program) => Promise<import("yargs
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 }>>;

package/cli/commands/deploy.d.ts

@@ -7,9 +7,9 @@ export declare const deploy: (program: Program) => import("yargs").Argv<{
 } & {
     region: string | undefined;
 } & {
-    from: string | undefined;
+    verbose: boolean | undefined;
 } & {
-    fullscreen: boolean;
+    from: string | undefined;
 } & {
     filter: string | undefined;
 }>;

package/cli/commands/deploy.js

@@ -2,11 +2,6 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     .option("from", {
     type: "string",
     describe: "Deploy using previously built output",
-})
-    .option("fullscreen", {
-    type: "boolean",
-    describe: "Disable full screen UI",
-    default: true,
 })
     .positional("filter", {
     type: "string",
@@ -16,23 +11,33 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { printDeploymentResults } = await import("../ui/deploy.js");
     const { createSpinner } = await import("../spinner.js");
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
-    const { blue, bold } = await import("colorette");
+    const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
+    const { Colors } = await import("../colors.js");
     const project = useProject();
+    console.log();
+    console.log(`  ${Colors.primary(`${bold(`SST`)} v${project.version}`)}`);
+    console.log();
+    console.log(`  ${Colors.primary(`➜`)}  ${bold(`Stage:`)}   ${dim(project.config.stage)}`);
+    console.log();
     const assembly = await (async function () {
         if (args.from) {
             const result = new CloudAssembly(args.from);
             return result;
         }
-        const spinner = createSpinner("Building stacks");
+        const spinner = createSpinner({
+            text: " Building stacks",
+            indent: 2,
+        });
         const result = await Stacks.synth({
             fn: project.stacks,
             mode: "deploy",
         });
         spinner.succeed();
+        console.log();
         return result;
     })();
     const target = assembly.stacks.filter((s) => !args.filter ||
@@ -41,22 +46,11 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
     }
-    console.log(`Deploying ${bold(target.length + " stacks")} for stage ${blue(project.config.stage)}...`);
-    const cleanup = (() => {
-        if (args.fullscreen) {
-            process.stdout.write("\x1b[?1049h");
-            const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
-            return () => {
-                component.unmount();
-                process.stdout.write("\x1b[?1049l");
-            };
-        }
-        const spinner = createSpinner("Deploying stacks");
-        return () => spinner.succeed();
-    })();
-    const results = await Stacks.deployMany(target);
-    cleanup();
-    printDeploymentResults(results);
+    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+    const results = await Stacks.deployMany(assembly.stacks);
+    component.clear();
+    component.unmount();
+    printDeploymentResults(assembly, results);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
         process.exit(1);
     process.exit(0);

package/cli/commands/dev.d.ts

@@ -7,5 +7,5 @@ export declare const dev: (program: Program) => import("yargs").Argv<{
 } & {
     region: string | undefined;
 } & {
-    fullscreen: boolean;
+    verbose: boolean | undefined;
 }>;

package/cli/commands/dev.js

@@ -1,8 +1,7 @@
-export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs.option("fullscreen", {
-    type: "boolean",
-    describe: "Disable full screen UI",
-    default: true,
-}), async (args) => {
+import chalk from "chalk";
+import { Colors } from "../colors.js";
+import { Functions } from "../ui/functions.js";
+export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs, async (args) => {
     const { useRuntimeWorkers } = await import("../../runtime/workers.js");
     const { useIOTBridge } = await import("../../runtime/iot.js");
     const { useRuntimeServer } = await import("../../runtime/server.js");
@@ -33,36 +32,65 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
     }
     const useFunctionLogger = Context.memo(async () => {
+        const component = render(React.createElement(Functions, null));
         const bus = useBus();
+        /*
         bus.subscribe("function.invoked", async (evt) => {
-            console.log(bold(magenta(`Invoked `)), useFunctions().fromID(evt.properties.functionID).handler);
+          console.log(
+            bold(magenta(`  ➜ `)),
+            useFunctions().fromID(evt.properties.functionID).handler!
+          );
         });
+
         bus.subscribe("function.build.success", async (evt) => {
-            console.log(bold(gray(`Built   `)), useFunctions().fromID(evt.properties.functionID).handler);
+          console.log(
+            bold(gray(`Built   `)),
+            useFunctions().fromID(evt.properties.functionID).handler!
+          );
         });
         bus.subscribe("function.build.failed", async (evt) => {
-            console.log(bold(red(`Build failed `)), useFunctions().fromID(evt.properties.functionID).handler);
-            console.log(dim(evt.properties.errors.join("\n")));
+          console.log(
+            bold(red(`Build failed `)),
+            useFunctions().fromID(evt.properties.functionID).handler!
+          );
+          console.log(dim(evt.properties.errors.join("\n")));
         });
+
         bus.subscribe("worker.stdout", async (evt) => {
-            const { message } = evt.properties;
-            const lines = message.split("\n");
-            for (let i = 0; i < lines.length; i++) {
-                const line = lines[i];
-                lines[i] = "         " + line;
-            }
-            console.log(bold(blue(`Log     `)), useFunctions().fromID(evt.properties.functionID).handler);
-            console.log(dim(lines.join("\n")));
+          const { message } = evt.properties;
+          const lines = message.split("\n");
+          for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            lines[i] = "     " + line;
+          }
+          console.log(
+            bold(blue(`  ➜ `)),
+            useFunctions().fromID(evt.properties.functionID).handler!
+          );
+          console.log(dim(lines.join("\n")));
         });
+        */
+        /*
         bus.subscribe("function.success", async (evt) => {
-            console.log(bold(green(`Success `)), useFunctions().fromID(evt.properties.functionID).handler);
+          console.log(
+            bold(green(`  ✔ `)),
+            useFunctions().fromID(evt.properties.functionID).handler!
+          );
+          console.log();
         });
+        */
+        /*
         bus.subscribe("function.error", async (evt) => {
-            console.log(bold(red(`Error   `)), useFunctions().fromID(evt.properties.functionID).handler, evt.properties.errorMessage);
-            for (const line of evt.properties.trace || []) {
-                console.log(`         ${dim(line)}`);
-            }
+          console.log(
+            bold(red(`  ✖ `)),
+            useFunctions().fromID(evt.properties.functionID).handler!
+          );
+          console.log(`     ${Colors.danger(evt.properties.errorMessage)}`);
+          for (const line of evt.properties.trace || []) {
+            console.log(`     ${dim(line)}`);
+          }
         });
+        */
     });
     const useStackBuilder = Context.memo(async () => {
         const watcher = useWatcher();
@@ -72,7 +100,13 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         let pending;
         let isDeploying = false;
         async function build() {
-            const spinner = createSpinner("Building stacks").start();
+            const spinner = createSpinner({
+                indent: 2,
+                color: "gray",
+                text: lastDeployed
+                    ? ` Building stacks`
+                    : dim(` Checking for changes`),
+            }).start();
             try {
                 const [metafile, sstConfig] = await Stacks.load(project.paths.config);
                 project.metafile = metafile;
@@ -86,17 +120,27 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 const next = await checksum(assembly.directory);
                 Logger.debug("Checksum", "next", next, "old", lastDeployed);
                 if (next === lastDeployed) {
-                    spinner.succeed("Stacks built! No changes");
+                    spinner.succeed(" No changes");
+                    console.log();
                     return;
                 }
-                spinner.succeed(lastDeployed ? `Stacks built!` : `Stacks built!`);
+                if (!lastDeployed) {
+                    spinner.stop();
+                    spinner.clear();
+                }
+                else {
+                    spinner.succeed(` Stacks built!`);
+                }
                 pending = assembly;
                 if (lastDeployed)
-                    deploy();
+                    setTimeout(() => deploy(), 100);
             }
             catch (ex) {
                 spinner.fail();
-                console.error(ex);
+                console.log(ex.stack
+                    .split("\n")
+                    .map((line) => "     " + line)
+                    .join("\n"));
             }
         }
         async function deploy() {
@@ -108,22 +152,14 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             const assembly = pending;
             const nextChecksum = await checksum(assembly.directory);
             pending = undefined;
-            const cleanup = (() => {
-                if (args.fullscreen) {
-                    process.stdout.write("\x1b[?1049h");
-                    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
-                    return () => {
-                        component.unmount();
-                        process.stdout.write("\x1b[?1049l");
-                    };
-                }
-                const spinner = createSpinner("Deploying stacks");
-                return () => spinner.succeed();
-            })();
+            console.log();
+            const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
             const results = await Stacks.deployMany(assembly.stacks);
-            cleanup();
+            component.clear();
+            component.unmount();
+            render(React.createElement(Functions, null));
             lastDeployed = nextChecksum;
-            printDeploymentResults(results);
+            printDeploymentResults(assembly, results);
             const keys = await SiteEnv.keys();
             if (keys.length) {
                 const result = {};
@@ -169,10 +205,26 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         await build();
         await deploy();
     });
-    createSpinner("").start().succeed("Ready for function invocations");
-    createSpinner("")
-        .start()
-        .succeed(`Console ready at https://console.sst.dev`);
+    const project = useProject();
+    const primary = chalk.hex("#E27152");
+    const link = chalk.cyan;
+    console.clear();
+    console.log();
+    console.log(`  ${Colors.primary(`${bold(`SST`)} v${project.version}`)}  ${dim(`ready!`)}`);
+    console.log();
+    console.log(`  ${primary(`➜`)}  ${bold(`Stage:`)}   ${dim(project.config.stage)}`);
+    console.log(`  ${primary(`➜`)}  ${bold(`Console:`)} ${link(`https://console.sst.dev/${project.config.name}/${project.config.stage}`)}`);
+    /*
+    console.log(`  ${primary(`➜`)}  ${bold(dim(`Outputs:`))}`);
+    for (let i = 0; i < 3; i++) {
+      console.log(`       ${dim(`thdxr-scratch-MyStack`)}`);
+      console.log(
+        `       ${bold(
+          dim(`ApiEndpoint`)
+        )}: https://hdq3z0es2d.execute-api.us-east-1.amazonaws.com`
+      );
+    }
+    */
     await Promise.all([
         useLocalServer({
             key: "",

package/cli/commands/diff.d.ts

@@ -6,6 +6,8 @@ export declare const diff: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     dev: boolean | undefined;
 }>;

package/cli/commands/env.d.ts

@@ -6,6 +6,8 @@ export declare const env: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     command: string;
 }>;

package/cli/commands/remove.d.ts

@@ -7,9 +7,9 @@ export declare const remove: (program: Program) => import("yargs").Argv<{
 } & {
     region: string | undefined;
 } & {
-    from: string | undefined;
+    verbose: boolean | undefined;
 } & {
-    fullscreen: boolean;
+    from: string | undefined;
 } & {
     filter: string | undefined;
 }>;

package/cli/commands/remove.js

@@ -1,57 +1,43 @@
-export const remove = (program) => program.command("remove [filter]", "Remove your app from AWS", (yargs) => yargs
-    .option("from", { type: "string" })
-    .option("fullscreen", {
-    type: "boolean",
-    describe: "Disable full screen UI",
-    default: true,
-})
-    .positional("filter", {
+export const remove = (program) => program.command("remove [filter]", "Remove your app from AWS", (yargs) => yargs.option("from", { type: "string" }).positional("filter", {
     type: "string",
     describe: "Optionally filter stacks to remove",
 }), async (args) => {
     const React = await import("react");
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
-    const { blue, bold } = await import("colorette");
+    const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { printDeploymentResults } = await import("../ui/deploy.js");
-    const { createSpinner } = await import("../spinner.js");
+    const { Colors } = await import("../colors.js");
+    const project = useProject();
+    console.log();
+    console.log(`  ${Colors.primary(`${bold(`SST`)} v${project.version}`)}`);
+    console.log();
+    console.log(`  ${Colors.primary(`➜`)}  ${bold(`Stage:`)}   ${dim(project.config.stage)}`);
+    console.log();
     const assembly = await (async function () {
         if (args.from) {
             const result = new CloudAssembly(args.from);
             return result;
         }
-        const project = useProject();
         return await Stacks.synth({
             fn: project.stacks,
             mode: "remove",
         });
     })();
-    const project = useProject();
     const target = assembly.stacks.filter((s) => !args.filter ||
         s.stackName.toLowerCase().includes(args.filter.toLowerCase()));
     if (!target.length) {
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
     }
-    console.log(`Removing ${bold(target.length + " stacks")} for stage ${blue(project.config.stage)}...`);
-    const cleanup = (() => {
-        if (args.fullscreen) {
-            process.stdout.write("\x1b[?1049h");
-            const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
-            return () => {
-                component.unmount();
-                process.stdout.write("\x1b[?1049l");
-            };
-        }
-        const spinner = createSpinner("Removing stacks");
-        return () => spinner.succeed();
-    })();
+    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
     const results = await Stacks.removeMany(target);
-    cleanup();
-    printDeploymentResults(results);
+    component.clear();
+    component.unmount();
+    printDeploymentResults(assembly, results);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
         process.exit(1);
     process.exit(0);

package/cli/commands/secrets/get.d.ts

@@ -6,6 +6,8 @@ export declare const get: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     name: string;
 } & {

package/cli/commands/secrets/list.d.ts

@@ -6,6 +6,8 @@ export declare const list: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     format: string | undefined;
 }>;

package/cli/commands/secrets/remove.d.ts

@@ -6,6 +6,8 @@ export declare const remove: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     name: string;
 } & {

package/cli/commands/secrets/set.d.ts

@@ -6,6 +6,8 @@ export declare const set: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     name: string;
 } & {

package/cli/commands/update.d.ts

@@ -6,6 +6,8 @@ export declare const update: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     version: string | undefined;
 }>;

package/cli/commands/version.d.ts

@@ -6,6 +6,8 @@ export declare const env: (program: Program) => import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 } & {
     command: string;
 }>;

package/cli/program.d.ts

@@ -5,5 +5,7 @@ export declare const program: import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
 }>;
 export type Program = typeof program;

package/cli/program.js

@@ -13,9 +13,16 @@ export const program = yargs(hideBin(process.argv))
     .option("region", {
     type: "string",
     describe: "The AWS region to use",
+})
+    .option("verbose", {
+    type: "boolean",
+    describe: "Print verbose logs",
 })
     .group(["stage", "profile", "region", "help"], "Global:")
     .middleware(async (argv) => {
+    if (argv.verbose) {
+        process.env.SST_VERBOSE = "1";
+    }
     if (argv._.length > 0) {
         const { initProject } = await import("../project.js");
         await initProject(argv);

package/cli/ui/deploy.d.ts

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