sst 2.11.7 → 2.11.9

package/constructs/EventBus.d.ts

@@ -426,6 +426,7 @@ export declare class EventBus extends Construct implements SSTConstruct {
     getFunctionBinding(): FunctionBindingProps;
     private retrierQueue;
     private retrierFn;
+    private retrierMap;
     private getRetrier;
     private createEventBus;
     private addRule;

package/constructs/EventBus.js

@@ -8,7 +8,9 @@ import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { SqsDestination } from "aws-cdk-lib/aws-lambda-destinations";
+import url from "url";
 import path from "path";
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
 /////////////////////
@@ -231,12 +233,17 @@ export class EventBus extends Construct {
     }
     retrierQueue;
     retrierFn;
+    retrierMap = {};
     getRetrier() {
+        const app = this.node.root;
         if (this.retrierFn && this.retrierQueue) {
             return { fn: this.retrierFn, queue: this.retrierQueue };
         }
-        this.retrierQueue = new sqs.Queue(this, `RetrierQueue`);
+        this.retrierQueue = new sqs.Queue(this, `RetrierQueue`, {
+            queueName: app.logicalPrefixedName(this.node.id + "Retrier"),
+        });
         this.retrierFn = new lambda.Function(this, `RetrierFunction`, {
+            functionName: app.logicalPrefixedName(this.node.id + "Retrier"),
             runtime: lambda.Runtime.NODEJS_14_X,
             handler: "index.handler",
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/event-bus-retrier")),
@@ -350,7 +357,20 @@ export class EventBus extends Construct {
         const count = this.subs.get(type) || 0 + 1;
         this.subs.set(type, count);
         const name = `${type.replaceAll(/[^a-zA-Z_]/g, "_")}_${count}`;
-        const fn = Fn.fromDefinition(this, name, target);
+        const retries = props?.retries || this.props.defaults?.retries;
+        const fn = (() => {
+            if (retries) {
+                const retrier = this.getRetrier();
+                const fn = Fn.fromDefinition(this, name, target, {
+                    onFailure: new SqsDestination(retrier.queue),
+                });
+                this.retrierMap[fn.functionArn] = retries;
+                retrier.fn.addEnvironment(`RETRIES`, JSON.stringify(this.retrierMap));
+                fn.grantInvoke(retrier.fn);
+                return fn;
+            }
+            return Fn.fromDefinition(this, name, target);
+        })();
         this.addRule(this, name + "_rule", {
             pattern: {
                 detailType: [type],
@@ -374,7 +394,8 @@ export class EventBus extends Construct {
             target = target;
             targetProps = target.cdk?.target;
             functionDefinition = target.function;
-            retries = target.retries;
+            if (target.retries)
+                retries = target.retries;
         }
         else {
             target = target;
@@ -385,15 +406,6 @@ export class EventBus extends Construct {
         this.targetsData[ruleKey][targetName] = fn;
         // Create target
         eventsRule.addTarget(new LambdaFunctionTarget(fn, targetProps));
-        // Configure retrier
-        if (retries) {
-            const retrier = this.getRetrier();
-            retrier.fn.addEnvironment(`RETRIER_${retrier.fn.functionName}`, retries.toString());
-            fn.grantInvoke(retrier.fn);
-            fn.configureAsyncInvoke({
-                onFailure: new SqsDestination(retrier.queue),
-            });
-        }
         // Attach existing permissions
         this.permissionsAttachedForAllTargets.forEach((permissions) => fn.attachPermissions(permissions));
         fn.bind(this.bindingForAllTargets);

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.11.7",
+  "version": "2.11.9",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -49,6 +49,7 @@
     "@aws-sdk/smithy-client": "^3.279.0",
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
+    "@babel/plugin-syntax-typescript": "^7.21.4",
     "@trpc/server": "9.16.0",
     "adm-zip": "^0.5.10",
     "aws-cdk-lib": "2.79.1",

package/sst.mjs

@@ -239,6 +239,9 @@ var init_fs = __esm({
 import esbuild from "esbuild";
 import fs3 from "fs/promises";
 import path3 from "path";
+import babel from "@babel/core";
+import generate from "@babel/generator";
+import ts from "@babel/plugin-syntax-typescript";
 async function load(input, shallow) {
   const parsed = path3.parse(input);
   const root = await findAbove(input, "package.json");
@@ -248,17 +251,10 @@ async function load(input, shallow) {
   const pkg = JSON.parse(
     await fs3.readFile(path3.join(root, "package.json")).then((x) => x.toString())
   );
-  let contents = await fs3.readFile(input).then((x) => x.toString());
-  if (shallow)
-    contents = contents.replaceAll(
-      /stacks\(.*?\)\s*{[\s\S]*?}\s*[,;]/gs,
-      "stacks() {},"
-    );
   try {
     const result = await esbuild.build({
       keepNames: true,
       bundle: true,
-      sourcemap: "inline",
       platform: "node",
       target: "esnext",
       metafile: true,
@@ -276,6 +272,36 @@ async function load(input, shallow) {
           ...pkg.peerDependencies
         })
       ],
+      plugins: [
+        {
+          name: "shallow",
+          setup(build2) {
+            if (!shallow)
+              return;
+            build2.onLoad({ filter: /.*/ }, async (args) => {
+              if (args.path !== input)
+                return;
+              let contents = await fs3.readFile(args.path).then((x) => x.toString());
+              const ast = babel.parse(contents, {
+                sourceType: "module",
+                plugins: [ts]
+              });
+              babel.traverse(ast, {
+                ObjectMethod(path20) {
+                  const { key } = path20.node;
+                  if ("name" in key && key.name === "stacks") {
+                    path20.remove();
+                  }
+                }
+              });
+              return {
+                contents: generate.default(ast).code,
+                loader: "ts"
+              };
+            });
+          }
+        }
+      ],
       absWorkingDir: root,
       outfile,
       banner: {
@@ -284,11 +310,7 @@ async function load(input, shallow) {
           `const require = topLevelCreateRequire(import.meta.url);`
         ].join("")
       },
-      stdin: {
-        contents,
-        loader: "ts",
-        resolveDir: path3.dirname(input)
-      }
+      entryPoints: [input]
     });
     const mod = await dynamicImport(outfile);
     await fs3.rm(outfile, {
@@ -6154,15 +6176,15 @@ var pothos_exports = {};
 __export(pothos_exports, {
   Pothos: () => pothos_exports,
   extractSchema: () => extractSchema,
-  generate: () => generate
+  generate: () => generate2
 });
-import babel from "@babel/core";
+import babel2 from "@babel/core";
 import generator from "@babel/generator";
 import esbuild3 from "esbuild";
 import fs14 from "fs/promises";
 import path16 from "path";
 import url9 from "url";
-async function generate(opts) {
+async function generate2(opts) {
   const { printSchema, lexicographicSortSchema } = await import("graphql");
   const contents = await extractSchema(opts);
   const out = path16.join(path16.dirname(opts.schema), "out.mjs");
@@ -6200,7 +6222,7 @@ async function extractSchema(opts) {
     ]
   });
   const globalPaths = /* @__PURE__ */ new Set();
-  const transformed = babel.transformSync(result.outputFiles[0].text, {
+  const transformed = babel2.transformSync(result.outputFiles[0].text, {
     sourceType: "module",
     plugins: [
       {
@@ -6307,7 +6329,7 @@ var init_pothos = __esm({
   "src/pothos.ts"() {
     "use strict";
     init_pothos();
-    ({ types, template } = babel);
+    ({ types, template } = babel2);
     dummyResolver = template(
       "const %%dummy_resolver%% = { serialize: x => x, parseValue: x => x  };"
     );
@@ -6404,7 +6426,7 @@ var init_kysely = __esm({
       let databases = [];
       const bus = useBus();
       const logger = Logger.debug.bind(null, "[kysely-codegen]");
-      async function generate2(db) {
+      async function generate3(db) {
         if (!db.types)
           return;
         logger("generating types for", db.migratorID);
@@ -6458,7 +6480,7 @@ var init_kysely = __esm({
           secretArn: c.data.secretArn
         }));
         databases.map(
-          (db) => generate2(db).catch((err) => {
+          (db) => generate3(db).catch((err) => {
             logger(err);
           })
         );
@@ -6471,7 +6493,7 @@ var init_kysely = __esm({
         );
         if (!db)
           return;
-        generate2(db).catch((err) => {
+        generate3(db).catch((err) => {
           logger(err);
         });
       });

package/stacks/build.js

@@ -4,6 +4,10 @@ import path from "path";
 import { dynamicImport } from "../util/module.js";
 import { findAbove } from "../util/fs.js";
 import { VisibleError } from "../error.js";
+import babel from "@babel/core";
+import generate from "@babel/generator";
+// @ts-expect-error
+import ts from "@babel/plugin-syntax-typescript";
 export async function load(input, shallow) {
     const parsed = path.parse(input);
     const root = await findAbove(input, "package.json");
@@ -11,15 +15,11 @@ export async function load(input, shallow) {
         throw new VisibleError("Could not find a package.json file");
     const outfile = path.join(parsed.dir, `.${parsed.name}.${Date.now()}.mjs`);
     const pkg = JSON.parse(await fs.readFile(path.join(root, "package.json")).then((x) => x.toString()));
-    let contents = await fs.readFile(input).then((x) => x.toString());
-    if (shallow)
-        contents = contents.replaceAll(/stacks\(.*?\)\s*{[\s\S]*?}\s*[,;]/gs, "stacks() {},");
     try {
         // Logger.debug("running esbuild on", input);
         const result = await esbuild.build({
             keepNames: true,
             bundle: true,
-            sourcemap: "inline",
             platform: "node",
             target: "esnext",
             metafile: true,
@@ -37,6 +37,38 @@ export async function load(input, shallow) {
                     ...pkg.peerDependencies,
                 }),
             ],
+            plugins: [
+                {
+                    name: "shallow",
+                    setup(build) {
+                        if (!shallow)
+                            return;
+                        build.onLoad({ filter: /.*/ }, async (args) => {
+                            if (args.path !== input)
+                                return;
+                            let contents = await fs
+                                .readFile(args.path)
+                                .then((x) => x.toString());
+                            const ast = babel.parse(contents, {
+                                sourceType: "module",
+                                plugins: [ts],
+                            });
+                            babel.traverse(ast, {
+                                ObjectMethod(path) {
+                                    const { key } = path.node;
+                                    if ("name" in key && key.name === "stacks") {
+                                        path.remove();
+                                    }
+                                },
+                            });
+                            return {
+                                contents: generate.default(ast).code,
+                                loader: "ts",
+                            };
+                        });
+                    },
+                },
+            ],
             absWorkingDir: root,
             outfile,
             banner: {
@@ -48,12 +80,12 @@ export async function load(input, shallow) {
             // The entry can have any file name (ie. "stacks/anything.ts"). We want the
             // build output to be always named "lib/index.js". This allow us to always
             // import from "buildDir" without needing to pass "anything" around.
-            stdin: {
-                contents,
-                loader: "ts",
-                resolveDir: path.dirname(input),
-            },
-            // entryPoints: [input],
+            //  stdin: {
+            //    contents,
+            //    loader: "ts",
+            //    resolveDir: path.dirname(input),
+            //  },
+            entryPoints: [input],
         });
         // Logger.debug("built", input);
         const mod = await dynamicImport(outfile);