sst 2.4.1 → 2.4.3

package/cli/commands/plugins/kysely.js

@@ -6,14 +6,15 @@ import { DatabaseMetadata, EnumCollection, PostgresDialect, MysqlDialect, Serial
 import { Context } from "../../../context/context.js";
 import { useBus } from "../../../bus.js";
 import { Logger } from "../../../logger.js";
-import { useAWSClient, } from "../../../credentials.js";
+import { useAWSClient } from "../../../credentials.js";
 export const useKyselyTypeGenerator = Context.memo(async () => {
     let databases = [];
     const bus = useBus();
+    const logger = Logger.debug.bind(null, "[kysely-codegen]");
     async function generate(db) {
         if (!db.types)
             return;
-        Logger.debug("Generating types for", db.migratorID);
+        logger("generating types for", db.migratorID);
         const k = new Kysely({
             dialect: new DataApiDialect({
                 mode: db.engine.includes("postgres") ? "postgres" : "mysql",
@@ -26,6 +27,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
             }),
         });
         const tables = await k.introspection.getTables();
+        logger("introspected tables");
         const metadata = db.engine.includes("postgres")
             ? tables.map((table) => ({
                 ...table,
@@ -46,6 +48,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
                     enumValues: null,
                 })),
             }));
+        logger("generated metadata", metadata.length);
         const transformer = new Transformer();
         const Dialect = db.engine.includes("postgres")
             ? new PostgresDialect()
@@ -55,6 +58,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
             camelCase: db.types.camelCase === true,
             metadata: new DatabaseMetadata(metadata, new EnumCollection()),
         });
+        logger("transformed nodes", nodes.length);
         const lastIndex = nodes.length - 1;
         const last = nodes[lastIndex];
         nodes[lastIndex] = {
@@ -82,7 +86,9 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
             defaultDatabaseName: c.data.defaultDatabaseName,
             secretArn: c.data.secretArn,
         }));
-        databases.map((db) => generate(db).catch(() => { }));
+        databases.map((db) => generate(db).catch((err) => {
+            logger(err);
+        }));
     });
     bus.subscribe("function.success", async (evt) => {
         if (!evt.properties.body?.results)
@@ -90,7 +96,9 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
         const db = databases.find((db) => db.migratorID === evt.properties.functionID);
         if (!db)
             return;
-        generate(db).catch(() => { });
+        generate(db).catch((err) => {
+            logger(err);
+        });
     });
-    Logger.debug("Loaded kyseley type generator");
+    logger("Loaded kyseley type generator");
 });

package/node/site/index.d.ts

@@ -8,8 +8,11 @@ export interface NextjsSiteResources {
 }
 export interface RemixSiteResources {
 }
+export interface SolidStartSiteResources {
+}
 export declare const StaticSite: StaticSiteResources;
 export declare const ReactStaticSite: ReactStaticSiteResources;
 export declare const ViteStaticSite: ViteStaticSiteResources;
 export declare const RemixSite: RemixSiteResources;
 export declare const NextjsSite: NextjsSiteResources;
+export declare const SolidStartSite: SolidStartSiteResources;

package/node/site/index.js

@@ -4,13 +4,16 @@ export const ReactStaticSite = createProxy("ReactStaticSite");
 export const ViteStaticSite = createProxy("ViteStaticSite");
 export const RemixSite = createProxy("RemixSite");
 export const NextjsSite = createProxy("NextjsSite");
+export const SolidStartSite = createProxy("SolidStartSite");
 const staticSiteData = getVariables("StaticSite");
 const reactSiteData = getVariables("ReactStaticSite");
 const viteSiteData = getVariables("ViteStaticSite");
 const nextjsSiteData = getVariables("NextjsSite");
 const remixSiteData = getVariables("RemixSite");
+const solidStartSiteData = getVariables("SolidStartSite");
 Object.assign(StaticSite, staticSiteData);
 Object.assign(ReactStaticSite, reactSiteData);
 Object.assign(ViteStaticSite, viteSiteData);
 Object.assign(NextjsSite, nextjsSiteData);
 Object.assign(RemixSite, remixSiteData);
+Object.assign(SolidStartSite, solidStartSiteData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/go.js

@@ -1,5 +1,6 @@
 import path from "path";
 import fs from "fs/promises";
+import os from "os";
 import { useRuntimeHandlers } from "../handlers.js";
 import { useRuntimeWorkers } from "../workers.js";
 import { Context } from "../../context/context.js";
@@ -57,7 +58,8 @@ export const useGoHandler = Context.memo(async () => {
             if (input.mode === "start") {
                 try {
                     const target = path.join(input.out, handlerName);
-                    const result = await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
+                    const srcPath = os.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
+                    const result = await execAsync(`go build -ldflags "-s -w" -o "${target}" ./${srcPath}`, {
                         cwd: project,
                         env: {
                             ...process.env,
@@ -71,7 +73,8 @@ export const useGoHandler = Context.memo(async () => {
             if (input.mode === "deploy") {
                 try {
                     const target = path.join(input.out, "bootstrap");
-                    await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
+                    const srcPath = os.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
+                    await execAsync(`go build -ldflags "-s -w" -o "${target}" ./${srcPath}`, {
                         cwd: project,
                         env: {
                             ...process.env,
@@ -81,8 +84,8 @@ export const useGoHandler = Context.memo(async () => {
                         },
                     });
                 }
-                catch {
-                    throw new VisibleError("Failed to build");
+                catch (ex) {
+                    throw new VisibleError(`Failed to build ${ex}`);
                 }
             }
             return {

package/sst.mjs

@@ -3312,7 +3312,7 @@ async function diff(stack, oldTemplate) {
   const pathMap = await buildLogicalToPathMap(stack);
   formatDifferences(stream, diff3, pathMap);
   while (true) {
-    if (output[output.length - 1].match(/^\s*$/)) {
+    if (output[output.length - 1]?.match(/^\s*$/)) {
       output.pop();
     } else {
       break;
@@ -4327,6 +4327,7 @@ __export(go_exports, {
 });
 import path9 from "path";
 import fs9 from "fs/promises";
+import os3 from "os";
 import { spawn as spawn2 } from "child_process";
 async function find(dir, target) {
   if (dir === "/")
@@ -4395,8 +4396,9 @@ var init_go = __esm({
           if (input.mode === "start") {
             try {
               const target = path9.join(input.out, handlerName);
+              const srcPath = os3.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
               const result = await execAsync(
-                `go build -ldflags '-s -w' -o '${target}' ./${src}`,
+                `go build -ldflags "-s -w" -o "${target}" ./${srcPath}`,
                 {
                   cwd: project,
                   env: {
@@ -4411,17 +4413,21 @@ var init_go = __esm({
           if (input.mode === "deploy") {
             try {
               const target = path9.join(input.out, "bootstrap");
-              await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
-                cwd: project,
-                env: {
-                  ...process.env,
-                  CGO_ENABLED: "0",
-                  GOARCH: input.props.architecture === "arm_64" ? "arm64" : "amd64",
-                  GOOS: "linux"
+              const srcPath = os3.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
+              await execAsync(
+                `go build -ldflags "-s -w" -o "${target}" ./${srcPath}`,
+                {
+                  cwd: project,
+                  env: {
+                    ...process.env,
+                    CGO_ENABLED: "0",
+                    GOARCH: input.props.architecture === "arm_64" ? "arm64" : "amd64",
+                    GOOS: "linux"
+                  }
                 }
-              });
-            } catch {
-              throw new VisibleError("Failed to build");
+              );
+            } catch (ex) {
+              throw new VisibleError(`Failed to build ${ex}`);
             }
           }
           return {
@@ -4627,7 +4633,7 @@ import path12 from "path";
 import { exec as exec5, spawn as spawn4 } from "child_process";
 import { promisify as promisify3 } from "util";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
-import os3 from "os";
+import os4 from "os";
 import url6 from "url";
 var execAsync3, RUNTIME_MAP, usePythonHandler;
 var init_python = __esm({
@@ -4676,7 +4682,7 @@ var init_python = __esm({
           const parsed = path12.parse(path12.relative(src, input.handler));
           const target = [...parsed.dir.split(path12.sep), parsed.name].join(".");
           const proc = spawn4(
-            os3.platform() === "win32" ? "python.exe" : "python3",
+            os4.platform() === "win32" ? "python.exe" : "python3",
             [
               "-u",
               url6.fileURLToPath(
@@ -4750,7 +4756,7 @@ __export(java_exports, {
 });
 import path13 from "path";
 import fs12 from "fs/promises";
-import os4 from "os";
+import os5 from "os";
 import zipLocal from "zip-local";
 import { spawn as spawn5 } from "child_process";
 import url7 from "url";
@@ -4795,7 +4801,7 @@ var init_java = __esm({
                 url7.fileURLToPath(
                   new URL("../../support/java-runtime/release/*", import.meta.url)
                 )
-              ].join(os4.platform() === "win32" ? ";" : ":"),
+              ].join(os5.platform() === "win32" ? ";" : ":"),
               "com.amazonaws.services.lambda.runtime.api.client.AWSLambda",
               input.handler
             ],
@@ -6301,10 +6307,11 @@ var init_kysely = __esm({
     useKyselyTypeGenerator = Context.memo(async () => {
       let databases = [];
       const bus = useBus();
+      const logger = Logger.debug.bind(null, "[kysely-codegen]");
       async function generate2(db) {
         if (!db.types)
           return;
-        Logger.debug("Generating types for", db.migratorID);
+        logger("generating types for", db.migratorID);
         const k = new Kysely({
           dialect: new DataApiDialect({
             mode: db.engine.includes("postgres") ? "postgres" : "mysql",
@@ -6317,6 +6324,7 @@ var init_kysely = __esm({
           })
         });
         const tables = await k.introspection.getTables();
+        logger("introspected tables");
         const metadata3 = db.engine.includes("postgres") ? tables.map((table) => ({
           ...table,
           columns: table.columns.map((column) => {
@@ -6335,6 +6343,7 @@ var init_kysely = __esm({
             enumValues: null
           }))
         }));
+        logger("generated metadata", metadata3.length);
         const transformer = new Transformer();
         const Dialect = db.engine.includes("postgres") ? new PostgresDialect() : new MysqlDialect();
         const nodes = transformer.transform({
@@ -6342,6 +6351,7 @@ var init_kysely = __esm({
           camelCase: db.types.camelCase === true,
           metadata: new DatabaseMetadata(metadata3, new EnumCollection())
         });
+        logger("transformed nodes", nodes.length);
         const lastIndex = nodes.length - 1;
         const last2 = nodes[lastIndex];
         nodes[lastIndex] = {
@@ -6367,8 +6377,11 @@ var init_kysely = __esm({
           defaultDatabaseName: c.data.defaultDatabaseName,
           secretArn: c.data.secretArn
         }));
-        databases.map((db) => generate2(db).catch(() => {
-        }));
+        databases.map(
+          (db) => generate2(db).catch((err) => {
+            logger(err);
+          })
+        );
       });
       bus.subscribe("function.success", async (evt) => {
         if (!evt.properties.body?.results)
@@ -6378,10 +6391,11 @@ var init_kysely = __esm({
         );
         if (!db)
           return;
-        generate2(db).catch(() => {
+        generate2(db).catch((err) => {
+          logger(err);
         });
       });
-      Logger.debug("Loaded kyseley type generator");
+      logger("Loaded kyseley type generator");
     });
   }
 });
@@ -7298,8 +7312,8 @@ var bind = (program2) => program2.command(
       Logger2.debug(`Failed to assume ${roleArn}.`, err);
     }
     async function localIamCredentials() {
-      const { useAWSCredentials: useAWSCredentials3 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
-      const credentials = await useAWSCredentials3();
+      const { useAWSCredentials: useAWSCredentials2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
+      const credentials = await useAWSCredentials2();
       return {
         AWS_ACCESS_KEY_ID: credentials.accessKeyId,
         AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,

package/stacks/diff.js

@@ -40,7 +40,7 @@ export async function diff(stack, oldTemplate) {
     formatDifferences(stream, diff, pathMap);
     // Remove trailing newline
     while (true) {
-        if (output[output.length - 1].match(/^\s*$/)) {
+        if (output[output.length - 1]?.match(/^\s*$/)) {
             output.pop();
         }
         else {