sst 1.16.0 → 2.0.0-rc.0

package/{dist/constructs → constructs}/Cron.js

@@ -21,6 +21,13 @@ import { Function as Func, } from "./Function.js";
  * ```
  */
 export class Cron extends Construct {
+    id;
+    cdk;
+    /**
+     * The internally created Function instance that'll be run on schedule.
+     */
+    jobFunction;
+    props;
     constructor(scope, id, props) {
         super(scope, props.cdk?.id || id);
         this.id = id;

package/{dist/constructs → constructs}/DebugApp.d.ts

@@ -26,11 +26,11 @@ export declare class DebugApp extends App {
      */
     readonly name: string;
     /**
-     * The stage the app is being deployed to. If this is not specified as the [`--stage`](/packages/cli.md#--stage) option, it'll default to the stage configured during the initial run of the SST CLI.
+     * The stage the app is being deployed to. If this is not specified as the [`--stage`](/packages/sst.md#--stage) option, it'll default to the stage configured during the initial run of the SST CLI.
      */
     readonly stage: string;
     /**
-     * The region the app is being deployed to. If this is not specified as the [`--region`](/packages/cli.md#--region) option in the SST CLI, it'll default to the `region` in your `sst.json`.
+     * The region the app is being deployed to. If this is not specified as the [`--region`](/packages/sst.md#--region) option in the SST CLI, it'll default to the `region` in your `sst.json`.
      */
     readonly region: string;
     /**

package/{dist/constructs → constructs}/DebugApp.js

@@ -4,6 +4,22 @@ import { isStackConstruct, isSSTDebugStack } from "./Construct.js";
  * The DebugApp construct is used internally by SST to create the resources needed to power Live Lambda Development.
  */
 export class DebugApp extends App {
+    /**
+     * The name of the app. This comes from the `name` in your `sst.json`.
+     */
+    name;
+    /**
+     * The stage the app is being deployed to. If this is not specified as the [`--stage`](/packages/sst.md#--stage) option, it'll default to the stage configured during the initial run of the SST CLI.
+     */
+    stage;
+    /**
+     * The region the app is being deployed to. If this is not specified as the [`--region`](/packages/sst.md#--region) option in the SST CLI, it'll default to the `region` in your `sst.json`.
+     */
+    region;
+    /**
+     * The AWS account the app is being deployed to. This comes from the IAM credentials being used to run the SST CLI.
+     */
+    account;
     /**
      * @internal
      */

package/{dist/constructs → constructs}/DebugStack.js

@@ -12,6 +12,10 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
  * The `DebugStack` construct is used internally to create the resources needed to power Live Lambda Development. Note that, the `DebugStack` construct should only be created inside the [`DebugApp`](DebugApp).
  */
 export class DebugStack extends cdk.Stack {
+    stage;
+    api;
+    table;
+    bucket;
     constructor(scope, id, props) {
         const app = scope.node.root;
         const stackId = app.logicalPrefixedName(id);

package/{dist/constructs → constructs}/EdgeFunction.d.ts

@@ -8,6 +8,7 @@ export interface EdgeFunctionProps {
     timeout?: number;
     memory?: number;
     permissions?: Permissions;
+    format?: "cjs" | "esm";
     environment?: Record<string, string>;
     /**
      * This is intended to be used internally by SST to make constructs

package/{dist/constructs → constructs}/EdgeFunction.js

@@ -1,6 +1,6 @@
+import fs from "fs";
 import url from "url";
 import path from "path";
-import fs from "fs-extra";
 import crypto from "crypto";
 import { Construct } from "constructs";
 import * as iam from "aws-cdk-lib/aws-iam";
@@ -15,12 +15,17 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 // Construct
 /////////////////////
 export class EdgeFunction extends Construct {
+    role;
+    functionArn;
+    scope;
+    versionId;
+    props;
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
-        const { handler } = props;
+        const { format, scopeOverride } = props;
         // Correct scope
-        this.scope = this.props.scopeOverride || this;
+        this.scope = scopeOverride || this;
         // Wrap function code
         this.wrapFunctionCode();
         // Create function asset
@@ -39,15 +44,19 @@ export class EdgeFunction extends Construct {
         attachPermissionsToRole(this.role, permissions);
     }
     wrapFunctionCode() {
+        const { bundlePath, format } = this.props;
         // Parse handler
         const parts = this.props.handler.split(".");
         const handlerImportPath = parts.slice(0, -1).join(".");
         const handlerMethod = parts.slice(-1)[0];
-        const content = `
-"use strict";
-
-const index = require("./${handlerImportPath}");
-
+        const handlerExt = [".js", ".jsx", ".mjs", ".cjs"].find((ext) => fs.existsSync(path.join(bundlePath, handlerImportPath + ext)));
+        const imports = this.props.format === "esm"
+            ? `import * as index from "./${handlerImportPath}${handlerExt}";`
+            : `"use strict"; const index = require("./${handlerImportPath}");`;
+        const exports = this.props.format === "esm"
+            ? `export { handler };`
+            : `exports.handler = handler;`;
+        const content = `${imports}
 const handler = async (event) => {
   try {
     // We expose an environment variable token which is used by the code
@@ -72,10 +81,9 @@ const handler = async (event) => {
   return await index.${handlerMethod}(event);
 };
 
-exports.handler = handler;
-  `;
-        const { bundlePath } = this.props;
-        fs.writeFileSync(path.join(bundlePath, "index-wrapper.js"), content);
+${exports}
+`;
+        fs.writeFileSync(path.join(bundlePath, `index-wrapper.${format === "esm" ? "mjs" : "cjs"}`), content);
     }
     createAsset() {
         const { bundlePath } = this.props;
@@ -113,7 +121,7 @@ exports.handler = handler;
                 S3Bucket: asset.s3BucketName,
                 S3Key: asset.s3ObjectKey,
             },
-            Runtime: lambda.Runtime.NODEJS_16_X.name,
+            Runtime: lambda.Runtime.NODEJS_18_X.name,
             MemorySize: memory || 512,
             Timeout: Duration.seconds(timeout || 10).toSeconds(),
             Role: this.role.roleArn,
@@ -143,6 +151,7 @@ exports.handler = handler;
         // Note: Source code for the Lambda functions have "{{ ENV_KEY }}" in them.
         //       They need to be replaced with real values before the Lambda
         //       functions get deployed.
+        const { format } = this.props;
         const providerId = "LambdaCodeReplacerProvider";
         const resId = `${name}LambdaCodeReplacer`;
         const stack = Stack.of(this);
@@ -150,11 +159,7 @@ exports.handler = handler;
         // Create provider if not already created
         if (!provider) {
             provider = new lambda.Function(stack, providerId, {
-                code: lambda.Code.fromAsset(
-                // TODO: Move this file into a shared folder
-                // This references a Nextjs directory, but the underlying
-                // code appears to be generic enough to utilise in this case.
-                path.join(__dirname, "../assets/NextjsSite/custom-resource")),
+                code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function-code-replacer")),
                 layers: [this.createSingletonAwsCliLayer()],
                 runtime: lambda.Runtime.PYTHON_3_7,
                 handler: "lambda-code-updater.handler",
@@ -178,7 +183,7 @@ exports.handler = handler;
                     ObjectKey: asset.s3ObjectKey,
                 },
                 ReplaceValues: [{
-                        files: "index-wrapper.js",
+                        files: `index-wrapper.${format === "esm" ? "mjs" : "cjs"}`,
                         search: '"{{ _SST_EDGE_FUNCTION_ENVIRONMENT_ }}"',
                         replace: JSON.stringify(this.props.environment || {}),
                     }],
@@ -197,7 +202,7 @@ exports.handler = handler;
         }
         // Create provider
         const provider = new lambda.Function(stack, providerId, {
-            code: lambda.Code.fromAsset(path.join(__dirname, "nextjs-site", "custom-resource")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function")),
             handler: "s3-bucket.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
             timeout: Duration.minutes(15),
@@ -229,7 +234,7 @@ exports.handler = handler;
         // Create provider if not already created
         if (!provider) {
             provider = new lambda.Function(stack, providerId, {
-                code: lambda.Code.fromAsset(path.join(__dirname, "nextjs-site", "custom-resource")),
+                code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function")),
                 handler: "edge-lambda.handler",
                 runtime: lambda.Runtime.NODEJS_16_X,
                 timeout: Duration.minutes(15),
@@ -267,7 +272,7 @@ exports.handler = handler;
         // Create provider if not already created
         if (!provider) {
             provider = new lambda.Function(stack, providerId, {
-                code: lambda.Code.fromAsset(path.join(__dirname, "nextjs-site", "custom-resource")),
+                code: lambda.Code.fromAsset(path.join(__dirname, "../support/edge-function")),
                 handler: "edge-lambda-version.handler",
                 runtime: lambda.Runtime.NODEJS_16_X,
                 timeout: Duration.minutes(15),

package/{dist/constructs → constructs}/EventBus.js

@@ -29,12 +29,15 @@ import { Function as Fn, } from "./Function.js";
  * ```
  */
 export class EventBus extends Construct {
+    id;
+    cdk;
+    rulesData = {};
+    targetsData = {};
+    bindingForAllTargets = [];
+    permissionsAttachedForAllTargets = [];
+    props;
     constructor(scope, id, props) {
         super(scope, props?.cdk?.id || id);
-        this.rulesData = {};
-        this.targetsData = {};
-        this.bindingForAllTargets = [];
-        this.permissionsAttachedForAllTargets = [];
         this.id = id;
         this.props = props || {};
         this.cdk = {};

package/{dist/constructs → constructs}/Function.d.ts

@@ -1,8 +1,7 @@
-import type { Loader } from "esbuild";
+import type { Loader, BuildOptions } from "esbuild";
 import { Construct } from "constructs";
 import * as cdk from "aws-cdk-lib";
 import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as lambdaNode from "aws-cdk-lib/aws-lambda-nodejs";
 import * as logs from "aws-cdk-lib/aws-logs";
 import { Stack } from "./Stack.js";
 import { Secret, Parameter } from "./Config.js";
@@ -20,6 +19,7 @@ declare const supportedRuntimes: {
     "nodejs12.x": cdk.aws_lambda.Runtime;
     "nodejs14.x": cdk.aws_lambda.Runtime;
     "nodejs16.x": cdk.aws_lambda.Runtime;
+    "nodejs18.x": cdk.aws_lambda.Runtime;
     "python2.7": cdk.aws_lambda.Runtime;
     "python3.6": cdk.aws_lambda.Runtime;
     "python3.7": cdk.aws_lambda.Runtime;
@@ -39,7 +39,40 @@ export declare type FunctionInlineDefinition = string | Function;
 export declare type FunctionDefinition = string | Function | FunctionProps;
 export interface FunctionUrlCorsProps extends functionUrlCors.CorsProps {
 }
+export interface FunctionHooks {
+    /**
+     * Hook to run before build
+     */
+    beforeBuild?: (props: FunctionProps, out: string) => Promise<void>;
+    /**
+     * Hook to run after build
+     */
+    afterBuild?: (props: FunctionProps, out: string) => Promise<void>;
+}
 export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionName" | "memorySize" | "timeout" | "runtime" | "tracing" | "layers" | "architecture" | "logRetention"> {
+    /**
+     * Used to configure additional files to copy into the function bundle
+     *
+     * @example
+     * ```js
+     * new Function(stack, "Function", {
+     *   copyFiles: [{ from: "src/index.js" }]
+     * })
+     *```
+     */
+    copyFiles?: FunctionBundleCopyFilesProps[];
+    /**
+     * Used to configure nodejs function properties
+     */
+    nodejs?: NodeJSProps;
+    /**
+     * Used to configure java function properties
+     */
+    java?: JavaProps;
+    /**
+     * Hooks to run before and after function builds
+     */
+    hooks?: FunctionHooks;
     /**
      * The CPU architecture of the lambda function.
      *
@@ -92,20 +125,6 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * })
      *```
      */
-    srcPath?: string;
-    /**
-     * The runtime environment. Only runtimes of the Node.js, Python, Go, and .NET (C# and F#) family are supported.
-     *
-     * @default "nodejs14.x"
-     *
-     * @example
-     * ```js
-     * new Function(stack, "Function", {
-     *   handler: "src/function.handler",
-     *   runtime: "nodejs16.x",
-     * })
-     *```
-     */
     runtime?: Runtime;
     /**
      * The amount of disk storage in MB allocated.
@@ -191,20 +210,6 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * ```
      */
     environment?: Record<string, string>;
-    /**
-     * Configure or disable bundling options
-     *
-     * @example
-     * ```js
-     * new Function(stack, "Function", {
-     *   handler: "src/function.handler",
-     *   bundle: {
-     *     copyFiles: [{ from: "src/index.js" }]
-     *   }
-     * })
-     *```
-     */
-    bundle?: FunctionBundleProp;
     /**
      * Bind resources for the function
      *
@@ -316,12 +321,6 @@ export interface FunctionNameProps {
      */
     functionProps: FunctionProps;
 }
-export interface FunctionHandlerProps {
-    srcPath: string;
-    handler: string;
-    bundle: FunctionBundleProp;
-    runtime: string;
-}
 export interface FunctionUrlProps {
     /**
      * The authorizer for the function URL
@@ -364,36 +363,7 @@ export interface FunctionUrlProps {
      */
     cors?: boolean | FunctionUrlCorsProps;
 }
-export declare type FunctionBundleProp = FunctionBundleNodejsProps | FunctionBundlePythonProps | FunctionBundleJavaProps | boolean;
-interface FunctionBundleBase {
-    /**
-     * Used to configure additional files to copy into the function bundle
-     *
-     * @example
-     * ```js
-     * new Function(stack, "Function", {
-     *   bundle: {
-     *     copyFiles: [{ from: "src/index.js" }]
-     *   }
-     * })
-     *```
-     */
-    copyFiles?: FunctionBundleCopyFilesProps[];
-}
-/**
- * Used to configure NodeJS bundling options
- *
- * @example
- * ```js
- * new Function(stack, "Function", {
- *   bundle: {
- *    format: "esm",
- *    minify: false
- *   }
- * })
- * ```
- */
-export interface FunctionBundleNodejsProps extends FunctionBundleBase {
+export interface NodeJSProps {
     /**
      * Configure additional esbuild loaders for other file extensions
      *
@@ -409,19 +379,6 @@ export interface FunctionBundleNodejsProps extends FunctionBundleBase {
      * ```
      */
     loader?: Record<string, Loader>;
-    /**
-     * Packages that will not be included in the bundle. Usually used to exclude dependencies that are provided in layers
-     *
-     * @example
-     * ```js
-     * new Function(stack, "Function", {
-     *   bundle: {
-     *     externalModules: ["prisma"]
-     *   }
-     * })
-     * ```
-     */
-    externalModules?: string[];
     /**
      * Packages that will be excluded from the bundle and installed into node_modules instead. Useful for dependencies that cannot be bundled, like those with binary dependencies.
      *
@@ -434,7 +391,7 @@ export interface FunctionBundleNodejsProps extends FunctionBundleBase {
      * })
      * ```
      */
-    nodeModules?: string[];
+    install?: string[];
     /**
      * Use this to insert an arbitrary string at the beginning of generated JavaScript and CSS files.
      *
@@ -448,72 +405,10 @@ export interface FunctionBundleNodejsProps extends FunctionBundleBase {
      * ```
      */
     banner?: string;
-    /**
-     * Hooks to run at various stages of bundling
-     */
-    commandHooks?: lambdaNode.ICommandHooks;
     /**
      * This allows you to customize esbuild config.
      */
-    esbuildConfig?: {
-        /**
-         * Replace global identifiers with constant expressions.
-         *
-         * @example
-         * ```js
-         * new Function(stack, "Function", {
-         *   bundle: {
-         *     esbuildConfig: {
-         *       define: {
-         *         str: "text"
-         *       }
-         *     }
-         *   }
-         * })
-         * ```
-         */
-        define?: Record<string, string>;
-        /**
-         * When minifying preserve names of functions and variables
-         *
-         * @example
-         * ```js
-         * new Function(stack, "Function", {
-         *   bundle: {
-         *     esbuildConfig: {
-         *       keepNames: true
-         *     }
-         *   }
-         * })
-         * ```
-         */
-        keepNames?: boolean;
-        /**
-         * Path to a file that returns an array of esbuild plugins
-         *
-         * @example
-         * ```js
-         * new Function(stack, "Function", {
-         *   bundle: {
-         *     esbuildConfig: {
-         *       plugins: "path/to/plugins.js"
-         *     }
-         *   }
-         * })
-         * ```
-         *
-         * Where `path/to/plugins.js` looks something like this:
-         *
-         * ```js
-         * const { esbuildDecorators } = require("@anatine/esbuild-decorators");
-         *
-         * module.exports = [
-         *   esbuildDecorators(),
-         * ];
-         * ```
-         */
-        plugins?: string;
-    };
+    esbuild?: BuildOptions;
     /**
      * Enable or disable minification
      *
@@ -560,35 +455,10 @@ export interface FunctionBundleNodejsProps extends FunctionBundleBase {
      */
     sourcemap?: boolean;
 }
-/**
- * Used to configure Python bundling options
- */
-export interface FunctionBundlePythonProps extends FunctionBundleBase {
-    /**
-     * A list of commands to override the [default installing behavior](Function#bundle) for Python dependencies.
-     *
-     * Each string in the array is a command that'll be run. For example:
-     *
-     * @default "[]"
-     *
-     * @example
-     * ```js
-     * new Function(stack, "Function", {
-     *   bundle: {
-     *     installCommands: [
-     *       'export VARNAME="my value"',
-     *       'pip install --index-url https://domain.com/pypi/myprivatemodule/simple/ --extra-index-url https://pypi.org/simple -r requirements.txt .',
-     *     ]
-     *   }
-     * })
-     * ```
-     */
-    installCommands?: string[];
-}
 /**
  * Used to configure Java package build options
  */
-export interface FunctionBundleJavaProps extends FunctionBundleBase {
+export interface JavaProps {
     /**
      * Gradle build command to generate the bundled .zip file.
      *
@@ -635,6 +505,34 @@ export interface FunctionBundleJavaProps extends FunctionBundleBase {
      */
     experimentalUseProvidedRuntime?: "provided" | "provided.al2";
 }
+export declare type FunctionBundleProp = FunctionBundlePythonProps | boolean;
+interface FunctionBundleBase {
+}
+/**
+ * Used to configure Python bundling options
+ */
+export interface FunctionBundlePythonProps extends FunctionBundleBase {
+    /**
+     * A list of commands to override the [default installing behavior](Function#bundle) for Python dependencies.
+     *
+     * Each string in the array is a command that'll be run. For example:
+     *
+     * @default "[]"
+     *
+     * @example
+     * ```js
+     * new Function(stack, "Function", {
+     *   bundle: {
+     *     installCommands: [
+     *       'export VARNAME="my value"',
+     *       'pip install --index-url https://domain.com/pypi/myprivatemodule/simple/ --extra-index-url https://pypi.org/simple -r requirements.txt .',
+     *     ]
+     *   }
+     * })
+     * ```
+     */
+    installCommands?: string[];
+}
 /**
  * Used to configure additional files to copy into the function bundle
  *
@@ -675,7 +573,6 @@ export declare class Function extends lambda.Function implements SSTConstruct {
     readonly _isLiveDevEnabled: boolean;
     /** @internal */
     _disableBind?: boolean;
-    private readonly localId;
     private functionUrl?;
     private props;
     constructor(scope: Construct, id: string, props: FunctionProps);
@@ -722,10 +619,8 @@ export declare class Function extends lambda.Function implements SSTConstruct {
     getConstructMetadata(): {
         type: "Function";
         data: {
-            localId: string;
-            srcPath: string | undefined;
-            handler: string | undefined;
             arn: string;
+            localId: string;
             secrets: string[];
         };
     };
@@ -749,10 +644,14 @@ export declare class Function extends lambda.Function implements SSTConstruct {
     static normalizeTimeout(timeout?: number | Duration): cdk.Duration;
     static normalizeRuntime(runtime?: Runtime): Runtime;
     static normalizeSrcPath(srcPath: string): string;
-    static copyFiles(bundle: FunctionBundleProp | undefined, srcPath: string, buildPath: string): void;
     static handleImportedLayer(scope: Construct, layer: lambda.ILayerVersion): lambda.ILayerVersion;
     static isInlineDefinition(definition: any): definition is FunctionInlineDefinition;
     static fromDefinition(scope: Construct, id: string, definition: FunctionDefinition, inheritedProps?: FunctionProps, inheritErrorMessage?: string): Function;
     static mergeProps(baseProps?: FunctionProps, props?: FunctionProps): FunctionProps;
 }
+export declare const useFunctions: () => {
+    fromID(id: string): FunctionProps;
+    add(name: string, props: FunctionProps): void;
+    readonly all: Record<string, FunctionProps>;
+};
 export {};