sst 2.5.8 → 2.7.0

package/node/api/index.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node/url.js" />
-/// <reference types=".pnpm/@types+node@17.0.45/node_modules/@types/node/url.js" />
 import { Handler } from "../../context/handler.js";
 import { APIGatewayProxyStructuredResultV2 } from "aws-lambda";
 export interface ApiResources {
@@ -31,7 +28,7 @@ export declare const useCookies: () => {
 export declare function useCookie(name: string): string | undefined;
 export declare const useBody: () => string | undefined;
 export declare const useJsonBody: () => any;
-export declare const useFormData: () => import("url").URLSearchParams | undefined;
+export declare const useFormData: () => URLSearchParams | undefined;
 export declare const usePath: () => string[];
 interface CookieOptions {
     expires?: Date;

package/node/api/index.js

@@ -1,14 +1,13 @@
-import { createProxy, getVariables } from "../util/index.js";
+import { createProxy } from "../util/index.js";
 import { Context } from "../../context/context.js";
 import { useEvent, Handler } from "../../context/handler.js";
-export const Api = createProxy("Api");
-export const AppSyncApi = createProxy("AppSyncApi");
-export const ApiGatewayV1Api = createProxy("ApiGatewayV1Api");
-export const WebSocketApi = createProxy("WebSocketApi");
-Object.assign(Api, getVariables("Api"));
-Object.assign(AppSyncApi, getVariables("AppSyncApi"));
-Object.assign(ApiGatewayV1Api, getVariables("ApiGatewayV1Api"));
-Object.assign(WebSocketApi, getVariables("WebSocketApi"));
+export const Api = /* @__PURE__ */ createProxy("Api");
+export const AppSyncApi = 
+/* @__PURE__ */ createProxy("AppSyncApi");
+export const ApiGatewayV1Api = 
+/* @__PURE__ */ createProxy("ApiGatewayV1Api");
+export const WebSocketApi = 
+/* @__PURE__ */ createProxy("WebSocketApi");
 /**
  * Create a new api handler that can be used to create an authenticated session.
  *

package/node/auth/auth.js

@@ -1,10 +1,10 @@
-import { getVariables } from "../util/index.js";
+import { getVariables2 } from "../util/index.js";
 import { Handler } from "../../context/handler.js";
 import { useDomainName, usePath } from "../api/index.js";
 const className = "Auth";
 // Each function can only be attached to one Auth construct, so we can
 // assume there is only one entry in authData.
-const authData = getVariables(className);
+const authData = getVariables2(className);
 const authValues = Object.values(authData);
 let prefix;
 let publicKey;

package/node/auth/index.js

@@ -8,6 +8,5 @@ export * from "./adapter/github.js";
 export * from "./adapter/oidc.js";
 export * from "./adapter/oauth.js";
 export * from "./adapter/link.js";
-import { createProxy, getVariables } from "../util/index.js";
+import { createProxy } from "../util/index.js";
 export const Auth = createProxy("Auth");
-Object.assign(Auth, await getVariables("Auth"));

package/node/bucket/index.js

@@ -1,3 +1,2 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Bucket = createProxy("Bucket");
-Object.assign(Bucket, getVariables("Bucket"));
+import { createProxy } from "../util/index.js";
+export const Bucket = /* @__PURE__ */ createProxy("Bucket");

package/node/config/index.js

@@ -1,8 +1,8 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Config = createProxy("Config");
+import { createProxy, getVariables2 } from "../util/index.js";
+export const Config = /* @__PURE__ */ createProxy("Config");
 const metadata = parseMetadataEnvironment();
-const parameters = flattenValues(getVariables("Parameter"));
-const secrets = flattenValues(getVariables("Secret"));
+const parameters = flattenValues(getVariables2("Parameter"));
+const secrets = flattenValues(getVariables2("Secret"));
 Object.assign(Config, metadata, parameters, secrets);
 ///////////////
 // Functions

package/node/event-bus/index.js

@@ -1,3 +1,3 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const EventBus = createProxy("EventBus");
-Object.assign(EventBus, getVariables("EventBus"));
+import { createProxy } from "../util/index.js";
+export const EventBus = 
+/* @__PURE__ */ createProxy("EventBus");

package/node/function/index.js

@@ -1,3 +1,3 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Function = createProxy("Function");
-Object.assign(Function, getVariables("Function"));
+import { createProxy } from "../util/index.js";
+export const Function = 
+/* @__PURE__ */ createProxy("Function");

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

@@ -1,7 +1,7 @@
 import { APIGatewayProxyStructuredResultV2 } from "aws-lambda";
 export declare function LinkAdapter(config: {
     onLink: (link: string, claims: Record<string, any>) => Promise<APIGatewayProxyStructuredResultV2>;
-    onError: () => Promise<APIGatewayProxyStructuredResultV2>;
+    onError: (error: any) => Promise<APIGatewayProxyStructuredResultV2>;
 }): () => Promise<{
     type: "step";
     properties: APIGatewayProxyStructuredResultV2;

package/node/future/auth/adapter/link.js

@@ -4,6 +4,8 @@ import { useDomainName, usePathParam, useQueryParam, useQueryParams, } from "../
 export function LinkAdapter(config) {
     // @ts-expect-error
     const key = Config[process.env.AUTH_ID + "PrivateKey"];
+    // @ts-expect-error
+    const publicKey = Config[process.env.AUTH_ID + "PublicKey"];
     const signer = createSigner({
         expiresIn: 1000 * 60 * 10,
         key,
@@ -28,7 +30,7 @@ export function LinkAdapter(config) {
             try {
                 const verifier = createVerifier({
                     algorithms: ["RS512"],
-                    key,
+                    key: publicKey,
                 });
                 const jwt = verifier(token);
                 return {
@@ -36,10 +38,10 @@ export function LinkAdapter(config) {
                     properties: jwt,
                 };
             }
-            catch {
+            catch (ex) {
                 return {
                     type: "step",
-                    properties: await config.onError(),
+                    properties: await config.onError(ex),
                 };
             }
         }

package/node/future/auth/handler.js

@@ -167,10 +167,12 @@ export function AuthHandler(input) {
                 ...useQueryParams(),
             };
             if (response_type === "token") {
+                const location = new URL(redirect_uri);
+                location.hash = `access_token=${token}&state=${state || ""}`;
                 return {
                     statusCode: 302,
                     headers: {
-                        Location: `${redirect_uri}#access_token=${token}&state=${state || ""}`,
+                        Location: location.href,
                     },
                 };
             }
@@ -187,10 +189,13 @@ export function AuthHandler(input) {
                     redirect_uri,
                     token: token,
                 });
+                const location = new URL(redirect_uri);
+                location.searchParams.set("code", code);
+                location.searchParams.set("state", state || "");
                 return {
                     statusCode: 302,
                     headers: {
-                        Location: `${redirect_uri}?code=${code}&state=${state || ""}`,
+                        Location: location.href,
                     },
                 };
             }

package/node/future/auth/index.js

@@ -1,6 +1,5 @@
-import { createProxy, getVariables } from "../../util/index.js";
-export const Auth = createProxy("Auth");
-Object.assign(Auth, getVariables("Auth"));
+import { createProxy } from "../../util/index.js";
+export const Auth = /* @__PURE__ */ createProxy("Auth");
 export * from "./adapter/oidc.js";
 export * from "./adapter/google.js";
 export * from "./adapter/link.js";

package/node/future/auth/session.js

@@ -81,7 +81,9 @@ function verify(token) {
             })(token);
             return jwt;
         }
-        catch { }
+        catch (e) {
+            console.log(e);
+        }
     }
     return {
         type: "public",

package/node/graphql/index.d.ts

@@ -1,42 +1,15 @@
-import { Context } from "aws-lambda";
-import { APIGatewayProxyEventV2 } from "aws-lambda";
-import { GraphQLSchema } from "graphql";
-import { ExecutionContext, FormatPayloadParams, ProcessRequestOptions } from "graphql-helix";
-interface GraphQLHandlerConfig<C> {
-    /**
-     * Intercept the response and make changes
-     */
-    formatPayload?: (params: FormatPayloadParams<C, any>) => any;
-    /**
-     * This function specifies the ctx object passed to the GraphQL resolver. This is usually not needed
-     */
-    context?: (request: {
-        event: APIGatewayProxyEventV2;
-        context: Context;
-        execution: ExecutionContext;
-    }) => Promise<C>;
-    /**
-     * The GraphQL schema to be executed
-     */
-    schema: GraphQLSchema;
-    /**
-     * Override the GraphQL execute function, sometimes used by plugins
-     */
-    execute?: ProcessRequestOptions<any, any>["execute"];
-    /**
-     * Disable introspection for production
-     */
-    disableIntrospection?: boolean;
-}
-export declare function GraphQLHandler<C>(config: GraphQLHandlerConfig<C>): (event: APIGatewayProxyEventV2, context: Context) => Promise<{
-    statusCode: any;
-    body: string;
+import { APIGatewayProxyEventV2, Context } from "aws-lambda";
+import { YogaServerOptions } from "graphql-yoga";
+type ServerContext = {
+    event: APIGatewayProxyEventV2;
+    context: Context;
+};
+export declare function GraphQLHandler<UserContext extends {}>(options: YogaServerOptions<ServerContext, UserContext>): (event: APIGatewayProxyEventV2, context: Context) => Promise<{
+    statusCode: number;
     headers: {
-        [k: string]: any;
+        [k: string]: string;
     };
-} | {
-    statusCode: number;
-    body?: undefined;
-    headers?: undefined;
+    body: string;
+    isBase64Encoded: boolean;
 }>;
 export {};

package/node/graphql/index.js

@@ -1,53 +1,29 @@
-import { specifiedRules, NoSchemaIntrospectionCustomRule, } from "graphql";
-import { getGraphQLParameters, processRequest,
-// @ts-expect-error
- } from "graphql-helix";
+import { createYoga } from "graphql-yoga";
 import { Handler, useEvent, useLambdaContext } from "../../context/handler.js";
-import { useHeaders, useMethod, useJsonBody, useQueryParams, } from "../api/index.js";
-export function GraphQLHandler(config) {
+export function GraphQLHandler(options) {
+    const yoga = createYoga(options);
     return Handler("api", async () => {
+        const event = useEvent("api");
+        const parameters = new URLSearchParams(event.queryStringParameters || {}).toString();
+        const url = `${event.rawPath}?${parameters}`;
         const request = {
-            body: useJsonBody(),
-            query: useQueryParams(),
-            method: useMethod(),
-            headers: useHeaders(),
+            method: event.requestContext.http.method,
+            headers: event.headers,
+            body: event.body
+                ? Buffer.from(event.body, event.isBase64Encoded ? "base64" : "utf8")
+                : undefined,
         };
-        const { operationName, query, variables } = getGraphQLParameters(request);
-        const validationRules = config.disableIntrospection
-            ? [...specifiedRules, NoSchemaIntrospectionCustomRule]
-            : [...specifiedRules];
-        const result = await processRequest({
-            operationName,
-            query,
-            variables,
-            request,
-            validationRules,
-            execute: config.execute,
-            schema: config.schema,
-            formatPayload: config.formatPayload,
-            // @ts-expect-error
-            contextFactory: async (execution) => {
-                if (config.context) {
-                    return config.context({
-                        event: useEvent("api"),
-                        context: useLambdaContext(),
-                        execution,
-                    });
-                }
-                return;
-            },
-        });
-        if (result.type === "RESPONSE") {
-            return {
-                statusCode: result.status,
-                body: JSON.stringify(result.payload),
-                headers: Object.fromEntries(
-                // @ts-expect-error
-                result.headers.map((h) => [h.name, h.value])),
-            };
-        }
+        const serverContext = {
+            event,
+            context: useLambdaContext(),
+        };
+        const response = await yoga.fetch(url, request, serverContext);
+        const responseHeaders = Object.fromEntries(response.headers.entries());
         return {
-            statusCode: 500,
+            statusCode: response.status,
+            headers: responseHeaders,
+            body: await response.text(),
+            isBase64Encoded: false,
         };
     });
 }

package/node/job/index.js

@@ -1,12 +1,15 @@
-import { createProxy, getVariables } from "../util/index.js";
+import { createProxy, getVariables2 } from "../util/index.js";
 import { InvokeCommand, LambdaClient } from "@aws-sdk/client-lambda";
 const lambda = new LambdaClient({});
-export const Job = createProxy("Job");
-const jobData = getVariables("Job");
-Object.keys(jobData).forEach((name) => {
-    // @ts-ignore
-    Job[name] = JobControl(name);
-});
+export const Job = /* @__PURE__ */ (() => {
+    const result = createProxy("Job");
+    const vars = getVariables2("Job");
+    Object.keys(vars).forEach((name) => {
+        // @ts-ignore
+        result[name] = JobControl(name);
+    });
+    return result;
+})();
 function JobControl(name) {
     return {
         async run(props) {

package/node/kinesis-stream/index.js

@@ -1,3 +1,3 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const KinesisStream = createProxy("KinesisStream");
-Object.assign(KinesisStream, getVariables("KinesisStream"));
+import { createProxy } from "../util/index.js";
+export const KinesisStream = 
+/* @__PURE__ */ createProxy("KinesisStream");

package/node/queue/index.js

@@ -1,3 +1,2 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Queue = createProxy("Queue");
-Object.assign(Queue, getVariables("Queue"));
+import { createProxy } from "../util/index.js";
+export const Queue = /* @__PURE__ */ createProxy("Queue");

package/node/rds/index.js

@@ -1,3 +1,2 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const RDS = createProxy("RDS");
-Object.assign(RDS, getVariables("RDS"));
+import { createProxy } from "../util/index.js";
+export const RDS = /* @__PURE__ */ createProxy("RDS");

package/node/site/index.js

@@ -1,19 +1,18 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const StaticSite = createProxy("StaticSite");
-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);
+import { createProxy } from "../util/index.js";
+export const StaticSite = 
+/* @__PURE__ */ createProxy("StaticSite");
+export const ReactStaticSite = 
+/* @__PURE__ */
+createProxy("ReactStaticSite");
+export const ViteStaticSite = 
+/* @__PURE__ */
+createProxy("ViteStaticSite");
+export const RemixSite = 
+/* @__PURE__ */
+createProxy("RemixSite");
+export const NextjsSite = 
+/* @__PURE__ */
+createProxy("NextjsSite");
+export const SolidStartSite = 
+/* @__PURE__ */
+createProxy("SolidStartSite");

package/node/table/index.js

@@ -1,3 +1,4 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Table = createProxy("Table");
-Object.assign(Table, getVariables("Table"));
+import { createProxy } from "../util/index.js";
+export const Table = 
+/* @__PURE__ */
+createProxy("Table");

package/node/topic/index.js

@@ -1,3 +1,4 @@
-import { createProxy, getVariables } from "../util/index.js";
-export const Topic = createProxy("Topic");
-Object.assign(Topic, getVariables("Topic"));
+import { createProxy } from "../util/index.js";
+export const Topic = 
+/* @__PURE__ */
+createProxy("Topic");

package/node/util/index.d.ts

@@ -1,2 +1,2 @@
 export declare function createProxy<T extends object>(constructName: string): T;
-export declare function getVariables(constructName: string): Record<string, Record<string, string>>;
+export declare function getVariables2(constructName: string): Record<string, Record<string, string>>;

package/node/util/index.js

@@ -14,7 +14,7 @@ let allVariables = {};
 //       https://discord.com/channels/983865673656705025/1089184080534446110
 const _placeholder = await parseEnvironment();
 export function createProxy(constructName) {
-    return new Proxy({}, {
+    const result = new Proxy({}, {
         get(target, prop) {
             if (typeof prop === "string") {
                 // normalize prop to convert kebab cases like `my-table` to `my_table`
@@ -27,8 +27,10 @@ export function createProxy(constructName) {
             return Reflect.get(target, prop);
         },
     });
+    Object.assign(result, getVariables2(constructName));
+    return result;
 }
-export function getVariables(constructName) {
+export function getVariables2(constructName) {
     return allVariables[constructName] || {};
 }
 async function parseEnvironment() {

package/package.json

@@ -1,6 +1,7 @@
 {
+  "sideEffects": false,
   "name": "sst",
-  "version": "2.5.8",
+  "version": "2.7.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -9,7 +10,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/serverless-stack/sst.git",
+    "url": "git+https://github.com/estyrke/serverless-stack.git",
     "directory": "packages/cli"
   },
   "exports": {
@@ -67,7 +68,7 @@
     "get-port": "^6.1.2",
     "glob": "^8.0.3",
     "graphql": "*",
-    "graphql-helix": "^1.12.0",
+    "graphql-yoga": "^3.9.0",
     "immer": "9",
     "ink": "^4.0.0",
     "ink-spinner": "^5.0.0",