sst 2.0.0-rc.21 → 2.0.0-rc.23

package/cli/commands/dev.js

@@ -9,6 +9,7 @@ import { usePothosBuilder } from "./plugins/pothos.js";
 import { useKyselyTypeGenerator } from "./plugins/kysely.js";
 import { useRDSWarmer } from "./plugins/warmer.js";
 import { useProject } from "../../project.js";
+import { useMetadata } from "../../stacks/metadata.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",
@@ -178,6 +179,7 @@ export const dev = (program) => program.command(["start", "dev"], "Work on your
         useIOTBridge(),
         useRuntimeServer(),
         usePothosBuilder(),
+        useMetadata(),
         useKyselyTypeGenerator(),
         useRDSWarmer(),
         useFunctionLogger(),

package/cli/commands/env.js

@@ -1,7 +1,6 @@
 import { useProject } from "../../project.js";
 import { createSpinner } from "../spinner.js";
 import fs from "fs/promises";
-import path from "path";
 import { SiteEnv } from "../../site-env.js";
 import { spawnSync } from "child_process";
 export const env = (program) => program.command("env <command>", "description", (yargs) => yargs.positional("command", {
@@ -23,9 +22,7 @@ export const env = (program) => program.command("env <command>", "description",
         }
         spinner?.succeed();
         const sites = await SiteEnv.values();
-        const current = path.relative(project.paths.root, process.cwd());
-        const env = sites[current] || {};
-        console.log(args.command);
+        const env = sites[process.cwd()] || {};
         const result = spawnSync(args.command, {
             env: {
                 ...process.env,

package/cli/commands/plugins/kysely.js

@@ -6,6 +6,8 @@ import { DatabaseMetadata, EnumCollection, PostgresDialect, Serializer, Transfor
 import { Context } from "../../../context/context.js";
 import { useBus } from "../../../bus.js";
 import { useProject } from "../../../project.js";
+import { Logger } from "../../../logger.js";
+import { useAWSCredentials, } from "../../../credentials.js";
 export const useKyselyTypeGenerator = Context.memo(async () => {
     let databases = [];
     const bus = useBus();
@@ -13,6 +15,8 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
     async function generate(db) {
         if (!db.types)
             return;
+        Logger.debug("Generating types for", db.migratorID);
+        const credentials = await useAWSCredentials();
         const k = new Kysely({
             dialect: new DataApiDialect({
                 mode: db.engine.includes("postgres") ? "postgres" : "mysql",
@@ -22,6 +26,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
                     database: db.defaultDatabaseName,
                     client: new RDSDataService({
                         region: project.config.region,
+                        credentials,
                     }),
                 },
             }),
@@ -67,13 +72,13 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
         await fs.writeFile(db.types.path, data);
     }
     bus.subscribe("stacks.metadata", (evt) => {
-        databases = Object.values(evt.properties)
-            .flat()
+        const constructs = Object.values(evt.properties).flat();
+        databases = constructs
             .filter((c) => c.type === "RDS")
             .filter((c) => c.data.migrator)
             .filter((c) => c.data.types)
             .map((c) => ({
-            migratorID: evt.properties.metadata.find((fn) => fn.addr == c.data.migrator?.node).addr,
+            migratorID: constructs.find((fn) => fn.addr == c.data.migrator?.node).addr,
             clusterArn: c.data.clusterArn,
             types: c.data.types,
             engine: c.data.engine,
@@ -83,9 +88,12 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
         databases.map((db) => generate(db));
     });
     bus.subscribe("function.success", async (evt) => {
+        if (!evt.properties.body?.results)
+            return;
         const db = databases.find((db) => db.migratorID === evt.properties.functionID);
         if (!db)
             return;
         generate(db);
     });
+    Logger.debug("Loaded kyseley type generator");
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.23",
   "bin": {
     "sst": "cli/sst.js"
   },

package/site-env.js

@@ -37,6 +37,7 @@ export async function writeValues(input) {
     await fs.promises.writeFile(file, JSON.stringify(input));
 }
 export function append(input) {
+    input.path = path.join(useProject().paths.root, input.path);
     fs.appendFileSync(keysFile(), JSON.stringify(input) + "\n");
 }
 export function reset() {

package/sst.mjs

@@ -5212,6 +5212,7 @@ async function writeValues(input) {
   await fs13.promises.writeFile(file, JSON.stringify(input));
 }
 function append(input) {
+  input.path = path14.join(useProject().paths.root, input.path);
   fs13.appendFileSync(keysFile(), JSON.stringify(input) + "\n");
 }
 function reset2() {
@@ -5283,15 +5284,15 @@ async function extractSchema(opts) {
       {
         name: "pothos-extractor",
         visitor: {
-          Program(path19) {
-            const dummyResolverId = path19.scope.generateUidIdentifier("DUMMY_RESOLVER");
+          Program(path18) {
+            const dummyResolverId = path18.scope.generateUidIdentifier("DUMMY_RESOLVER");
             const resolverNode = dummyResolver({
               dummy_resolver: dummyResolverId
             });
-            path19.unshiftContainer("body", resolverNode);
-            path19.scope.crawl();
+            path18.unshiftContainer("body", resolverNode);
+            path18.scope.crawl();
             let schemaBuilder = null;
-            path19.traverse({
+            path18.traverse({
               ImportDeclaration(declarator) {
                 if (!declarator)
                   return;
@@ -5349,17 +5350,17 @@ async function extractSchema(opts) {
   );
   return contents.code;
 }
-function getBindings(path19, globalPaths) {
+function getBindings(path18, globalPaths) {
   const bindings = [];
-  path19.traverse({
+  path18.traverse({
     Expression(expressionPath) {
       if (!expressionPath.isIdentifier())
         return;
-      const binding = path19.scope.getBinding(expressionPath);
+      const binding = path18.scope.getBinding(expressionPath);
       if (!binding || globalPaths.has(binding.path) || bindings.includes(binding.path))
         return;
       const rootBinding = findRootBinding(binding.path);
-      if (path19 === rootBinding) {
+      if (path18 === rootBinding) {
         bindings.push(binding.path);
         return;
       }
@@ -5372,8 +5373,8 @@ function getBindings(path19, globalPaths) {
   }
   return bindings;
 }
-function findRootBinding(path19) {
-  let rootPath = path19;
+function findRootBinding(path18) {
+  let rootPath = path18;
   while (rootPath.parentPath?.node !== void 0 && !rootPath.parentPath?.isProgram()) {
     rootPath = rootPath.parentPath;
   }
@@ -5428,6 +5429,8 @@ var usePothosBuilder = Context.memo(() => {
 init_context();
 init_bus();
 init_project();
+init_logger();
+init_credentials();
 import { Kysely } from "kysely";
 import { DataApiDialect } from "kysely-data-api";
 import RDSDataService from "aws-sdk/clients/rdsdataservice.js";
@@ -5446,6 +5449,8 @@ var useKyselyTypeGenerator = Context.memo(async () => {
   async function generate2(db) {
     if (!db.types)
       return;
+    Logger.debug("Generating types for", db.migratorID);
+    const credentials = await useAWSCredentials();
     const k = new Kysely({
       dialect: new DataApiDialect({
         mode: db.engine.includes("postgres") ? "postgres" : "mysql",
@@ -5454,7 +5459,8 @@ var useKyselyTypeGenerator = Context.memo(async () => {
           resourceArn: db.clusterArn,
           database: db.defaultDatabaseName,
           client: new RDSDataService({
-            region: project.config.region
+            region: project.config.region,
+            credentials
           })
         }
       })
@@ -5498,8 +5504,9 @@ var useKyselyTypeGenerator = Context.memo(async () => {
     await fs16.writeFile(db.types.path, data2);
   }
   bus.subscribe("stacks.metadata", (evt) => {
-    databases = Object.values(evt.properties).flat().filter((c) => c.type === "RDS").filter((c) => c.data.migrator).filter((c) => c.data.types).map((c) => ({
-      migratorID: evt.properties.metadata.find(
+    const constructs = Object.values(evt.properties).flat();
+    databases = constructs.filter((c) => c.type === "RDS").filter((c) => c.data.migrator).filter((c) => c.data.types).map((c) => ({
+      migratorID: constructs.find(
         (fn) => fn.addr == c.data.migrator?.node
       ).addr,
       clusterArn: c.data.clusterArn,
@@ -5511,6 +5518,8 @@ var useKyselyTypeGenerator = Context.memo(async () => {
     databases.map((db) => generate2(db));
   });
   bus.subscribe("function.success", async (evt) => {
+    if (!evt.properties.body?.results)
+      return;
     const db = databases.find(
       (db2) => db2.migratorID === evt.properties.functionID
     );
@@ -5518,6 +5527,7 @@ var useKyselyTypeGenerator = Context.memo(async () => {
       return;
     generate2(db);
   });
+  Logger.debug("Loaded kyseley type generator");
 });
 
 // src/cli/commands/plugins/warmer.ts
@@ -5555,6 +5565,7 @@ var useRDSWarmer = Context.memo(async () => {
 
 // src/cli/commands/dev.tsx
 init_project();
+init_metadata();
 var dev = (program2) => program2.command(
   ["start", "dev"],
   "Work on your SST app locally",
@@ -5755,6 +5766,7 @@ var dev = (program2) => program2.command(
       useIOTBridge2(),
       useRuntimeServer2(),
       usePothosBuilder(),
+      useMetadata(),
       useKyselyTypeGenerator(),
       useRDSWarmer(),
       useFunctionLogger(),
@@ -5940,7 +5952,6 @@ import dotenv2 from "dotenv";
 init_project();
 init_spinner();
 import fs19 from "fs/promises";
-import path18 from "path";
 import { spawnSync } from "child_process";
 var env = (program2) => program2.command(
   "env <command>",
@@ -5962,9 +5973,7 @@ var env = (program2) => program2.command(
       }
       spinner?.succeed();
       const sites = await site_env_exports.values();
-      const current = path18.relative(project.paths.root, process.cwd());
-      const env2 = sites[current] || {};
-      console.log(args.command);
+      const env2 = sites[process.cwd()] || {};
       const result = spawnSync(args.command, {
         env: {
           ...process.env,