sst 2.11.6 → 2.11.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.11.6",
+  "version": "2.11.8",
   "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/project.js

@@ -40,7 +40,7 @@ export async function initProject(globals) {
             if (!fsSync.existsSync(file))
                 continue;
             // Logger.debug("found sst config");
-            const [metafile, config] = await load(file);
+            const [metafile, config] = await load(file, true);
             // Logger.debug("loaded sst config");
             return [metafile, config];
         }

package/sst.mjs

@@ -239,7 +239,10 @@ var init_fs = __esm({
 import esbuild from "esbuild";
 import fs3 from "fs/promises";
 import path3 from "path";
-async function load(input) {
+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");
   if (!root)
@@ -252,12 +255,14 @@ async function load(input) {
     const result = await esbuild.build({
       keepNames: true,
       bundle: true,
-      sourcemap: "inline",
       platform: "node",
       target: "esnext",
       metafile: true,
       format: "esm",
       logLevel: "silent",
+      define: {
+        "process.env.IS_SHALLOW": shallow ? "true" : "false"
+      },
       external: [
         "aws-cdk-lib",
         "sst",
@@ -267,6 +272,36 @@ async function load(input) {
           ...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: {
@@ -343,7 +378,7 @@ async function initProject(globals) {
       file = path4.join(root, "sst" + ext);
       if (!fsSync.existsSync(file))
         continue;
-      const [metafile2, config2] = await load(file);
+      const [metafile2, config2] = await load(file, true);
       return [metafile2, config2];
     }
     throw new VisibleError(
@@ -6141,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");
@@ -6187,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: [
       {
@@ -6294,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  };"
     );
@@ -6391,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);
@@ -6445,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);
           })
         );
@@ -6458,7 +6493,7 @@ var init_kysely = __esm({
         );
         if (!db)
           return;
-        generate2(db).catch((err) => {
+        generate3(db).catch((err) => {
           logger(err);
         });
       });

package/stacks/build.d.ts

@@ -6,4 +6,4 @@ declare module "../bus.js" {
         };
     }
 }
-export declare function load(input: string): Promise<readonly [esbuild.Metafile, any]>;
+export declare function load(input: string, shallow?: boolean): Promise<readonly [esbuild.Metafile, any]>;

package/stacks/build.js

@@ -4,7 +4,11 @@ import path from "path";
 import { dynamicImport } from "../util/module.js";
 import { findAbove } from "../util/fs.js";
 import { VisibleError } from "../error.js";
-export async function load(input) {
+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");
     if (!root)
@@ -16,12 +20,14 @@ export async function load(input) {
         const result = await esbuild.build({
             keepNames: true,
             bundle: true,
-            sourcemap: "inline",
             platform: "node",
             target: "esnext",
             metafile: true,
             format: "esm",
             logLevel: "silent",
+            define: {
+                "process.env.IS_SHALLOW": shallow ? "true" : "false",
+            },
             external: [
                 "aws-cdk-lib",
                 "sst",
@@ -31,6 +37,38 @@ export async function load(input) {
                     ...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: {
@@ -42,6 +80,11 @@ export async function load(input) {
             // 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],
         });
         // Logger.debug("built", input);