sst 2.0.21 → 2.0.23

package/README.md

@@ -0,0 +1,43 @@
+# sst
+
+[SST](https://sst.dev) makes it easy to build modern full-stack applications on AWS.
+
+The `sst` package is made up of the following.
+
+- [`sst`](https://docs.sst.dev/packages/sst) CLI
+- [`sst/node`](https://docs.sst.dev/clients) Node.js client
+- [`sst/constructs`](https://docs.sst.dev/constructs) CDK constructs
+
+## Installation
+
+Install the `sst` package in your project root.
+
+```bash
+npm install sst --save-exact
+```
+
+## Usage
+
+Once installed, you can run the CLI commands using.
+
+```bash
+npx sst <command>
+```
+
+Import the Node.js client in your functions. For example, you can import the `Bucket` client.
+
+```ts
+import { Bucket } from "sst/node/bucket";
+```
+
+And import the constructs you need in your stacks code. For example, you can add an API.
+
+```ts
+import { Api } from "sst/constructs";
+```
+
+For more details, [head over to our docs](https://docs.sst.dev).
+
+---
+
+**Join our community** [Discord](https://sst.dev/discord) | [YouTube](https://www.youtube.com/c/sst-dev) | [Twitter](https://twitter.com/SST_dev)

package/cli/commands/dev.js

@@ -1,10 +1,11 @@
-import { Colors } from "../colors.js";
-import { printHeader } from "../ui/header.js";
-import { mapValues, omitBy, pipe } from "remeda";
 export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs.option("increase-timeout", {
     type: "boolean",
     description: "Increase function timeout",
 }), async (args) => {
+    const { Colors } = await import("../colors.js");
+    const { printHeader } = await import("../ui/header.js");
+    const { mapValues, omitBy, pipe } = await import("remeda");
+    const path = await import("path");
     const { useRuntimeWorkers } = await import("../../runtime/workers.js");
     const { useIOTBridge } = await import("../../runtime/iot.js");
     const { useRuntimeServer } = await import("../../runtime/server.js");
@@ -19,7 +20,6 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { Context } = await import("../../context/context.js");
     const { printDeploymentResults, DeploymentUI } = await import("../ui/deploy.js");
     const { useLocalServer } = await import("../local/server.js");
-    const path = await import("path");
     const fs = await import("fs/promises");
     const crypto = await import("crypto");
     const { useFunctions } = await import("../../constructs/Function.js");
@@ -179,20 +179,18 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             lastDeployed = nextChecksum;
             // Update site env
             const keys = await SiteEnv.keys();
-            if (keys.length) {
-                const result = {};
-                for (const key of keys) {
-                    const stack = results[key.stack];
-                    const value = stack.outputs[key.output];
-                    let existing = result[key.path];
-                    if (!existing) {
-                        result[key.path] = existing;
-                        existing = result[key.path] = {};
-                    }
-                    existing[key.environment] = value;
+            const result = {};
+            for (const key of keys) {
+                const stack = results[key.stack];
+                const value = stack.outputs[key.output];
+                let existing = result[key.path];
+                if (!existing) {
+                    result[key.path] = existing;
+                    existing = result[key.path] = {};
                 }
-                await SiteEnv.writeValues(result);
+                existing[key.environment] = value;
             }
+            await SiteEnv.writeValues(result);
             // Write outputs.json
             fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(pipe(results, omitBy((_, key) => key.includes("SstSiteEnv")), mapValues((val) => val.outputs)), null, 2));
             isWorking = false;
@@ -219,7 +217,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         watcher.subscribe("file.changed", async (evt) => {
             if (!project.metafile)
                 return;
-            if (!project.metafile.inputs[evt.properties.relative])
+            if (!project.metafile.inputs[evt.properties.relative.split(path.sep).join(path.posix.sep)])
                 return;
             build();
         });

package/constructs/Function.d.ts

@@ -367,7 +367,7 @@ export interface NodeJSProps {
      * ```js
      * new Function(stack, "Function", {
      *   nodejs: {
-     *     nodeModules: ["pg"]
+     *     install: ["pg"]
      *   }
      * })
      * ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/node.js

@@ -74,7 +74,7 @@ export const useNodeHandler = Context.memo(async () => {
             if (!file)
                 return {
                     type: "error",
-                    errors: [`Could not find file for handler ${input.props.handler}`],
+                    errors: [`Could not find file for handler "${input.props.handler}"`],
                 };
             const nodejs = input.props.nodejs || {};
             const isESM = (nodejs.format || "esm") === "esm";

package/sst.mjs

@@ -4812,7 +4812,7 @@ var init_node = __esm({
           if (!file)
             return {
               type: "error",
-              errors: [`Could not find file for handler ${input.props.handler}`]
+              errors: [`Could not find file for handler "${input.props.handler}"`]
             };
           const nodejs = input.props.nodejs || {};
           const isESM = (nodejs.format || "esm") === "esm";
@@ -6200,7 +6200,7 @@ import {
   LambdaClient,
   UpdateFunctionConfigurationCommand
 } from "@aws-sdk/client-lambda";
-import { pipe as pipe3, map as map2 } from "remeda";
+import { pipe as pipe2, map as map2 } from "remeda";
 async function* scan(prefix) {
   const ssm = useAWSClient(SSMClient);
   let token;
@@ -6293,7 +6293,7 @@ var init_config = __esm({
         const env3 = {
           SST_APP: project.config.name,
           SST_STAGE: project.config.stage,
-          ...pipe3(
+          ...pipe2(
             parameters2,
             map2((p) => [envFor(p), p.value]),
             Object.fromEntries
@@ -6495,9 +6495,6 @@ var env = (program2) => program2.command(
 ).strict(false);
 
 // src/cli/commands/dev.tsx
-init_colors();
-init_header();
-import { mapValues, omitBy as omitBy2, pipe as pipe2 } from "remeda";
 var dev = (program2) => program2.command(
   ["dev", "start"],
   "Work on your app locally",
@@ -6506,6 +6503,10 @@ var dev = (program2) => program2.command(
     description: "Increase function timeout"
   }),
   async (args) => {
+    const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
+    const { printHeader: printHeader2 } = await Promise.resolve().then(() => (init_header(), header_exports));
+    const { mapValues, omitBy: omitBy2, pipe: pipe3 } = await import("remeda");
+    const path19 = await import("path");
     const { useRuntimeWorkers: useRuntimeWorkers2 } = await Promise.resolve().then(() => (init_workers(), workers_exports));
     const { useIOTBridge: useIOTBridge2 } = await Promise.resolve().then(() => (init_iot2(), iot_exports));
     const { useRuntimeServer: useRuntimeServer2 } = await Promise.resolve().then(() => (init_server2(), server_exports2));
@@ -6520,7 +6521,6 @@ var dev = (program2) => program2.command(
     const { Context: Context2 } = await Promise.resolve().then(() => (init_context(), context_exports));
     const { printDeploymentResults: printDeploymentResults2, DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { useLocalServer: useLocalServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
-    const path19 = await import("path");
     const fs19 = await import("fs/promises");
     const crypto2 = await import("crypto");
     const { useFunctions: useFunctions3 } = await import("../src/constructs/Function.js");
@@ -6548,7 +6548,7 @@ var dev = (program2) => program2.command(
       function prefix(requestID) {
         const exists = pending.get(requestID);
         if (exists) {
-          return Colors.hex(exists.color)(Colors.prefix);
+          return Colors2.hex(exists.color)(Colors2.prefix);
         }
         pending.set(requestID, {
           requestID,
@@ -6562,10 +6562,10 @@ var dev = (program2) => program2.command(
         pending.delete(requestID);
       }
       bus.subscribe("function.invoked", async (evt) => {
-        Colors.line(
+        Colors2.line(
           prefix(evt.properties.requestID),
-          Colors.dim.bold("Invoked"),
-          Colors.dim(
+          Colors2.dim.bold("Invoked"),
+          Colors2.dim(
             useFunctions3().fromID(evt.properties.functionID).handler
           )
         );
@@ -6574,10 +6574,10 @@ var dev = (program2) => program2.command(
         prefix(evt.properties.requestID);
         const { started } = pending.get(evt.properties.requestID);
         for (let line of evt.properties.message.split("\n")) {
-          Colors.line(
+          Colors2.line(
             prefix(evt.properties.requestID),
-            Colors.dim(("+" + (Date.now() - started) + "ms").padEnd(7)),
-            Colors.dim(line)
+            Colors2.dim(("+" + (Date.now() - started) + "ms").padEnd(7)),
+            Colors2.dim(line)
           );
         }
       });
@@ -6585,41 +6585,41 @@ var dev = (program2) => program2.command(
         const info = useFunctions3().fromID(evt.properties.functionID);
         if (!info.enableLiveDev)
           return;
-        Colors.line(Colors.dim(Colors.prefix, "Built", info.handler));
+        Colors2.line(Colors2.dim(Colors2.prefix, "Built", info.handler));
       });
       bus.subscribe("function.build.failed", async (evt) => {
         const info = useFunctions3().fromID(evt.properties.functionID);
         if (info.enableLiveDev === false)
           return;
-        Colors.gap();
-        Colors.line(Colors.danger("\u2716 "), "Build failed", info.handler);
+        Colors2.gap();
+        Colors2.line(Colors2.danger("\u2716 "), "Build failed", info.handler);
         for (const line of evt.properties.errors) {
-          Colors.line("  ", line);
+          Colors2.line("  ", line);
         }
-        Colors.gap();
+        Colors2.gap();
       });
       bus.subscribe("function.success", async (evt) => {
         const p = prefix(evt.properties.requestID);
         const req = pending.get(evt.properties.requestID);
         setTimeout(() => {
-          Colors.line(
+          Colors2.line(
             p,
-            Colors.dim(`Done in ${Date.now() - req.started - 100}ms`)
+            Colors2.dim(`Done in ${Date.now() - req.started - 100}ms`)
           );
           end(evt.properties.requestID);
         }, 100);
       });
       bus.subscribe("function.error", async (evt) => {
         setTimeout(() => {
-          Colors.line(
+          Colors2.line(
             prefix(evt.properties.requestID),
-            Colors.danger.bold("Error:"),
-            Colors.danger.bold(evt.properties.errorMessage)
+            Colors2.danger.bold("Error:"),
+            Colors2.danger.bold(evt.properties.errorMessage)
           );
           for (const line of evt.properties.trace || []) {
             if (line.includes(evt.properties.errorMessage))
               continue;
-            Colors.line("  ", `${dim2(line)}`);
+            Colors2.line("  ", `${dim2(line)}`);
           }
           end(evt.properties.requestID);
         }, 100);
@@ -6639,7 +6639,7 @@ var dev = (program2) => program2.command(
         }
         isDirty = false;
         isWorking = true;
-        Colors.gap();
+        Colors2.gap();
         const spinner = createSpinner2({
           color: "gray",
           text: lastDeployed ? ` Building...` : dim2(` Checking for changes`)
@@ -6660,7 +6660,7 @@ var dev = (program2) => program2.command(
           const next = await checksum(assembly.directory);
           Logger2.debug("Checksum", "next", next, "old", lastDeployed);
           if (next === lastDeployed) {
-            spinner.succeed(Colors.dim(" Built with no changes"));
+            spinner.succeed(Colors2.dim(" Built with no changes"));
             isWorking = false;
             if (isDirty)
               build2();
@@ -6669,19 +6669,19 @@ var dev = (program2) => program2.command(
           if (!lastDeployed) {
             spinner.stop();
             spinner.clear();
-            Colors.mode("gap");
+            Colors2.mode("gap");
           } else {
-            spinner.succeed(Colors.dim(` Built`));
-            Colors.gap();
+            spinner.succeed(Colors2.dim(` Built`));
+            Colors2.gap();
           }
           deploy3(assembly);
         } catch (ex) {
           isWorking = false;
           spinner.fail();
-          Colors.line(
+          Colors2.line(
             ex.stack.split("\n").map((line) => "   " + line).join("\n")
           );
-          Colors.gap();
+          Colors2.gap();
         }
       }
       async function deploy3(assembly) {
@@ -6696,24 +6696,22 @@ var dev = (program2) => program2.command(
         }
         lastDeployed = nextChecksum;
         const keys2 = await SiteEnv.keys();
-        if (keys2.length) {
-          const result = {};
-          for (const key of keys2) {
-            const stack = results[key.stack];
-            const value = stack.outputs[key.output];
-            let existing = result[key.path];
-            if (!existing) {
-              result[key.path] = existing;
-              existing = result[key.path] = {};
-            }
-            existing[key.environment] = value;
+        const result = {};
+        for (const key of keys2) {
+          const stack = results[key.stack];
+          const value = stack.outputs[key.output];
+          let existing = result[key.path];
+          if (!existing) {
+            result[key.path] = existing;
+            existing = result[key.path] = {};
           }
-          await SiteEnv.writeValues(result);
+          existing[key.environment] = value;
         }
+        await SiteEnv.writeValues(result);
         fs19.writeFile(
           path19.join(project.paths.out, "outputs.json"),
           JSON.stringify(
-            pipe2(
+            pipe3(
               results,
               omitBy2((_, key) => key.includes("SstSiteEnv")),
               mapValues((val) => val.outputs)
@@ -6747,7 +6745,7 @@ var dev = (program2) => program2.command(
       watcher.subscribe("file.changed", async (evt) => {
         if (!project.metafile)
           return;
-        if (!project.metafile.inputs[evt.properties.relative])
+        if (!project.metafile.inputs[evt.properties.relative.split(path19.sep).join(path19.posix.sep)])
           return;
         build2();
       });
@@ -6767,7 +6765,7 @@ var dev = (program2) => program2.command(
       }
     }
     clear2();
-    await printHeader({ console: true, hint: "ready!" });
+    await printHeader2({ console: true, hint: "ready!" });
     await Promise.all([
       useRuntimeWorkers2(),
       useIOTBridge2(),
@@ -6887,7 +6885,7 @@ var deploy2 = (program2) => program2.command(
     const { loadAssembly: loadAssembly2, useAppMetadata: useAppMetadata2, saveAppMetadata: saveAppMetadata2, Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
     const { render } = await import("ink");
     const { DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
-    const { mapValues: mapValues2 } = await import("remeda");
+    const { mapValues } = await import("remeda");
     const project = useProject2();
     const [identity, appMetadata] = await Promise.all([
       useSTSIdentity(),
@@ -6939,7 +6937,7 @@ var deploy2 = (program2) => program2.command(
     fs18.writeFile(
       path18.join(project.paths.out, "outputs.json"),
       JSON.stringify(
-        mapValues2(results, (val) => val.outputs),
+        mapValues(results, (val) => val.outputs),
         null,
         2
       )