sst 2.26.2 → 2.26.4

package/cli/commands/types.js

@@ -8,14 +8,10 @@ export const types = (program) => program.command("types", "Generate resource ty
     try {
         const project = useProject();
         const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
-        const app = new App({
-            mode: "deploy",
-            stage: project.config.stage,
-            name: project.config.name,
-            region: project.config.region,
+        await Stacks.synth({
+            fn: sstConfig.stacks,
+            mode: "remove",
         });
-        sstConfig.stacks(app);
-        app.codegenTypes();
         Colors.line(Colors.success(`✔ `), `Types generated in ${path.resolve(project.paths.out, "types")}`);
         await exit();
     }

package/constructs/Api.js

@@ -54,6 +54,8 @@ export class Api extends Construct {
         this.createHttpApi();
         this.addAuthorizers(this.props.authorizers || {});
         this.addRoutes(this, this.props.routes || {});
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The AWS generated URL of the Api.

package/constructs/ApiGatewayV1Api.js

@@ -63,6 +63,8 @@ export class ApiGatewayV1Api extends Construct {
         this.createRestApi();
         this.addAuthorizers(this.props.authorizers || {});
         this.addRoutes(this, this.props.routes || {});
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The AWS generated URL of the Api.

package/constructs/App.d.ts

@@ -149,6 +149,9 @@ export declare class App extends CDKApp {
      * Adds additional default layers to be applied to all Lambda functions in the stack.
      */
     addDefaultFunctionLayers(layers: ILayerVersion[]): void;
+    private useTypesPath;
+    private createTypesFile;
+    registerTypes(c: SSTConstruct): void;
     private isFinished;
     finish(): Promise<void>;
     isRunningSSTTest(): boolean;
@@ -159,7 +162,6 @@ export declare class App extends CDKApp {
     private applyRemovalPolicy;
     private removeGovCloudUnsupportedResourceProperties;
     private ensureUniqueConstructIds;
-    codegenTypes(): void;
     private foreachConstruct;
     stack<T extends FunctionalStack<any>>(fn: T, props?: StackProps & {
         id?: string;

package/constructs/App.js

@@ -78,6 +78,7 @@ export class App extends CDKApp {
             deployProps.account || process.env.CDK_DEFAULT_ACCOUNT || "my-account";
         this.isActiveStack = deployProps.isActiveStack;
         this.defaultFunctionProps = [];
+        this.createTypesFile();
         if (this.mode === "dev") {
             this.debugScriptVersion = deployProps.debugScriptVersion;
             this.debugIncreaseTimeout = deployProps.debugIncreaseTimeout;
@@ -171,6 +172,68 @@ export class App extends CDKApp {
             layers,
         });
     }
+    useTypesPath() {
+        const project = useProject();
+        return path.resolve(project.paths.out, "types");
+    }
+    createTypesFile() {
+        const typesPath = this.useTypesPath();
+        Logger.debug(`Generating types in ${typesPath}`);
+        fs.rmSync(typesPath, {
+            recursive: true,
+            force: true,
+        });
+        fs.mkdirSync(typesPath, {
+            recursive: true,
+        });
+        fs.appendFileSync(`${typesPath}/index.ts`, [
+            `import "sst/node/config";`,
+            `declare module "sst/node/config" {`,
+            `  export interface ConfigTypes {`,
+            `    APP: string;`,
+            `    STAGE: string;`,
+            `  }`,
+            `}`,
+            ``,
+            ``,
+        ].join("\n"));
+    }
+    registerTypes(c) {
+        const typesPath = this.useTypesPath();
+        if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind) {
+            return;
+        }
+        const binding = bindType(c);
+        if (!binding) {
+            return;
+        }
+        const className = c.constructor.name;
+        const id = c.id;
+        fs.appendFileSync(`${typesPath}/index.ts`, (binding.variables[0] === "."
+            ? // Case: variable does not have properties, ie. Secrets and Parameters
+                [
+                    `import "sst/node/${binding.clientPackage}";`,
+                    `declare module "sst/node/${binding.clientPackage}" {`,
+                    `  export interface ${className}Resources {`,
+                    `    "${id}": string;`,
+                    `  }`,
+                    `}`,
+                    ``,
+                    ``,
+                ]
+            : [
+                `import "sst/node/${binding.clientPackage}";`,
+                `declare module "sst/node/${binding.clientPackage}" {`,
+                `  export interface ${className}Resources {`,
+                `    "${id}": {`,
+                ...binding.variables.map((p) => `      ${p}: string;`),
+                `    }`,
+                `  }`,
+                `}`,
+                ``,
+                ``,
+            ]).join("\n"));
+    }
     isFinished = false;
     async finish() {
         if (this.isFinished)
@@ -180,7 +243,6 @@ export class App extends CDKApp {
         Auth.injectConfig();
         this.buildConstructsMetadata();
         this.ensureUniqueConstructIds();
-        this.codegenTypes();
         // Run deferred tasks
         // - after codegen b/c some frontend frameworks (ie. Next.js apps) runs
         //   type checking in the build step
@@ -410,67 +472,6 @@ export class App extends CDKApp {
         }
         Aspects.of(this).add(new EnsureUniqueConstructIds());
     }
-    codegenTypes() {
-        const project = useProject();
-        const typesPath = path.resolve(project.paths.out, "types");
-        Logger.debug(`Generating types in ${typesPath}`);
-        fs.rmSync(typesPath, {
-            recursive: true,
-            force: true,
-        });
-        fs.mkdirSync(typesPath, {
-            recursive: true,
-        });
-        fs.appendFileSync(`${typesPath}/index.ts`, [
-            `import "sst/node/config";`,
-            `declare module "sst/node/config" {`,
-            `  export interface ConfigTypes {`,
-            `    APP: string;`,
-            `    STAGE: string;`,
-            `  }`,
-            `}`,
-            ``,
-            ``,
-        ].join("\n"));
-        this.foreachConstruct((c) => {
-            if (!isSSTConstruct(c)) {
-                return;
-            }
-            if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind) {
-                return;
-            }
-            const binding = bindType(c);
-            if (!binding) {
-                return;
-            }
-            const className = c.constructor.name;
-            const id = c.id;
-            // Case 1: variable does not have properties, ie. Secrets and Parameters
-            fs.appendFileSync(`${typesPath}/index.ts`, (binding.variables[0] === "."
-                ? [
-                    `import "sst/node/${binding.clientPackage}";`,
-                    `declare module "sst/node/${binding.clientPackage}" {`,
-                    `  export interface ${className}Resources {`,
-                    `    "${id}": string;`,
-                    `  }`,
-                    `}`,
-                    ``,
-                    ``,
-                ]
-                : [
-                    `import "sst/node/${binding.clientPackage}";`,
-                    `declare module "sst/node/${binding.clientPackage}" {`,
-                    `  export interface ${className}Resources {`,
-                    `    "${id}": {`,
-                    ...binding.variables.map((p) => `      ${p}: string;`),
-                    `    }`,
-                    `  }`,
-                    `}`,
-                    ``,
-                    ``,
-                ]).join("\n"));
-        });
-    }
     foreachConstruct(fn) {
         const loop = (parent) => {
             for (const child of parent.node.children) {

package/constructs/AppSyncApi.js

@@ -72,6 +72,8 @@ export class AppSyncApi extends Construct {
                 this.addResolver(this, key, props.resolvers[key]);
             }
         }
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The Id of the internally created AppSync GraphQL API.

package/constructs/AstroSite.d.ts

@@ -1,6 +1,4 @@
 import { SsrSite } from "./SsrSite.js";
-import { SsrFunction } from "./SsrFunction.js";
-import { EdgeFunction } from "./EdgeFunction.js";
 /**
  * The `AstroSite` construct is a higher level CDK construct that makes it easy to create a Astro app.
  * @example
@@ -13,15 +11,57 @@ import { EdgeFunction } from "./EdgeFunction.js";
  * ```
  */
 export declare class AstroSite extends SsrSite {
-    protected initBuildConfig(): {
-        typesPath: string;
-        serverBuildOutputFile: string;
-        clientBuildOutputDir: string;
-        clientBuildVersionedSubDir: string;
+    protected typesPath: string;
+    protected plan(): {
+        cloudFrontFunctions?: {
+            serverCfFunction: {
+                constructId: string;
+                injections: string[];
+            };
+        } | undefined;
+        edgeFunctions?: {
+            edgeServer: {
+                constructId: string;
+                function: {
+                    description: string;
+                    handler: string;
+                    scopeOverride: AstroSite;
+                };
+            };
+        } | undefined;
+        origins: {
+            s3: {
+                type: "s3";
+                copy: {
+                    from: string;
+                    to: string;
+                    cached: true;
+                    versionedSubDir: string;
+                }[];
+            };
+            regionalServer?: {
+                type: "function";
+                constructId: string;
+                function: {
+                    description: string;
+                    handler: string;
+                };
+                streaming: true;
+            } | undefined;
+        };
+        behaviors: {
+            cacheType: "server" | "static";
+            pattern?: string | undefined;
+            origin: "s3" | "regionalServer";
+            cfFunction?: "serverCfFunction" | undefined;
+            edgeFunction?: "edgeServer" | undefined;
+        }[];
+        cachePolicyAllowedHeaders?: string[] | undefined;
+        buildId?: string | undefined;
+        warmerConfig?: {
+            function: string;
+        } | undefined;
     };
-    protected validateBuildOutput(): void;
-    protected createFunctionForRegional(): SsrFunction;
-    protected createFunctionForEdge(): EdgeFunction;
     getConstructMetadata(): {
         data: {
             mode: "placeholder" | "deployed";
@@ -35,5 +75,4 @@ export declare class AstroSite extends SsrSite {
         };
         type: "AstroSite";
     };
-    protected supportsStreaming(): boolean;
 }

package/constructs/AstroSite.js

@@ -1,8 +1,6 @@
 import fs from "fs";
 import path from "path";
 import { SsrSite } from "./SsrSite.js";
-import { SsrFunction } from "./SsrFunction.js";
-import { EdgeFunction } from "./EdgeFunction.js";
 /**
  * The `AstroSite` construct is a higher level CDK construct that makes it easy to create a Astro app.
  * @example
@@ -15,55 +13,78 @@ import { EdgeFunction } from "./EdgeFunction.js";
  * ```
  */
 export class AstroSite extends SsrSite {
-    initBuildConfig() {
-        return {
-            typesPath: "src",
-            serverBuildOutputFile: "dist/server/entry.mjs",
-            clientBuildOutputDir: "dist/client",
-            clientBuildVersionedSubDir: "assets",
-        };
-    }
-    validateBuildOutput() {
-        const serverDir = path.join(this.props.path, "dist/server");
-        const clientDir = path.join(this.props.path, "dist/client");
-        if (!fs.existsSync(serverDir) || !fs.existsSync(clientDir)) {
-            throw new Error(`Build output inside "dist/" does not contain the "server" and "client" folders. Make sure Server-side Rendering (SSR) is enabled in your Astro app. If you are looking to deploy the Astro app as a static site, please use the StaticSite construct — https://docs.sst.dev/constructs/StaticSite`);
-        }
-        super.validateBuildOutput();
-    }
-    createFunctionForRegional() {
-        const { runtime, timeout, memorySize, permissions, environment, nodejs, bind, cdk, } = this.props;
-        return new SsrFunction(this, `ServerFunction`, {
+    typesPath = "src";
+    plan() {
+        const { path: sitePath, edge } = this.props;
+        const serverConfig = {
             description: "Server handler for Astro",
-            handler: path.join(this.props.path, "dist", "server", "entry.handler"),
-            runtime,
-            memorySize,
-            timeout,
-            nodejs: {
-                format: "esm",
-                ...nodejs,
+            handler: path.join(sitePath, "dist", "server", "entry.handler"),
+        };
+        return this.validatePlan({
+            cloudFrontFunctions: {
+                serverCfFunction: {
+                    constructId: "CloudFrontFunction",
+                    injections: [this.useCloudFrontFunctionHostHeaderInjection()],
+                },
             },
-            bind,
-            environment,
-            permissions,
-            ...cdk?.server,
-        });
-    }
-    createFunctionForEdge() {
-        const { runtime, timeout, memorySize, bind, permissions, environment, nodejs, } = this.props;
-        return new EdgeFunction(this, `Server`, {
-            scopeOverride: this,
-            handler: path.join(this.props.path, "dist", "server", "entry.handler"),
-            runtime,
-            timeout,
-            memorySize,
-            bind,
-            environment,
-            permissions,
-            nodejs: {
-                format: "esm",
-                ...nodejs,
+            edgeFunctions: edge
+                ? {
+                    edgeServer: {
+                        constructId: "Server",
+                        function: {
+                            scopeOverride: this,
+                            ...serverConfig,
+                        },
+                    },
+                }
+                : undefined,
+            origins: {
+                ...(edge
+                    ? {}
+                    : {
+                        regionalServer: {
+                            type: "function",
+                            constructId: "ServerFunction",
+                            function: serverConfig,
+                            streaming: true,
+                        },
+                    }),
+                s3: {
+                    type: "s3",
+                    copy: [
+                        {
+                            from: "dist/client",
+                            to: "",
+                            cached: true,
+                            versionedSubDir: "assets",
+                        },
+                    ],
+                },
             },
+            behaviors: [
+                edge
+                    ? {
+                        cacheType: "server",
+                        cfFunction: "serverCfFunction",
+                        edgeFunction: "edgeServer",
+                        origin: "s3",
+                    }
+                    : {
+                        cacheType: "server",
+                        cfFunction: "serverCfFunction",
+                        origin: "regionalServer",
+                    },
+                // create 1 behaviour for each top level asset file/folder
+                ...fs.readdirSync(path.join(sitePath, "dist/client")).map((item) => ({
+                    cacheType: "static",
+                    pattern: fs
+                        .statSync(path.join(sitePath, "dist/client", item))
+                        .isDirectory()
+                        ? `${item}/*`
+                        : item,
+                    origin: "s3",
+                })),
+            ],
         });
     }
     getConstructMetadata() {
@@ -72,7 +93,4 @@ export class AstroSite extends SsrSite {
             ...this.getConstructMetadataBase(),
         };
     }
-    supportsStreaming() {
-        return true;
-    }
 }

package/constructs/Auth.js

@@ -61,6 +61,8 @@ export class Auth extends Construct {
             },
         });
         resource.node.addDependency(policy);
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /** @internal */
     getConstructMetadata() {

package/constructs/Bucket.js

@@ -34,6 +34,8 @@ export class Bucket extends Construct {
         this.cdk = {};
         this.createBucket();
         this.addNotifications(this, props?.notifications || {});
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The ARN of the internally created `Bucket` instance.

package/constructs/Cognito.js

@@ -47,6 +47,8 @@ export class Cognito extends Construct {
         this.createUserPoolClient();
         this.addTriggers();
         this.createIdentityPool();
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The id of the internally created Cognito User Pool.

package/constructs/Cron.js

@@ -35,6 +35,8 @@ export class Cron extends Construct {
         this.cdk = {};
         this.createEventsRule();
         this.jobFunction = this.createRuleTarget();
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * Binds the given list of resources to the cron job.

package/constructs/EdgeFunction.d.ts

@@ -9,9 +9,9 @@ import { Permissions } from "./util/permission.js";
 export interface EdgeFunctionProps {
     bundle?: string;
     handler: string;
-    runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
-    timeout: number | Duration;
-    memorySize: number | Size;
+    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+    timeout?: number | Duration;
+    memorySize?: number | Size;
     permissions?: Permissions;
     environment?: Record<string, string>;
     bind?: SSTConstruct[];
@@ -30,7 +30,6 @@ export declare class EdgeFunction extends Construct {
     private bindingEnvs;
     private props;
     constructor(scope: Construct, id: string, props: EdgeFunctionProps);
-    build(): Promise<void>;
     attachPermissions(permissions: Permissions): void;
     addEnvironment(key: string, value: string): void;
     private buildAssetFromHandler;

package/constructs/EdgeFunction.js

@@ -16,6 +16,7 @@ import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/
 import { toCdkSize } from "./util/size.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
+import { useDeferredTasks } from "./deferred_task.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -42,10 +43,13 @@ export class EdgeFunction extends Construct {
         this.scope = props.scopeOverride || this;
         this.props = {
             ...props,
+            runtime: "nodejs18.x",
+            timeout: 10,
+            memorySize: 1024,
             environment: props.environment || {},
             permissions: props.permissions || [],
         };
-        // Bind first b/e function's environment variables cannot be added after
+        // Bind first b/c function's environment variables cannot be added after
         this.bindingEnvs = {};
         this.bind(props.bind || []);
         // Create function with placeholder code
@@ -67,14 +71,14 @@ export class EdgeFunction extends Construct {
         this.currentVersion = Version.fromVersionArn(this, `${id}FunctionVersion`, `${fnArn}:${versionId}`);
         this.assetReplacer = assetReplacer;
         this.assetReplacerPolicy = assetReplacerPolicy;
-    }
-    async build() {
-        const { bundle, handler } = this.props;
-        const { asset, handlerFilename } = bundle
-            ? await this.buildAssetFromBundle(bundle, handler)
-            : await this.buildAssetFromHandler();
-        this.updateCodeReplacer(asset.s3BucketName, asset.s3ObjectKey, handlerFilename);
-        this.updateFunctionInUsEast1(asset.s3BucketName, asset.s3ObjectKey);
+        useDeferredTasks().add(async () => {
+            const { bundle, handler } = props;
+            const { asset, handlerFilename } = bundle
+                ? await this.buildAssetFromBundle(bundle, handler)
+                : await this.buildAssetFromHandler();
+            this.updateCodeReplacer(asset.s3BucketName, asset.s3ObjectKey, handlerFilename);
+            this.updateFunctionInUsEast1(asset.s3BucketName, asset.s3ObjectKey);
+        });
     }
     attachPermissions(permissions) {
         attachPermissionsToRole(this.role, permissions);

package/constructs/EventBus.js

@@ -53,6 +53,8 @@ export class EventBus extends Construct {
         this.cdk = {};
         this.createEventBus();
         this.addRules(this, props?.rules || {});
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The ARN of the internally created `EventBus` instance.

package/constructs/Function.d.ts

@@ -296,6 +296,10 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
      * ```
      */
     logRetention?: Lowercase<keyof typeof RetentionDays>;
+    /**
+     * @internal
+     */
+    _doNotAllowOthersToBind?: boolean;
 }
 export interface FunctionNameProps {
     /**
@@ -617,7 +621,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
     readonly id: string;
     readonly _isLiveDevEnabled: boolean;
     /** @internal */
-    _doNotAllowOthersToBind?: boolean;
+    readonly _doNotAllowOthersToBind?: boolean;
     private functionUrl?;
     private props;
     private allBindings;

package/constructs/Function.js

@@ -285,6 +285,7 @@ export class Function extends CDKFunction {
             });
         }
         this.id = id;
+        this._doNotAllowOthersToBind = props._doNotAllowOthersToBind;
         this.props = props || {};
         if (this.isNodeRuntime()) {
             // Enable reusing connections with Keep-Alive for NodeJs
@@ -305,6 +306,7 @@ export class Function extends CDKFunction {
         this.createUrl();
         this._isLiveDevEnabled = isLiveDevEnabled;
         useFunctions().add(this.node.addr, props);
+        app.registerTypes(this);
     }
     /**
      * The AWS generated URL of the Function.
@@ -493,12 +495,11 @@ export class Function extends CDKFunction {
     }
     static fromDefinition(scope, id, definition, inheritedProps, inheritErrorMessage) {
         if (typeof definition === "string") {
-            const fn = new Function(scope, id, {
+            return new Function(scope, id, {
                 ...(inheritedProps || {}),
                 handler: definition,
+                _doNotAllowOthersToBind: true,
             });
-            fn._doNotAllowOthersToBind = true;
-            return fn;
         }
         else if (definition instanceof Function) {
             if (inheritedProps && Object.keys(inheritedProps).length > 0) {
@@ -511,9 +512,10 @@ export class Function extends CDKFunction {
             throw new Error(`Please use sst.Function instead of lambda.Function for the "${id}" Function.`);
         }
         else if (definition.handler !== undefined) {
-            const fn = new Function(scope, id, Function.mergeProps(inheritedProps, definition));
-            fn._doNotAllowOthersToBind = true;
-            return fn;
+            return new Function(scope, id, {
+                ...Function.mergeProps(inheritedProps, definition),
+                _doNotAllowOthersToBind: true,
+            });
         }
         throw new Error(`Invalid function definition for the "${id}" Function`);
     }

package/constructs/Job.js

@@ -72,6 +72,7 @@ export class Job extends Construct {
             ...props,
             runtime: this.convertJobRuntimeToFunctionRuntime(),
         });
+        app.registerTypes(this);
     }
     getConstructMetadata() {
         return {
@@ -167,7 +168,7 @@ export class Job extends Construct {
         // Note: make the invoker function the same ID as the Job
         //       construct so users can identify the invoker function
         //       in the Console.
-        const fn = new Function(this, this.node.id, {
+        return new Function(this, this.node.id, {
             ...this.props,
             runtime: this.convertJobRuntimeToFunctionRuntime(),
             memorySize: 1024,
@@ -176,9 +177,8 @@ export class Job extends Construct {
                 ...this.props.environment,
                 SST_DEBUG_JOB: "true",
             },
+            _doNotAllowOthersToBind: true,
         });
-        fn._doNotAllowOthersToBind = true;
-        return fn;
     }
     createLogRetention() {
         const { logRetention } = this.props;

package/constructs/KinesisStream.js

@@ -41,6 +41,8 @@ export class KinesisStream extends Construct {
                 this.addConsumer(this, consumerName, props.consumers[consumerName]);
             }
         }
+        const app = this.node.root;
+        app.registerTypes(this);
     }
     /**
      * The ARN of the internally created Kinesis Stream