sst 2.0.0-rc.11 → 2.0.0-rc.13

package/bootstrap.js

@@ -2,7 +2,7 @@ import { GetParametersCommand, SSMClient } from "@aws-sdk/client-ssm";
 import { Tags, Stack, RemovalPolicy, App } from "aws-cdk-lib";
 import { BlockPublicAccess, Bucket, BucketEncryption, } from "aws-cdk-lib/aws-s3";
 import { ParameterTier, StringParameter } from "aws-cdk-lib/aws-ssm";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { createSpinner } from "./cli/spinner.js";
 import { Context } from "./context/context.js";
 import { useAWSClient } from "./credentials.js";
@@ -25,14 +25,14 @@ export const useBootstrap = Context.memo(async () => {
         const app = new App();
         const stack = new Stack(app, "SSTBootstrap", {
             env: {
-                region: project.region,
+                region: project.config.region,
             },
         });
         const tags = {};
         for (const [key, value] of Object.entries(tags)) {
             Tags.of(app).add(key, value);
         }
-        const bucket = new Bucket(stack, project.region, {
+        const bucket = new Bucket(stack, project.config.region, {
             encryption: BucketEncryption.S3_MANAGED,
             removalPolicy: RemovalPolicy.DESTROY,
             autoDeleteObjects: true,

package/cache.js

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs/promises";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { Logger } from "./logger.js";
 import { Context } from "./context/context.js";
 export const useCache = Context.memo(async () => {

package/cli/commands/bind.js

@@ -1,4 +1,4 @@
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 export const bind = (program) => program.command("bind <command>", "Binds blah", (yargs) => yargs.positional("command", {
     type: "string",
     describe: "Command to bind to",
@@ -16,7 +16,7 @@ export const bind = (program) => program.command("bind <command>", "Binds blah",
             AWS_ACCESS_KEY_ID: credentials.accessKeyId,
             AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
             AWS_SESSION_TOKEN: credentials.sessionToken,
-            AWS_REGION: project.region,
+            AWS_REGION: project.config.region,
             PATH: process.env.PATH,
         },
         stdio: "inherit",

package/cli/commands/build.js

@@ -1,11 +1,11 @@
+import { useProject } from "../../project.js";
 import { createSpinner } from "../spinner.js";
-export const build = (program) => program.command("build", "Build stacks code", yargs => yargs.option("from", { type: "string" }), async () => {
+export const build = (program) => program.command("build", "Build stacks code", (yargs) => yargs.option("from", { type: "string" }), async () => {
     const { Stacks } = await import("../../stacks/index.js");
     const spinner = createSpinner("Building stacks").start();
-    const fn = await Stacks.build();
     await Stacks.synth({
-        fn,
-        mode: "deploy"
+        fn: useProject().stacks,
+        mode: "deploy",
     });
     spinner.succeed();
     process.exit(0);

package/cli/commands/deploy.js

@@ -10,22 +10,21 @@ export const deploy = (program) => program.command("deploy [filter]", "Work on y
     const React = await import("react");
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { blue, bold } = await import("colorette");
-    const { useProject } = await import("../../app.js");
+    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 project = useProject();
     const assembly = await (async function () {
         if (args.from) {
             const result = new CloudAssembly(args.from);
             return result;
         }
-        const fn = await Stacks.build();
         return await Stacks.synth({
-            fn,
+            fn: project.stacks,
             mode: "deploy",
         });
     })();
-    const project = useProject();
     const target = assembly.stacks.filter((s) => !args.filter ||
         s.stackName.toLowerCase().includes(args.filter.toLowerCase()));
     if (!target.length) {
@@ -33,7 +32,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Work on y
         process.exit(1);
         return;
     }
-    console.log(`Deploying ${bold(target.length + " stacks")} for stage ${blue(project.stage)}...`);
+    console.log(`Deploying ${bold(target.length + " stacks")} for stage ${blue(project.config.stage)}...`);
     let component = undefined;
     if (args.fullscreen) {
         process.stdout.write("\x1b[?1049h");

package/cli/commands/dev.js

@@ -4,11 +4,11 @@ import crypto from "crypto";
 import { printDeploymentResults } from "../ui/deploy.js";
 import { useFunctions } from "../../constructs/Function.js";
 import { dim, gray, yellow } from "colorette";
-import { useProject } from "../../app.js";
 import { SiteEnv } from "../../site-env.js";
 import { usePothosBuilder } from "./plugins/pothos.js";
 import { useKyselyTypeGenerator } from "./plugins/kysely.js";
 import { useRDSWarmer } from "./plugins/warmer.js";
+import { useProject } from "../../project.js";
 export const dev = (program) => program.command(["start", "dev"], "Work on your SST app locally", (yargs) => yargs.option("fullscreen", {
     type: "boolean",
     describe: "Disable full screen UI",
@@ -34,13 +34,13 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
     const useFunctionLogger = Context.memo(async () => {
         const bus = useBus();
         bus.subscribe("function.invoked", async (evt) => {
-            console.log(bold(magenta(`Invoked `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(magenta(`Invoked `)), useFunctions().fromID(evt.properties.functionID).handler);
         });
         bus.subscribe("function.build.success", async (evt) => {
-            console.log(bold(gray(`Built   `)), bold(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 `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            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) => {
@@ -50,14 +50,14 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
                 const line = lines[i];
                 lines[i] = "         " + line;
             }
-            console.log(bold(blue(`Log     `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(blue(`Log     `)), useFunctions().fromID(evt.properties.functionID).handler);
             console.log(dim(lines.join("\n")));
         });
         bus.subscribe("function.success", async (evt) => {
-            console.log(bold(green(`Success `)), bold(useFunctions().fromID(evt.properties.functionID).handler));
+            console.log(bold(green(`Success `)), useFunctions().fromID(evt.properties.functionID).handler);
         });
         bus.subscribe("function.error", async (evt) => {
-            console.log(bold(red(`Error   `)), bold(useFunctions().fromID(evt.properties.functionID).handler), evt.properties.errorMessage);
+            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)}`);
             }
@@ -65,17 +65,19 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
     });
     const useStackBuilder = Context.memo(async () => {
         const watcher = useWatcher();
-        const bus = useBus();
         const project = useProject();
+        const bus = useBus();
         let lastDeployed;
         let pending;
         let isDeploying = false;
         async function build() {
             const spinner = createSpinner("Building stacks").start();
             try {
-                const fn = await Stacks.build();
+                const [metafile, sstConfig] = await Stacks.load(project.paths.config);
+                project.metafile = metafile;
+                project.stacks = sstConfig.stacks;
                 const assembly = await Stacks.synth({
-                    fn,
+                    fn: project.stacks,
                     outDir: `.sst/cdk.out`,
                     mode: "dev",
                 });
@@ -151,14 +153,10 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
                 .digest("hex");
             return hash;
         }
-        let metafile;
-        bus.subscribe("stack.built", async (evt) => {
-            metafile = evt.properties.metafile;
-        });
         watcher.subscribe("file.changed", async (evt) => {
-            if (!metafile)
+            if (!project.metafile)
                 return;
-            if (!metafile.inputs[evt.properties.relative])
+            if (!project.metafile.inputs[evt.properties.relative])
                 return;
             build();
         });

package/cli/commands/env.js

@@ -1,4 +1,4 @@
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { createSpinner } from "../spinner.js";
 import fs from "fs/promises";
 import path from "path";
@@ -10,17 +10,18 @@ export const env = (program) => program.command("env <command>", "description",
     demandOption: true,
 }), async (args) => {
     const project = useProject();
-    const spinner = createSpinner("Waiting for SST to start").start();
+    let spinner;
     while (true) {
         const exists = await fs
             .access(SiteEnv.valuesFile())
             .then(() => true)
             .catch(() => false);
         if (!exists) {
+            spinner = createSpinner("Waiting for SST to start").start();
             await new Promise((resolve) => setTimeout(resolve, 1000));
             continue;
         }
-        spinner.succeed();
+        spinner?.succeed();
         const sites = await SiteEnv.values();
         const current = path.relative(project.paths.root, process.cwd());
         const env = sites[current] || {};

package/cli/commands/plugins/kysely.js

@@ -5,7 +5,7 @@ import * as fs from "fs/promises";
 import { DatabaseMetadata, EnumCollection, PostgresDialect, Serializer, Transformer, } from "kysely-codegen";
 import { Context } from "../../../context/context.js";
 import { useBus } from "../../../bus.js";
-import { useProject } from "../../../app.js";
+import { useProject } from "../../../project.js";
 export const useKyselyTypeGenerator = Context.memo(async () => {
     let databases = [];
     const bus = useBus();
@@ -21,7 +21,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
                     resourceArn: db.clusterArn,
                     database: db.defaultDatabaseName,
                     client: new RDSDataService({
-                        region: project.region,
+                        region: project.config.region,
                     }),
                 },
             }),

package/cli/commands/remove.js

@@ -5,7 +5,7 @@ export const remove = (program) => program.command("remove [filter]", "Remove al
     const React = await import("react");
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { blue, bold } = await import("colorette");
-    const { useProject } = await import("../../app.js");
+    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");
@@ -14,9 +14,9 @@ export const remove = (program) => program.command("remove [filter]", "Remove al
             const result = new CloudAssembly(args.from);
             return result;
         }
-        const fn = await Stacks.build();
+        const project = useProject();
         return await Stacks.synth({
-            fn,
+            fn: project.stacks,
             mode: "remove",
         });
     })();
@@ -26,9 +26,8 @@ export const remove = (program) => program.command("remove [filter]", "Remove al
     if (!target.length) {
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
-        return;
     }
-    console.log(`Removing ${bold(target.length + " stacks")} for stage ${blue(project.stage)}...`);
+    console.log(`Removing ${bold(target.length + " stacks")} for stage ${blue(project.config.stage)}...`);
     process.stdout.write("\x1b[?1049h");
     const component = render(React.createElement(DeploymentUI, { stacks: target.map((s) => s.stackName) }));
     const results = await Stacks.removeMany(target);

package/cli/commands/update.js

@@ -1,14 +1,14 @@
 import { green, yellow } from "colorette";
 import fs from "fs/promises";
 import path from "path";
-const PACKAGE_MATCH = ["sst", "aws-cdk", "@aws-cdk"];
+const PACKAGE_MATCH = ["sst", "aws-cdk", "@aws-cdk", "constructs"];
 const FIELDS = ["dependencies", "devDependencies"];
 export const update = (program) => program.command("update [ver]", "Update SST and CDK packages to another version", (yargs) => yargs.positional("ver", {
     type: "string",
     describe: "Optional SST version to update to",
 }), async (args) => {
     const { fetch } = await import("undici");
-    const { useProject } = await import("../../app.js");
+    const { useProject } = await import("../../project.js");
     const project = useProject();
     const files = await find(project.paths.root);
     const metadata = await fetch(`https://registry.npmjs.org/sst/${args.ver || "latest"}`).then((resp) => resp.json());
@@ -28,6 +28,8 @@ export const update = (program) => program.command("update [ver]", "Update SST a
                 const desired = (() => {
                     if (pkg === "sst")
                         return metadata.version;
+                    if (pkg === "constructs")
+                        return metadata.dependencies.constructs;
                     if (pkg.endsWith("alpha"))
                         return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
                     return metadata.dependencies["aws-cdk-lib"];

package/cli/local/router.d.ts

@@ -32,7 +32,7 @@ export declare type Context = {
     state: State;
 };
 export declare const router: import("@trpc/server/dist/declarations/src/router.js").Router<Context, Context, Record<"getCredentials", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, {
-    region: string;
+    region: string | undefined;
     credentials: {
         accessKeyId: string;
         secretAccessKey: string;

package/cli/local/router.js

@@ -1,5 +1,5 @@
 import * as trpc from "@trpc/server";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { useBus } from "../../bus.js";
 import { useAWSCredentials } from "../../credentials.js";
 export const router = trpc
@@ -9,7 +9,7 @@ export const router = trpc
         const project = useProject();
         const credentials = await useAWSCredentials();
         return {
-            region: project.region,
+            region: project.config.region,
             credentials: {
                 accessKeyId: credentials.accessKeyId,
                 secretAccessKey: credentials.secretAccessKey,
@@ -24,7 +24,7 @@ export const router = trpc
     },
 })
     .mutation("deploy", {
-    async resolve({ ctx }) {
+    async resolve() {
         return;
     },
 })

package/cli/local/server.js

@@ -9,13 +9,13 @@ import { applyWSSHandler } from "@trpc/server/adapters/ws/dist/trpc-server-adapt
 import { router } from "./router.js";
 import { optimise } from "dendriform-immer-patch-optimiser";
 import { sync } from "cross-spawn";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { useBus } from "../../bus.js";
 export async function useLocalServer(opts) {
     const project = useProject();
     let state = {
-        app: project.name,
-        stage: project.stage,
+        app: project.config.name,
+        stage: project.config.stage,
         live: opts.live,
         stacks: {
             status: "idle",

package/cli/program.js

@@ -1,6 +1,6 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { initProject } from "../app.js";
+import { initProject } from "../project.js";
 import { trackCli } from "./telemetry/telemetry.js";
 export const program = yargs(hideBin(process.argv))
     .scriptName("sst")

package/cli/telemetry/environment.js

@@ -1,6 +1,6 @@
 import os from "os";
 import ciInfo from "ci-info";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 let data;
 export function getEnvironmentData() {
     if (data) {

package/cli/ui/deploy.js

@@ -3,7 +3,7 @@ import { Box, Text } from "ink";
 import { useBus } from "../../bus.js";
 import { Stacks } from "../../stacks/index.js";
 import inkSpinner from "ink-spinner";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { blue, bold, green, red } from "colorette";
 // @ts-ignore
 const { default: Spinner } = inkSpinner;
@@ -77,7 +77,7 @@ export const DeploymentUI = (props) => {
             "Deploying ",
             React.createElement(Text, { color: "bold" }, props.stacks.length),
             " stacks for stage ",
-            React.createElement(Text, { color: "blue" }, useProject().stage)),
+            React.createElement(Text, { color: "blue" }, useProject().config.stage)),
         Object.entries(stacks).map(([stackID, status]) => {
             return (React.createElement(React.Fragment, { key: stackID },
                 React.createElement(Text, null,

package/config.js

@@ -1,7 +1,7 @@
 import { DeleteParameterCommand, GetParameterCommand, GetParametersByPathCommand, PutParameterCommand, SSMClient, } from "@aws-sdk/client-ssm";
 import { GetFunctionConfigurationCommand, LambdaClient, UpdateFunctionConfigurationCommand, } from "@aws-sdk/client-lambda";
 import { pipe, map } from "remeda";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { useAWSClient } from "./credentials.js";
 import { Stacks } from "./stacks/index.js";
 export var Config;
@@ -62,8 +62,8 @@ export var Config;
         const project = useProject();
         const parameters = await Config.parameters();
         const env = {
-            SST_APP: project.name,
-            SST_STAGE: project.stage,
+            SST_APP: project.config.name,
+            SST_STAGE: project.config.stage,
             ...pipe(parameters, map((p) => [`SST_${p.type}_${p.prop}_${p.id}`, p.value]), Object.fromEntries),
         };
         return env;
@@ -156,11 +156,11 @@ const SECRET_UPDATED_AT_ENV = "SST_ADMIN_SECRET_UPDATED_AT";
 const PREFIX = {
     get STAGE() {
         const project = useProject();
-        return `/sst/${project.name}/${project.stage}/`;
+        return `/sst/${project.config.name}/${project.config.stage}/`;
     },
     get FALLBACK() {
         const project = useProject();
-        return `/sst/${project.name}/${FALLBACK_STAGE}/`;
+        return `/sst/${project.config.name}/${FALLBACK_STAGE}/`;
     },
 };
 function parse(ssmName) {

package/constructs/App.js

@@ -14,7 +14,7 @@ import { createRequire } from "module";
 import { Auth } from "./Auth.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { AppContext } from "./context.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 import { Logger } from "../logger.js";
 import { SiteEnv } from "../site-env.js";
 const require = createRequire(import.meta.url);

package/constructs/AppSyncApi.js

@@ -15,7 +15,7 @@ import * as appsync from "@aws-cdk/aws-appsync-alpha";
 import * as appSyncApiDomain from "./util/appSyncApiDomain.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 /////////////////////
 // Construct
 /////////////////////

package/constructs/Function.js

@@ -18,7 +18,7 @@ import * as functionUrlCors from "./util/functionUrlCors.js";
 import url from "url";
 import { useDeferredTasks } from "./deferred_task.js";
 import { useWarning } from "./util/warning.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 import { createAppContext } from "./context.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
@@ -229,7 +229,7 @@ export class Function extends lambda.Function {
         // Add config
         this.addEnvironment("SST_APP", app.name, { removeInEdge: true });
         this.addEnvironment("SST_STAGE", app.stage, { removeInEdge: true });
-        this.addEnvironment("SST_SSM_PREFIX", useProject().ssmPrefix, {
+        this.addEnvironment("SST_SSM_PREFIX", useProject().config.ssmPrefix, {
             removeInEdge: true,
         });
         this.addConfig(props.config || []);

package/constructs/Job.js

@@ -12,7 +12,7 @@ import { attachPermissionsToRole } from "./util/permission.js";
 import { bindEnvironment, bindPermissions } from "./util/functionBinding.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { useWarning } from "./util/warning.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /////////////////////
@@ -165,7 +165,7 @@ export class Job extends Construct {
             environmentVariables: {
                 SST_APP: { value: app.name },
                 SST_STAGE: { value: app.stage },
-                SST_SSM_PREFIX: { value: useProject().ssmPrefix },
+                SST_SSM_PREFIX: { value: useProject().config.ssmPrefix },
             },
             timeout: this.normalizeTimeout(this.props.timeout || "8 hours"),
             buildSpec: codebuild.BuildSpec.fromObject({

package/constructs/SsrSite.js

@@ -25,7 +25,7 @@ import { getBuildCmdEnvironment, buildErrorResponsesForRedirectToIndex, } from "
 import { attachPermissionsToRole } from "./util/permission.js";
 import { ENVIRONMENT_PLACEHOLDER, getParameterPath, } from "./util/functionBinding.js";
 import { SiteEnv } from "../site-env.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `SsrSite` construct is a higher level CDK construct that makes it easy to create modern web apps with Server Side Rendering capabilities.

package/constructs/Stack.js

@@ -7,7 +7,7 @@ import { Function as Fn } from "./Function.js";
 import { isConstruct } from "./Construct.js";
 import { createRequire } from "module";
 import { useApp } from "./context.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 const require = createRequire(import.meta.url);
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /**

package/constructs/StaticSite.js

@@ -21,7 +21,7 @@ import { getBuildCmdEnvironment, buildErrorResponsesFor404ErrorPage, buildErrorR
 import { isCDKConstruct } from "./Construct.js";
 import { ENVIRONMENT_PLACEHOLDER, getParameterPath, } from "./util/functionBinding.js";
 import { gray } from "colorette";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 import { SiteEnv } from "../site-env.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////

package/constructs/deprecated/NextjsSite.js

@@ -28,7 +28,7 @@ import { ENVIRONMENT_PLACEHOLDER, getParameterPath, } from "../util/functionBind
 import * as crossRegionHelper from "./cross-region-helper.js";
 import { gray, red } from "colorette";
 import { SiteEnv } from "../../site-env.js";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /////////////////////
 // Construct

package/credentials.js

@@ -7,9 +7,9 @@ import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { StandardRetryStrategy } from "@aws-sdk/middleware-retry";
 export const useAWSCredentialsProvider = Context.memo(() => {
     const project = useProject();
-    Logger.debug("Using AWS profile", project.profile);
+    Logger.debug("Using AWS profile", project.config.profile);
     const provider = fromNodeProviderChain({
-        profile: project.profile,
+        profile: project.config.profile,
     });
     return provider;
 });
@@ -31,7 +31,7 @@ export function useAWSClient(client, force = false) {
         return existing;
     const [project, credentials] = [useProject(), useAWSCredentialsProvider()];
     const result = new client({
-        region: project.region,
+        region: project.config.region,
         credentials: credentials,
         retryStrategy: new StandardRetryStrategy(async () => 10000, {
             retryDecider: (err) => {
@@ -51,7 +51,7 @@ export function useAWSClient(client, force = false) {
     return result;
 }
 import aws from "aws-sdk";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 const CredentialProviderChain = aws.CredentialProviderChain;
 /**
  * Do not use this. It is only used for AWS CDK compatibility.
@@ -81,9 +81,9 @@ export const useAWSProvider = Context.memo(async () => {
             secretAccessKey: creds.secretAccessKey,
         }),
     ]);
-    const provider = new SdkProvider(chain, project.region, {
+    const provider = new SdkProvider(chain, project.config.region, {
         maxRetries: 10000,
-        region: project.region,
+        region: project.config.region,
     });
     return provider;
 });

package/index.d.ts

@@ -0,0 +1 @@
+export type { SSTConfig } from "./project.js";

package/index.js

@@ -0,0 +1 @@
+export {};

package/iot.js

@@ -15,7 +15,7 @@ export const useIOTEndpoint = Context.memo(async () => {
 });
 import iot from "aws-iot-device-sdk";
 import { useBus } from "./bus.js";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { Logger } from "./logger.js";
 export const useIOT = Context.memo(async () => {
     const bus = useBus();
@@ -29,7 +29,7 @@ export const useIOT = Context.memo(async () => {
         secretKey: creds.secretAccessKey,
         sessionToken: creds.sessionToken,
     });
-    const PREFIX = `/sst/${project.name}/${project.stage}`;
+    const PREFIX = `/sst/${project.config.name}/${project.config.stage}`;
     device.subscribe(`${PREFIX}/events`);
     const fragments = new Map();
     device.on("error", (err) => {

package/logger.js

@@ -1,6 +1,6 @@
 import fs from "fs/promises";
 import path from "path";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { Context } from "./context/context.js";
 let previous = new Date();
 const useFile = Context.memo(async () => {

package/node/api/index.d.ts

@@ -40,3 +40,5 @@ export declare function useHeader(key: string): string | undefined;
 export declare function useFormValue(name: string): string | null | undefined;
 export declare function useQueryParams(): import("aws-lambda").APIGatewayProxyEventQueryStringParameters;
 export declare function useQueryParam(name: string): string | undefined;
+export declare function usePathParams(): import("aws-lambda").APIGatewayProxyEventPathParameters;
+export declare function usePathParam(name: string): string | undefined;

package/node/api/index.js

@@ -86,3 +86,11 @@ export function useQueryParams() {
 export function useQueryParam(name) {
     return useQueryParams()[name];
 }
+export function usePathParams() {
+    const evt = useEvent("api");
+    const path = evt.pathParameters || {};
+    return path;
+}
+export function usePathParam(name) {
+    return usePathParams()[name];
+}