sst 2.5.7 → 2.7.0

package/cli/commands/secrets/load.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="yargs" />
+import type { Program } from "../../program.js";
+export declare const load: (program: Program) => import("yargs").Argv<{
+    stage: string | undefined;
+} & {
+    profile: string | undefined;
+} & {
+    region: string | undefined;
+} & {
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
+} & {
+    filename: string;
+}>;

package/cli/commands/secrets/load.js

@@ -0,0 +1,41 @@
+export const load = (program) => program.command("load <filename>", "Loads secrets from an .env file", (yargs) => yargs.positional("filename", {
+    type: "string",
+    demandOption: true,
+}), async (args) => {
+    const { Config } = await import("../../../config.js");
+    const { Colors } = await import("../../colors.js");
+    const { blue } = await import("colorette");
+    const { createSpinner } = await import("../../spinner.js");
+    const { parse } = await import("dotenv");
+    const fs = await import("fs/promises");
+    // Parse .env file
+    const fileContent = await fs.readFile(args.filename, "utf-8");
+    const envVars = parse(fileContent);
+    // Set secrets
+    const setting = createSpinner(` Setting secrets from "${args.filename}"`).start();
+    for (const [key, value] of Object.entries(envVars)) {
+        await Config.setSecret({ key, value });
+    }
+    setting.succeed();
+    // Restart functions & sites
+    const envNames = Object.keys(envVars);
+    const restarting = createSpinner(` Restarting all resources using ${blue(envNames.join(", "))}...`).start();
+    const { edgeSites, sites, placeholderSites, functions } = await Config.restart(envNames);
+    restarting.stop().clear();
+    const siteCount = sites.length + placeholderSites.length;
+    if (siteCount > 0) {
+        Colors.line(Colors.success(`✔ `), siteCount === 1
+            ? `Reloaded ${siteCount} site`
+            : `Reloaded ${siteCount} sites`);
+    }
+    const functionCount = functions.length;
+    if (functionCount > 0) {
+        Colors.line(Colors.success(`✔ `), functionCount === 1
+            ? `Reloaded ${functionCount} function`
+            : `Reloaded ${functionCount} functions`);
+    }
+    edgeSites.forEach(({ id, type }) => {
+        Colors.line(Colors.primary(`➜ `), `Redeploy the "${id}" ${type} to use the new secret`);
+    });
+    process.exit(0);
+});

package/cli/commands/secrets/secrets.js

@@ -1,5 +1,6 @@
 import { get } from "./get.js";
 import { list } from "./list.js";
+import { load } from "./load.js";
 import { remove } from "./remove.js";
 import { set } from "./set.js";
 export function secrets(program) {
@@ -7,6 +8,7 @@ export function secrets(program) {
         yargs.demandCommand(1);
         set(yargs);
         get(yargs);
+        load(yargs);
         list(yargs);
         remove(yargs);
         return yargs;

package/cli/commands/secrets/set.js

@@ -27,7 +27,7 @@ export const set = (program) => program.command("set <name> <value>", "Set the v
     setting.succeed();
     // Restart functions & sites
     const restarting = createSpinner(` Reloading all resources using ${blue(args.name)}...`).start();
-    const { edgeSites, sites, placeholderSites, functions } = await Config.restart(args.name);
+    const { edgeSites, sites, placeholderSites, functions } = await Config.restart([args.name]);
     restarting.stop().clear();
     const siteCount = sites.length + placeholderSites.length;
     if (siteCount > 0) {

package/config.d.ts

@@ -46,7 +46,7 @@ export declare namespace Config {
         key: string;
         fallback?: boolean;
     }): Promise<void>;
-    function restart(key: string): Promise<{
+    function restart(keys: string[]): Promise<{
         edgeSites: SsrSiteMetadata[];
         sites: SsrSiteMetadata[];
         placeholderSites: SsrSiteMetadata[];

package/config.js

@@ -115,7 +115,7 @@ export var Config;
         }));
     }
     Config.removeSecret = removeSecret;
-    async function restart(key) {
+    async function restart(keys) {
         const metadata = await Stacks.metadata();
         const siteData = Object.values(metadata)
             .flat()
@@ -123,7 +123,7 @@ export var Config;
             c.type === "NextjsSite" ||
             c.type === "RemixSite" ||
             c.type === "SolidStartSite")
-            .filter((c) => c.data.secrets.includes(key));
+            .filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const siteDataPlaceholder = siteData.filter((c) => c.data.mode === "placeholder");
         const siteDataEdge = siteData
             .filter((c) => c.data.mode === "deployed")
@@ -137,7 +137,7 @@ export var Config;
             .filter((c) => c.type === "Function")
             // filter out SSR functions for sites
             .filter((c) => !regionalSiteArns.includes(c.data.arn))
-            .filter((c) => c.data.secrets.includes(key));
+            .filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         // Restart sites
         const restartedSites = (await Promise.all(siteDataRegional.map(async (s) => {
             const restarted = await restartFunction(s.data.server);

package/constructs/NextjsSite.js

@@ -26,7 +26,7 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export class NextjsSite extends SsrSite {
     constructor(scope, id, props) {
         super(scope, id, {
-            buildCommand: "npx --yes open-next@^0.9.0 build",
+            buildCommand: "npx --yes open-next@~1.1.0 build",
             ...props,
         });
     }
@@ -203,6 +203,7 @@ export class NextjsSite extends SsrSite {
     buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy) {
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: serverOrigin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -214,6 +215,7 @@ export class NextjsSite extends SsrSite {
     buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy) {
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: s3Origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -268,6 +270,7 @@ export class NextjsSite extends SsrSite {
         return {
             origin: fallbackOriginGroup,
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             compress: true,
             cachePolicy,
             originRequestPolicy,
@@ -279,6 +282,7 @@ export class NextjsSite extends SsrSite {
         const cfDistributionProps = cdk?.distribution || {};
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: s3Origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,

package/constructs/SsrSite.d.ts

@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
-import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy } from "aws-cdk-lib/aws-cloudfront";
+import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy, Function as CfFunction, FunctionEventType as CfFunctionEventType } from "aws-cdk-lib/aws-cloudfront";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, Function } from "./Function.js";
@@ -201,6 +201,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected serverLambdaForRegional?: CdkFunction;
     private serverLambdaForDev?;
     private bucket;
+    private cfFunction;
     private distribution;
     private hostedZone?;
     private certificate?;
@@ -262,12 +263,16 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private createFunctionPermissionsForRegional;
     private createFunctionPermissionsForEdge;
     private validateCloudFrontDistributionSettings;
+    private createCloudFrontFunction;
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
     protected buildDistributionDomainNames(): string[];
     protected buildDefaultBehaviorForRegional(): BehaviorOptions;
     private buildDefaultBehaviorForEdge;
-    private buildBehaviorFunctionAssociations;
+    protected buildBehaviorFunctionAssociations(): {
+        eventType: CfFunctionEventType;
+        function: CfFunction;
+    }[];
     private buildStaticFileBehaviors;
     protected buildServerCachePolicy(): CachePolicy;
     protected buildServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;

package/constructs/SsrSite.js

@@ -49,6 +49,7 @@ export class SsrSite extends Construct {
     serverLambdaForRegional;
     serverLambdaForDev;
     bucket;
+    cfFunction;
     distribution;
     hostedZone;
     certificate;
@@ -73,7 +74,7 @@ export class SsrSite extends Construct {
         useSites().add(id, this.constructor.name, this.props);
         if (this.doNotDeploy) {
             // @ts-ignore
-            this.bucket = this.distribution = null;
+            this.cfFunction = this.bucket = this.distribution = null;
             this.serverLambdaForDev = this.createFunctionForDev();
             return;
         }
@@ -101,6 +102,7 @@ export class SsrSite extends Construct {
         const s3deployCR = this.createS3Deployment(cliLayer, assets, assetFileOptions);
         // Create CloudFront
         this.validateCloudFrontDistributionSettings();
+        this.cfFunction = this.createCloudFrontFunction();
         this.distribution = this.props.edge
             ? this.createCloudFrontDistributionForEdge()
             : this.createCloudFrontDistributionForRegional();
@@ -458,6 +460,16 @@ export class SsrSite extends Construct {
             throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the domain name.`);
         }
     }
+    createCloudFrontFunction() {
+        return new CfFunction(this, "CloudFrontFunction", {
+            code: CfFunctionCode.fromInline(`
+function handler(event) {
+  var request = event.request;
+  request.headers["x-forwarded-host"] = request.headers.host;
+  return request;
+}`),
+        });
+    }
     createCloudFrontDistributionForRegional() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
@@ -560,14 +572,7 @@ export class SsrSite extends Construct {
         return [
             {
                 eventType: CfFunctionEventType.VIEWER_REQUEST,
-                function: new CfFunction(this, "CloudFrontFunction", {
-                    code: CfFunctionCode.fromInline(`
-function handler(event) {
-  var request = event.request;
-  request.headers["x-forwarded-host"] = request.headers.host;
-  return request;
-}`),
-                }),
+                function: this.cfFunction,
             },
         ];
     }

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.d.ts

@@ -17,7 +17,7 @@ declare function JobControl<Name extends keyof JobResources>(name: Name): {
  *
  * @example
  * ```ts
- * declare module "@serverless-stack/node/job" {
+ * declare module "sst/node/job" {
  *   export interface JobTypes {
  *     MyJob: {
  *       title: string;

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) {
@@ -31,7 +34,7 @@ function JobControl(name) {
  *
  * @example
  * ```ts
- * declare module "@serverless-stack/node/job" {
+ * declare module "sst/node/job" {
  *   export interface JobTypes {
  *     MyJob: {
  *       title: string;

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");