sst 2.8.5 → 2.8.7

package/cli/commands/plugins/kysely.js

@@ -2,7 +2,7 @@ import { Kysely } from "kysely";
 import { DataApiDialect } from "kysely-data-api";
 import { RDSData } from "@aws-sdk/client-rds-data";
 import * as fs from "fs/promises";
-import { DatabaseMetadata, EnumCollection, PostgresDialect, MysqlDialect, Serializer, Transformer, } from "kysely-codegen";
+import { PostgresDialect, MysqlDialect, Serializer, Transformer, } from "kysely-codegen";
 import { Context } from "../../../context/context.js";
 import { useBus } from "../../../bus.js";
 import { Logger } from "../../../logger.js";
@@ -15,48 +15,31 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
         if (!db.types)
             return;
         logger("generating types for", db.migratorID);
+        const dataApi = new DataApiDialect({
+            mode: db.engine.includes("postgres") ? "postgres" : "mysql",
+            driver: {
+                secretArn: db.secretArn,
+                resourceArn: db.clusterArn,
+                database: db.defaultDatabaseName,
+                client: useAWSClient(RDSData),
+            },
+        });
         const k = new Kysely({
-            dialect: new DataApiDialect({
-                mode: db.engine.includes("postgres") ? "postgres" : "mysql",
-                driver: {
-                    secretArn: db.secretArn,
-                    resourceArn: db.clusterArn,
-                    database: db.defaultDatabaseName,
-                    client: useAWSClient(RDSData),
-                },
-            }),
+            dialect: dataApi,
         });
-        const tables = await k.introspection.getTables();
-        logger("introspected tables");
-        const metadata = db.engine.includes("postgres")
-            ? tables.map((table) => ({
-                ...table,
-                columns: table.columns.map((column) => {
-                    const isArray = column.dataType.startsWith("_");
-                    return {
-                        ...column,
-                        dataType: isArray ? column.dataType.slice(1) : column.dataType,
-                        enumValues: null,
-                        isArray,
-                    };
-                }),
-            }))
-            : tables.map((table) => ({
-                ...table,
-                columns: table.columns.map((column) => ({
-                    ...column,
-                    enumValues: null,
-                })),
-            }));
-        logger("generated metadata", metadata.length);
-        const transformer = new Transformer();
-        const Dialect = db.engine.includes("postgres")
+        const dialect = db.engine.includes("postgres")
             ? new PostgresDialect()
             : new MysqlDialect();
+        const instrospection = await dialect.introspector.introspect({
+            // @ts-ignore
+            db: k,
+        });
+        logger("introspected tables");
+        const transformer = new Transformer();
         const nodes = transformer.transform({
-            dialect: Dialect,
+            dialect: dialect,
             camelCase: db.types.camelCase === true,
-            metadata: new DatabaseMetadata(metadata, new EnumCollection()),
+            metadata: instrospection,
         });
         logger("transformed nodes", nodes.length);
         const lastIndex = nodes.length - 1;

package/cli/commands/plugins/pothos.js

@@ -14,6 +14,7 @@ export const usePothosBuilder = Context.memo(() => {
         try {
             const schema = await Pothos.generate({
                 schema: route.schema,
+                internalPackages: route.internalPackages,
             });
             await fs.writeFile(route.output, schema);
             // bus.publish("pothos.extracted", { file: route.output });

package/constructs/Api.d.ts

@@ -586,6 +586,10 @@ export interface ApiGraphQLRouteProps<AuthorizerKeys> extends ApiBaseRouteProps<
          * Commands to run after generating schema. Useful for code generation steps
          */
         commands?: string[];
+        /**
+         * List of packages that should be considered internal during schema generation
+         */
+        internalPackages?: string[];
     };
 }
 /**
@@ -753,6 +757,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
                     stack: string;
                 } | undefined;
                 schema?: undefined;
+                internalPackages?: undefined;
                 output?: undefined;
                 commands?: undefined;
             } | {
@@ -763,6 +768,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
                     stack: string;
                 } | undefined;
                 schema: string | undefined;
+                internalPackages: string[] | undefined;
                 output: string | undefined;
                 commands: string[] | undefined;
             } | {
@@ -770,6 +776,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
                 route: string;
                 fn?: undefined;
                 schema?: undefined;
+                internalPackages?: undefined;
                 output?: undefined;
                 commands?: undefined;
             })[];

package/constructs/Api.js

@@ -231,6 +231,7 @@ export class Api extends Construct {
                             route: key,
                             fn: getFunctionRef(data.function),
                             schema: data.schema,
+                            internalPackages: data.internalPackages,
                             output: data.output,
                             commands: data.commands,
                         };
@@ -591,6 +592,7 @@ export class Api extends Construct {
                 output: routeProps.pothos?.output,
                 schema: routeProps.pothos?.schema,
                 commands: routeProps.pothos?.commands,
+                internalPackages: routeProps.pothos?.internalPackages,
             };
         }
         return result;

package/constructs/SsrSite.js

@@ -8,7 +8,7 @@ import { execSync } from "child_process";
 import { Construct } from "constructs";
 import { Fn, Token, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib";
 import { BlockPublicAccess, Bucket, } from "aws-cdk-lib/aws-s3";
-import { Role, Effect, Policy, PolicyStatement, AnyPrincipal, } from "aws-cdk-lib/aws-iam";
+import { Role, Effect, Policy, PolicyStatement, AccountPrincipal, } from "aws-cdk-lib/aws-iam";
 import { Function as CdkFunction, Code, Runtime, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
 import { HostedZone, ARecord, AaaaRecord, RecordTarget, } from "aws-cdk-lib/aws-route53";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
@@ -430,8 +430,9 @@ export class SsrSite extends Construct {
     }
     createFunctionForDev() {
         const { runtime, timeout, memorySize, permissions, environment, bind } = this.props;
+        const app = this.node.root;
         const role = new Role(this, "ServerFunctionRole", {
-            assumedBy: new AnyPrincipal(),
+            assumedBy: new AccountPrincipal(app.account),
             maxSessionDuration: CdkDuration.hours(12),
         });
         const ssrFn = new SsrFunction(this, `ServerFunction`, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -72,8 +72,8 @@
     "immer": "9",
     "ink": "^4.0.0",
     "ink-spinner": "^5.0.0",
-    "kysely": "^0.23.4",
-    "kysely-codegen": "^0.9.0",
+    "kysely": "^0.23.5",
+    "kysely-codegen": "^0.10.0",
     "kysely-data-api": "^0.2.0",
     "minimatch": "^6.1.6",
     "openid-client": "^5.1.8",

package/pothos.d.ts

@@ -1,8 +1,7 @@
 export * as Pothos from "./pothos.js";
 interface GenerateOpts {
     schema: string;
+    internalPackages?: string[];
 }
 export declare function generate(opts: GenerateOpts): Promise<string>;
-export declare function extractSchema(opts: {
-    schema: string;
-}): Promise<any>;
+export declare function extractSchema(opts: GenerateOpts): Promise<any>;

package/pothos.js

@@ -32,6 +32,9 @@ export async function extractSchema(opts) {
                 setup(build) {
                     const filter = /^[^.\/]|^\.[^.\/]|^\.\.[^\/]/; // Must not start with "/" or "./" or "../"
                     build.onResolve({ filter }, (args) => {
+                        const packageName = args.path.match(/^(@[^\/]+\/[^\/]+|[^@/]+)/);
+                        if (packageName && opts.internalPackages?.includes(packageName[0]))
+                            return;
                         return {
                             path: args.path,
                             external: true,

package/runtime/handlers/dotnet.js

@@ -42,7 +42,7 @@ export const useDotnetHandler = Context.memo(async () => {
             const name = input.handler.split(":")[0];
             const proc = spawn(`dotnet`, [
                 `exec`,
-                url.fileURLToPath(new URL(`../../support/${BOOTSTRAP_MAP["dotnetcore3.1"]}/release/dotnet-bootstrap.dll`, import.meta.url)),
+                url.fileURLToPath(new URL(`../../support/${BOOTSTRAP_MAP[input.runtime]}/release/dotnet-bootstrap.dll`, import.meta.url)),
                 name + ".dll",
                 input.handler,
             ], {
@@ -81,7 +81,7 @@ export const useDotnetHandler = Context.memo(async () => {
                     "dotnet",
                     "publish",
                     "--output",
-                    input.out,
+                    '"' + input.out + '"',
                     "--configuration",
                     "Release",
                     "--framework",
@@ -104,6 +104,7 @@ export const useDotnetHandler = Context.memo(async () => {
                 return {
                     type: "success",
                     handler: input.props.handler,
+                    runtime: input.props.runtime,
                 };
             }
             catch (ex) {

package/runtime/handlers.d.ts

@@ -22,6 +22,7 @@ interface StartWorkerInput {
     environment: Record<string, string>;
     out: string;
     handler: string;
+    runtime: string;
 }
 interface ShouldBuildInput {
     file: string;

package/runtime/workers.js

@@ -45,6 +45,7 @@ export const useRuntimeWorkers = Context.memo(async () => {
             workerID: evt.properties.workerID,
             environment: evt.properties.env,
             url: `${server.url}/${evt.properties.workerID}/${server.API_VERSION}`,
+            runtime: props.runtime,
         });
         workers.set(evt.properties.workerID, {
             workerID: evt.properties.workerID,

package/sst.mjs

@@ -3960,7 +3960,8 @@ var init_workers = __esm({
           ...build2,
           workerID: evt.properties.workerID,
           environment: evt.properties.env,
-          url: `${server.url}/${evt.properties.workerID}/${server.API_VERSION}`
+          url: `${server.url}/${evt.properties.workerID}/${server.API_VERSION}`,
+          runtime: props.runtime
         });
         workers.set(evt.properties.workerID, {
           workerID: evt.properties.workerID,
@@ -4069,7 +4070,7 @@ var init_dotnet = __esm({
               `exec`,
               url3.fileURLToPath(
                 new URL(
-                  `../../support/${BOOTSTRAP_MAP["dotnetcore3.1"]}/release/dotnet-bootstrap.dll`,
+                  `../../support/${BOOTSTRAP_MAP[input.runtime]}/release/dotnet-bootstrap.dll`,
                   import.meta.url
                 )
               ),
@@ -4114,7 +4115,7 @@ var init_dotnet = __esm({
                 "dotnet",
                 "publish",
                 "--output",
-                input.out,
+                '"' + input.out + '"',
                 "--configuration",
                 "Release",
                 "--framework",
@@ -4131,7 +4132,8 @@ var init_dotnet = __esm({
             );
             return {
               type: "success",
-              handler: input.props.handler
+              handler: input.props.handler,
+              runtime: input.props.runtime
             };
           } catch (ex) {
             return {
@@ -6172,6 +6174,9 @@ async function extractSchema(opts) {
         setup(build2) {
           const filter = /^[^.\/]|^\.[^.\/]|^\.\.[^\/]/;
           build2.onResolve({ filter }, (args) => {
+            const packageName = args.path.match(/^(@[^\/]+\/[^\/]+|[^@/]+)/);
+            if (packageName && opts.internalPackages?.includes(packageName[0]))
+              return;
             return {
               path: args.path,
               external: true
@@ -6320,7 +6325,8 @@ var init_pothos2 = __esm({
       async function build2(route) {
         try {
           const schema = await pothos_exports.generate({
-            schema: route.schema
+            schema: route.schema,
+            internalPackages: route.internalPackages
           });
           await fs15.writeFile(route.output, schema);
           if (Array.isArray(route.commands) && route.commands.length > 0) {
@@ -6368,8 +6374,6 @@ import { DataApiDialect } from "kysely-data-api";
 import { RDSData } from "@aws-sdk/client-rds-data";
 import * as fs16 from "fs/promises";
 import {
-  DatabaseMetadata,
-  EnumCollection,
   PostgresDialect,
   MysqlDialect,
   Serializer,
@@ -6391,44 +6395,28 @@ var init_kysely = __esm({
         if (!db.types)
           return;
         logger("generating types for", db.migratorID);
+        const dataApi = new DataApiDialect({
+          mode: db.engine.includes("postgres") ? "postgres" : "mysql",
+          driver: {
+            secretArn: db.secretArn,
+            resourceArn: db.clusterArn,
+            database: db.defaultDatabaseName,
+            client: useAWSClient(RDSData)
+          }
+        });
         const k = new Kysely({
-          dialect: new DataApiDialect({
-            mode: db.engine.includes("postgres") ? "postgres" : "mysql",
-            driver: {
-              secretArn: db.secretArn,
-              resourceArn: db.clusterArn,
-              database: db.defaultDatabaseName,
-              client: useAWSClient(RDSData)
-            }
-          })
+          dialect: dataApi
+        });
+        const dialect = db.engine.includes("postgres") ? new PostgresDialect() : new MysqlDialect();
+        const instrospection = await dialect.introspector.introspect({
+          db: k
         });
-        const tables = await k.introspection.getTables();
         logger("introspected tables");
-        const metadata3 = db.engine.includes("postgres") ? tables.map((table) => ({
-          ...table,
-          columns: table.columns.map((column) => {
-            const isArray = column.dataType.startsWith("_");
-            return {
-              ...column,
-              dataType: isArray ? column.dataType.slice(1) : column.dataType,
-              enumValues: null,
-              isArray
-            };
-          })
-        })) : tables.map((table) => ({
-          ...table,
-          columns: table.columns.map((column) => ({
-            ...column,
-            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({
-          dialect: Dialect,
+          dialect,
           camelCase: db.types.camelCase === true,
-          metadata: new DatabaseMetadata(metadata3, new EnumCollection())
+          metadata: instrospection
         });
         logger("transformed nodes", nodes.length);
         const lastIndex = nodes.length - 1;