sst 2.0.0-rc.9 → 2.0.0

package/constructs/util/warning.js

@@ -1,7 +1,7 @@
 import { createAppContext } from "../context.js";
 const WARNINGS = {
     "config.deprecated": `WARNING: The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
-    "permissions.noConstructs": `WARNING: Passing SST constructs into "permissions" is deprecated, and will be removed in SST v2. Pass them into the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`
+    "permissions.noConstructs": `WARNING: Passing SST constructs into "permissions" is deprecated, and will be removed in SST v2. Pass them into the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
 };
 export const useWarning = createAppContext(() => {
     const set = new Set();
@@ -13,6 +13,6 @@ export const useWarning = createAppContext(() => {
             for (const key of set) {
                 console.warn(WARNINGS[key]);
             }
-        }
+        },
     };
 });

package/context/context.d.ts

@@ -3,10 +3,10 @@ export declare const Context: {
     reset: typeof reset;
     memo: typeof memo;
 };
-declare function create<C>(cb?: (() => C) | string): {
+declare function create<C>(cb?: (() => C) | string, name?: string): {
     use(): C;
     provide(value: C): void;
 };
 declare function reset(): void;
-export declare function memo<C>(cb: () => C): () => C;
+export declare function memo<C>(cb: () => C, name?: string): () => C;
 export {};

package/context/context.js

@@ -8,8 +8,8 @@ const state = {
     contexts: new Map(),
     tracking: [],
 };
-function create(cb) {
-    const id = Symbol(cb?.toString());
+function create(cb, name) {
+    const id = typeof cb === "string" ? cb : name || Symbol(cb?.toString());
     return {
         use() {
             let result = state.contexts.get(id);
@@ -59,7 +59,7 @@ function resetDependencies(id) {
         state.contexts.delete(dependantID);
     }
 }
-export function memo(cb) {
-    const ctx = create(cb);
+export function memo(cb, name) {
+    const ctx = create(cb, name);
     return ctx.use;
 }

package/context/handler.d.ts

@@ -9,7 +9,7 @@ export interface Handlers {
         response: SQSBatchResponse;
     };
 }
-declare type HandlerTypes = keyof Handlers;
+type HandlerTypes = keyof Handlers;
 export declare function useEvent<Type extends HandlerTypes>(type: Type): Handlers[Type]["event"];
 export declare function useLambdaContext(): LambdaContext;
 export declare function Handler<Type extends HandlerTypes, Event = Handlers[Type]["event"], Response = Handlers[Type]["response"]>(type: Type, cb: (evt: Event, ctx: LambdaContext) => Promise<Response>): (event: Event, context: LambdaContext) => Promise<Response>;

package/credentials.d.ts

@@ -4,7 +4,7 @@ import { RegionInputConfig } from "@aws-sdk/config-resolver";
 import { RetryInputConfig } from "@aws-sdk/middleware-retry";
 import { AwsAuthInputConfig } from "@aws-sdk/middleware-signing";
 import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
-declare type Config = RegionInputConfig & RetryInputConfig & AwsAuthInputConfig & HostHeaderConditionConfig;
+type Config = RegionInputConfig & RetryInputConfig & AwsAuthInputConfig & HostHeaderConditionConfig;
 export declare const useAWSCredentialsProvider: () => import("@aws-sdk/types").CredentialProvider;
 export declare const useAWSCredentials: () => Promise<import("@aws-sdk/types").Credentials>;
 export declare const useSTSIdentity: () => Promise<import("@aws-sdk/client-sts").GetCallerIdentityCommandOutput>;

package/credentials.js

@@ -7,9 +7,29 @@ import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { StandardRetryStrategy } from "@aws-sdk/middleware-retry";
 export const useAWSCredentialsProvider = Context.memo(() => {
     const project = useProject();
-    Logger.debug("Using AWS profile", project.profile);
+    Logger.debug("Using AWS profile", project.config.profile);
     const provider = fromNodeProviderChain({
-        profile: project.profile,
+        profile: project.config.profile,
+        roleArn: project.config.role,
+        mfaCodeProvider: async (serialArn) => {
+            const readline = await import("readline");
+            const rl = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout,
+            });
+            return new Promise((resolve) => {
+                Logger.debug(`Require MFA token for serial ARN ${serialArn}`);
+                const prompt = () => rl.question(`Enter MFA code for ${serialArn}: `, async (input) => {
+                    if (input.trim() !== "") {
+                        resolve(input.trim());
+                        rl.close();
+                    }
+                    // prompt again if no input
+                    prompt();
+                });
+                prompt();
+            });
+        },
     });
     return provider;
 });
@@ -30,15 +50,31 @@ export function useAWSClient(client, force = false) {
     if (existing && !force)
         return existing;
     const [project, credentials] = [useProject(), useAWSCredentialsProvider()];
+    const printNoInternet = (() => {
+        let lastPrinted = 0;
+        return () => {
+            const now = Date.now();
+            if (now - lastPrinted > 5000) {
+                console.log("Waiting for internet connection...");
+                lastPrinted = now;
+            }
+        };
+    })();
     const result = new client({
-        region: project.region,
+        region: project.config.region,
         credentials: credentials,
         retryStrategy: new StandardRetryStrategy(async () => 10000, {
             retryDecider: (err) => {
                 if (err.$fault === "client")
                     return false;
+                if (err.name === "CredentialsProviderError")
+                    return false;
                 if (err.message === "Could not load credentials from any providers")
                     return false;
+                // Handle no internet connection
+                if (err.code === "ENOTFOUND") {
+                    printNoInternet();
+                }
                 return true;
             },
             delayDecider: (_, attempts) => {
@@ -51,7 +87,7 @@ export function useAWSClient(client, force = false) {
     return result;
 }
 import aws from "aws-sdk";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 const CredentialProviderChain = aws.CredentialProviderChain;
 /**
  * Do not use this. It is only used for AWS CDK compatibility.
@@ -81,9 +117,9 @@ export const useAWSProvider = Context.memo(async () => {
             secretAccessKey: creds.secretAccessKey,
         }),
     ]);
-    const provider = new SdkProvider(chain, project.region, {
+    const provider = new SdkProvider(chain, project.config.region, {
         maxRetries: 10000,
-        region: project.region,
+        region: project.config.region,
     });
     return provider;
 });

package/index.d.ts

@@ -0,0 +1 @@
+export type { SSTConfig } from "./project.js";

package/index.js

@@ -0,0 +1 @@
+export {};

package/iot.js

@@ -15,7 +15,7 @@ export const useIOTEndpoint = Context.memo(async () => {
 });
 import iot from "aws-iot-device-sdk";
 import { useBus } from "./bus.js";
-import { useProject } from "./app.js";
+import { useProject } from "./project.js";
 import { Logger } from "./logger.js";
 export const useIOT = Context.memo(async () => {
     const bus = useBus();
@@ -29,7 +29,7 @@ export const useIOT = Context.memo(async () => {
         secretKey: creds.secretAccessKey,
         sessionToken: creds.sessionToken,
     });
-    const PREFIX = `/sst/${project.name}/${project.stage}`;
+    const PREFIX = `/sst/${project.config.name}/${project.config.stage}`;
     device.subscribe(`${PREFIX}/events`);
     const fragments = new Map();
     device.on("error", (err) => {
@@ -37,6 +37,10 @@ export const useIOT = Context.memo(async () => {
     });
     device.on("message", (_topic, buffer) => {
         const fragment = JSON.parse(buffer.toString());
+        if (!fragment.id) {
+            bus.publish(fragment.type, fragment.properties);
+            return;
+        }
         let pending = fragments.get(fragment.id);
         if (!pending) {
             pending = new Map();

package/logger.js

@@ -1,9 +1,9 @@
 import fs from "fs/promises";
 import path from "path";
-import { useProject } from "./app.js";
 import { Context } from "./context/context.js";
 let previous = new Date();
 const useFile = Context.memo(async () => {
+    const { useProject } = await import("./project.js");
     const project = useProject();
     const filePath = path.join(project.paths.out, "debug.log");
     const file = await fs.open(filePath, "w");
@@ -24,6 +24,8 @@ export const Logger = {
                 return JSON.stringify(x);
             }),
         ];
+        if (process.env.SST_VERBOSE)
+            console.log(...line);
         useFile().then((file) => {
             file.write(line.join(" ") + "\n");
         });

package/node/api/index.d.ts

@@ -10,13 +10,10 @@ export interface ApiGatewayV1ApiResources {
 }
 export interface WebSocketApiResources {
 }
-export interface GraphQLApiResources {
-}
 export declare const Api: ApiResources;
 export declare const AppSyncApi: AppSyncApiResources;
 export declare const ApiGatewayV1Api: ApiGatewayV1ApiResources;
 export declare const WebSocketApi: WebSocketApiResources;
-export declare const GraphQLApi: GraphQLApiResources;
 /**
  * Create a new api handler that can be used to create an authenticated session.
  *
@@ -40,3 +37,5 @@ export declare function useHeader(key: string): string | undefined;
 export declare function useFormValue(name: string): string | null | undefined;
 export declare function useQueryParams(): import("aws-lambda").APIGatewayProxyEventQueryStringParameters;
 export declare function useQueryParam(name: string): string | undefined;
+export declare function usePathParams(): import("aws-lambda").APIGatewayProxyEventPathParameters;
+export declare function usePathParam(name: string): string | undefined;

package/node/api/index.js

@@ -5,12 +5,10 @@ export const Api = createProxy("Api");
 export const AppSyncApi = createProxy("AppSyncApi");
 export const ApiGatewayV1Api = createProxy("ApiGatewayV1Api");
 export const WebSocketApi = createProxy("WebSocketApi");
-export const GraphQLApi = createProxy("GraphQLApi");
 Object.assign(Api, parseEnvironment("Api", ["url"]));
 Object.assign(AppSyncApi, parseEnvironment("AppSyncApi", ["url"]));
 Object.assign(ApiGatewayV1Api, parseEnvironment("ApiGatewayV1Api", ["url"]));
 Object.assign(WebSocketApi, parseEnvironment("WebSocketApi", ["url"]));
-Object.assign(GraphQLApi, parseEnvironment("GraphQLApi", ["url"]));
 /**
  * Create a new api handler that can be used to create an authenticated session.
  *
@@ -86,3 +84,11 @@ export function useQueryParams() {
 export function useQueryParam(name) {
     return useQueryParams()[name];
 }
+export function usePathParams() {
+    const evt = useEvent("api");
+    const path = evt.pathParameters || {};
+    return path;
+}
+export function usePathParam(name) {
+    return usePathParams()[name];
+}

package/node/auth/adapter/adapter.d.ts

@@ -1,3 +1,3 @@
 import { APIGatewayProxyStructuredResultV2 } from "aws-lambda";
 export declare function createAdapter<A extends (config: any) => Adapter>(adapter: A): A;
-export declare type Adapter = () => Promise<APIGatewayProxyStructuredResultV2>;
+export type Adapter = () => Promise<APIGatewayProxyStructuredResultV2>;

package/node/auth/adapter/facebook.js

@@ -21,6 +21,6 @@ const issuer = new Issuer({
 export const FacebookAdapter = /* @__PURE__ */ createAdapter((config) => {
     return OauthAdapter({
         issuer,
-        ...config
+        ...config,
     });
 });

package/node/auth/adapter/github.js

@@ -5,17 +5,17 @@ import { OidcAdapter } from "./oidc.js";
 const issuer = new Issuer({
     issuer: "https://github.com",
     authorization_endpoint: "https://github.com/login/oauth/authorize",
-    token_endpoint: "https://github.com/login/oauth/access_token"
+    token_endpoint: "https://github.com/login/oauth/access_token",
 });
 export const GithubAdapter = /* @__PURE__ */ createAdapter((config) => {
-    if ("clientSecret" in config) {
+    if (config.clientSecret) {
         return OauthAdapter({
             issuer,
-            ...config
+            ...config,
         });
     }
     return OidcAdapter({
         issuer,
-        ...config
+        ...config,
     });
 });

package/node/auth/adapter/google.d.ts

@@ -1,6 +1,6 @@
 import { OauthBasicConfig } from "./oauth.js";
 import { OidcBasicConfig } from "./oidc.js";
-declare type GoogleConfig = (OauthBasicConfig & {
+type GoogleConfig = (OauthBasicConfig & {
     mode: "oauth";
 }) | (OidcBasicConfig & {
     mode: "oidc";

package/node/auth/adapter/google.js

@@ -7,12 +7,12 @@ export const GoogleAdapter = /* @__PURE__ */ createAdapter((config) => {
     if ("clientSecret" in config) {
         return OauthAdapter({
             issuer,
-            ...config
+            ...config,
         });
     }
     return OidcAdapter({
         issuer,
         scope: "openid email profile",
-        ...config
+        ...config,
     });
 });

package/node/auth/adapter/twitch.js

@@ -6,6 +6,6 @@ export const TwitchAdapter = /* @__PURE__ */ createAdapter((config) => {
     return OidcAdapter({
         issuer,
         scope: "openid",
-        ...config
+        ...config,
     });
 });

package/node/auth/session.d.ts

@@ -3,7 +3,7 @@ import { APIGatewayProxyStructuredResultV2 } from "aws-lambda";
 export interface SessionTypes {
     public: {};
 }
-export declare type SessionValue = {
+export type SessionValue = {
     [type in keyof SessionTypes]: {
         type: type;
         properties: SessionTypes[type];

package/node/config/index.d.ts

@@ -4,10 +4,10 @@ export interface SecretResources {
 }
 export interface ConfigTypes {
 }
-export declare type ParameterTypes = {
+export type ParameterTypes = {
     [T in keyof ParameterResources]: string;
 };
-export declare type SecretTypes = {
+export type SecretTypes = {
     [T in keyof SecretResources]: string;
 };
 export declare const Config: ConfigTypes & ParameterTypes & SecretTypes;

package/node/config/index.js

@@ -1,9 +1,6 @@
-import { GetParametersCommand, SSMClient } from "@aws-sdk/client-ssm";
+import { GetParametersCommand, SSMClient, } from "@aws-sdk/client-ssm";
 const ssm = new SSMClient({});
-import { createProxy, parseEnvironment, buildSsmPath, buildSsmFallbackPath, ssmNameToConstructId, ssmFallbackNameToConstructId } from "../util/index.js";
-;
-;
-;
+import { createProxy, parseEnvironment, buildSsmPath, buildSsmFallbackPath, ssmNameToConstructId, ssmFallbackNameToConstructId, } from "../util/index.js";
 export const Config = createProxy("Config");
 const metadata = parseMetadataEnvironment();
 const parametersRaw = parseEnvironment("Parameter", ["value"]);
@@ -39,9 +36,7 @@ function flattenConfigValues(configValues) {
 }
 async function replaceSecretsWithRealValues() {
     // Find all the secrets and params that match the prefix
-    const names = Object
-        .keys(secrets)
-        .filter((name) => secrets[name] === "__FETCH_FROM_SSM__");
+    const names = Object.keys(secrets).filter((name) => secrets[name] === "__FETCH_FROM_SSM__");
     if (names.length === 0) {
         return;
     }

package/node/job/index.d.ts

@@ -2,10 +2,10 @@ export interface JobResources {
 }
 export interface JobTypes {
 }
-export declare type JobRunProps<T extends keyof JobResources> = {
+export type JobRunProps<T extends keyof JobResources> = {
     payload?: JobTypes[T];
 };
-export declare type JobType = {
+export type JobType = {
     [T in keyof JobResources]: ReturnType<typeof JobControl<T>>;
 };
 export declare const Job: JobType;

package/node/site/index.js

@@ -1,6 +1,6 @@
-import { GetParametersCommand, SSMClient } from "@aws-sdk/client-ssm";
+import { GetParametersCommand, SSMClient, } from "@aws-sdk/client-ssm";
 const ssm = new SSMClient({});
-import { createProxy, parseEnvironment, buildSsmPath, ssmNameToConstructId } from "../util/index.js";
+import { createProxy, parseEnvironment, buildSsmPath, ssmNameToConstructId, } from "../util/index.js";
 export const StaticSite = createProxy("StaticSite");
 export const ReactStaticSite = createProxy("ReactStaticSite");
 export const ViteStaticSite = createProxy("ViteStaticSite");
@@ -23,9 +23,7 @@ Object.assign(NextjsSite, nextjsSiteData);
 Object.assign(RemixSite, remixSiteData);
 async function replaceWithSsmValues(className, siteData) {
     // Find all the site data that match the prefix
-    const names = Object
-        .keys(siteData)
-        .filter((name) => siteData[name].url === "__FETCH_FROM_SSM__");
+    const names = Object.keys(siteData).filter((name) => siteData[name].url === "__FETCH_FROM_SSM__");
     if (names.length === 0) {
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.9",
+  "version": "2.0.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -17,20 +17,21 @@
     "./constructs": "./constructs/index.js",
     "./context": "./context/index.js",
     "./node/*": "./node/*/index.js",
+    ".": "./index.js",
     "./*": "./*"
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2-alpha": "^2.55.0-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.55.0-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.55.0-alpha.0",
-    "@aws-cdk/aws-appsync-alpha": "^2.55.0-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "2.55.0",
-    "@aws-cdk/cloudformation-diff": "2.55.0",
-    "@aws-cdk/cx-api": "2.55.0",
-    "@aws-cdk/region-info": "2.55.0",
+    "@aws-cdk/aws-apigatewayv2-alpha": "^2.62.2-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.62.2-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.62.2-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "2.62.2",
+    "@aws-cdk/cloudformation-diff": "2.62.2",
+    "@aws-cdk/cx-api": "2.62.2",
+    "@aws-cdk/region-info": "2.62.2",
     "@aws-sdk/client-cloudformation": "3.208.0",
     "@aws-sdk/client-iot": "3.208.0",
+    "@aws-sdk/client-iot-data-plane": "3.208.0",
     "@aws-sdk/client-lambda": "3.208.0",
     "@aws-sdk/client-rds-data": "3.208.0",
     "@aws-sdk/client-s3": "3.208.0",
@@ -45,13 +46,15 @@
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
     "@trpc/server": "9.16.0",
+    "adm-zip": "^0.5.10",
     "archiver": "^5.3.1",
-    "aws-cdk": "2.55.0",
-    "aws-cdk-lib": "2.55.0",
+    "aws-cdk": "2.62.2",
+    "aws-cdk-lib": "2.62.2",
     "aws-iot-device-sdk": "^2.2.12",
     "aws-sdk": "2.1252.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "2.55.0",
+    "cdk-assets": "2.62.2",
+    "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
     "colorette": "^2.0.19",
@@ -63,14 +66,17 @@
     "esbuild": "0.16.13",
     "express": "^4.18.2",
     "fast-jwt": "^1.6.1",
+    "get-port": "^6.1.2",
     "glob": "^8.0.3",
+    "graphql": "*",
     "graphql-helix": "^1.12.0",
     "immer": "9",
     "ink": "^3.2.0",
     "ink-spinner": "^4.0.3",
-    "kysely": "^0.22.0",
-    "kysely-codegen": "^0.8.0",
+    "kysely": "^0.23.3",
+    "kysely-codegen": "^0.9.0",
     "kysely-data-api": "^0.1.4",
+    "minimatch": "^6.1.6",
     "openid-client": "^5.1.8",
     "ora": "^6.1.2",
     "promptly": "^3.2.0",
@@ -84,9 +90,12 @@
     "zip-local": "^0.3.5"
   },
   "devDependencies": {
+    "@aws-sdk/client-codebuild": "^3.257.0",
     "@aws-sdk/types": "^3.208.0",
+    "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
     "@tsconfig/node16": "^1.0.3",
+    "@types/adm-zip": "^0.5.0",
     "@types/aws-iot-device-sdk": "^2.2.4",
     "@types/aws-lambda": "^8.10.108",
     "@types/babel__core": "^7.1.20",
@@ -99,20 +108,15 @@
     "@types/uuid": "^8.3.4",
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
-    "graphql": "^16.5.0",
     "tsx": "^3.12.1",
-    "vitest": "^0.15.1"
+    "vitest": "^0.28.3"
   },
   "peerDependencies": {
-    "@sls-next/lambda-at-edge": "^3.7.0",
-    "graphql": "^16.5.0"
+    "@sls-next/lambda-at-edge": "^3.7.0"
   },
   "peerDependenciesMeta": {
     "@sls-next/lambda-at-edge": {
       "optional": true
-    },
-    "graphql": {
-      "optional": true
     }
   },
   "bugs": {
@@ -126,6 +130,7 @@
   "author": "",
   "scripts": {
     "build": "node build.mjs && tsc",
+    "test": "vitest run",
     "dev": "tsc -w"
   }
 }

package/pothos.js

@@ -77,6 +77,7 @@ export async function extractSchema(opts) {
                                 if (!types.isMemberExpression(callPath.node.callee) ||
                                     !types.isIdentifier(callPath.node.callee.object) ||
                                     !types.isIdentifier(callPath.node.callee.property) ||
+                                    !schemaBuilder ||
                                     (callPath.node.callee.object.name !==
                                         schemaBuilder.node.id.name &&
                                         callPath.node.callee.property.name !== "implement")) {

package/project.d.ts

@@ -0,0 +1,47 @@
+import { Metafile } from "esbuild";
+import type { App } from "./constructs/App.js";
+export interface SSTConfig {
+    config: (globals: GlobalOptions) => Promise<ConfigOptions> | ConfigOptions;
+    stacks: (app: App) => Promise<void> | void;
+}
+export interface ConfigOptions {
+    name: string;
+    region?: string;
+    stage?: string;
+    profile?: string;
+    role?: string;
+    ssmPrefix?: string;
+}
+declare const DEFAULTS: {
+    readonly stage: undefined;
+    readonly ssmPrefix: undefined;
+};
+interface Project {
+    config: ConfigOptions & Required<{
+        [key in keyof typeof DEFAULTS]: Exclude<ConfigOptions[key], undefined>;
+    }>;
+    version: string;
+    cdkVersion: string;
+    paths: {
+        root: string;
+        config: string;
+        out: string;
+        artifacts: string;
+    };
+    metafile: Metafile;
+    stacks: SSTConfig["stacks"];
+}
+export declare const ProjectContext: {
+    use(): Project;
+    provide(value: Project): void;
+};
+export declare function useProject(): Project;
+interface GlobalOptions {
+    profile?: string;
+    role?: string;
+    stage?: string;
+    root?: string;
+    region?: string;
+}
+export declare function initProject(globals: GlobalOptions): Promise<void>;
+export {};