@jaypie/constructs 1.2.0-rc.0 → 1.2.0-rc.2

package/dist/cjs/JaypieLambda.d.ts

@@ -6,7 +6,7 @@ import * as ec2 from "aws-cdk-lib/aws-ec2";
 import * as iam from "aws-cdk-lib/aws-iam";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as secretsmanager from "aws-cdk-lib/aws-secretsmanager";
-import { JaypieEnvSecret } from "./JaypieEnvSecret.js";
+import { EnvironmentInput, SecretsArrayItem } from "./helpers/index.js";
 export interface JaypieLambdaProps {
     allowAllOutbound?: boolean;
     allowPublicSubnet?: boolean;
@@ -17,9 +17,16 @@ export interface JaypieLambdaProps {
     deadLetterQueueEnabled?: boolean;
     deadLetterTopic?: import("aws-cdk-lib/aws-sns").ITopic;
     description?: string;
-    environment?: {
-        [key: string]: string;
-    };
+    /**
+     * Environment variables for the Lambda function.
+     *
+     * Supports both legacy object syntax and new array syntax:
+     * - Object: { KEY: "value" } - directly sets environment variables
+     * - Array: ["KEY1", "KEY2", { KEY3: "value" }]
+     *   - Strings: lookup value from process.env
+     *   - Objects: merge key-value pairs directly
+     */
+    environment?: EnvironmentInput;
     envSecrets?: {
         [key: string]: secretsmanager.ISecret;
     };
@@ -47,7 +54,15 @@ export interface JaypieLambdaProps {
     roleTag?: string;
     runtime?: lambda.Runtime;
     runtimeManagementMode?: lambda.RuntimeManagementMode;
-    secrets?: JaypieEnvSecret[];
+    /**
+     * Secrets to make available to the Lambda function.
+     *
+     * Supports both JaypieEnvSecret instances and strings:
+     * - JaypieEnvSecret: used directly
+     * - String: creates a JaypieEnvSecret with the string as envKey
+     *   (reuses existing secrets within the same scope)
+     */
+    secrets?: SecretsArrayItem[];
     securityGroups?: ec2.ISecurityGroup[];
     timeout?: Duration | number;
     tracing?: lambda.Tracing;

package/dist/cjs/JaypieNextJs.d.ts

@@ -1,16 +1,34 @@
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
 import * as secretsmanager from "aws-cdk-lib/aws-secretsmanager";
 import { Construct } from "constructs";
-import { JaypieEnvSecret } from "./JaypieEnvSecret.js";
+import { EnvironmentInput, SecretsArrayItem } from "./helpers";
 export interface JaypieNextjsProps {
     datadogApiKeyArn?: string;
     domainName?: string;
+    /**
+     * Environment variables for the Next.js application.
+     *
+     * Supports both legacy object syntax and new array syntax:
+     * - Object: { KEY: "value" } - directly sets environment variables
+     * - Array: ["KEY1", "KEY2", { KEY3: "value" }]
+     *   - Strings: lookup value from process.env
+     *   - Objects: merge key-value pairs directly
+     */
+    environment?: EnvironmentInput;
     envSecrets?: {
         [key: string]: secretsmanager.ISecret;
     };
     hostedZone?: IHostedZone | string;
     nextjsPath?: string;
-    secrets?: JaypieEnvSecret[];
+    /**
+     * Secrets to make available to the Next.js application.
+     *
+     * Supports both JaypieEnvSecret instances and strings:
+     * - JaypieEnvSecret: used directly
+     * - String: creates a JaypieEnvSecret with the string as envKey
+     *   (reuses existing secrets within the same scope)
+     */
+    secrets?: SecretsArrayItem[];
 }
 export declare class JaypieNextJs extends Construct {
     readonly domainName: string;

package/dist/cjs/helpers/__tests__/resolveEnvironment.spec.d.ts

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

package/dist/cjs/helpers/__tests__/resolveSecrets.spec.d.ts

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

package/dist/cjs/helpers/index.d.ts

@@ -12,5 +12,7 @@ export { mergeDomain } from "./mergeDomain";
 export { resolveDatadogForwarderFunction } from "./resolveDatadogForwarderFunction";
 export { resolveDatadogLayers } from "./resolveDatadogLayers";
 export { resolveDatadogLoggingDestination } from "./resolveDatadogLoggingDestination";
+export { resolveEnvironment, EnvironmentArrayItem, EnvironmentInput, } from "./resolveEnvironment";
 export { resolveHostedZone } from "./resolveHostedZone";
 export { resolveParamsAndSecrets } from "./resolveParamsAndSecrets";
+export { resolveSecrets, SecretsArrayItem, clearSecretsCache, clearAllSecretsCaches, } from "./resolveSecrets";

package/dist/cjs/helpers/resolveEnvironment.d.ts

@@ -0,0 +1,47 @@
+/**
+ * Environment value type for the new array syntax
+ * - string: key to lookup in process.env
+ * - object: key-value pairs to include directly
+ */
+export type EnvironmentArrayItem = string | {
+    [key: string]: string;
+};
+/**
+ * Environment type that supports both legacy object syntax and new array syntax
+ */
+export type EnvironmentInput = {
+    [key: string]: string;
+} | EnvironmentArrayItem[];
+/**
+ * Resolves environment input to a plain object.
+ *
+ * When environment is an object (legacy syntax), returns it as-is.
+ * When environment is an array:
+ *   - Strings are treated as keys to lookup in process.env
+ *   - Objects have their key-value pairs merged in
+ *
+ * @example
+ * // Legacy object syntax
+ * resolveEnvironment({ FOO: "bar" })
+ * // => { FOO: "bar" }
+ *
+ * @example
+ * // Array syntax with process.env lookup
+ * // Given process.env.MY_VAR = "hello"
+ * resolveEnvironment(["MY_VAR"])
+ * // => { MY_VAR: "hello" }
+ *
+ * @example
+ * // Array syntax with objects
+ * resolveEnvironment([{ FOO: "bar", BAZ: "qux" }])
+ * // => { FOO: "bar", BAZ: "qux" }
+ *
+ * @example
+ * // Mixed array syntax
+ * // Given process.env.MY_VAR = "hello"
+ * resolveEnvironment(["MY_VAR", { FOO: "bar" }])
+ * // => { MY_VAR: "hello", FOO: "bar" }
+ */
+export declare function resolveEnvironment(environment?: EnvironmentInput, env?: Record<string, string | undefined>): {
+    [key: string]: string;
+};

package/dist/cjs/helpers/resolveSecrets.d.ts

@@ -0,0 +1,52 @@
+import { Construct } from "constructs";
+import { JaypieEnvSecret } from "../JaypieEnvSecret.js";
+/**
+ * Secrets input type that supports both JaypieEnvSecret instances and strings
+ * - JaypieEnvSecret: passed through as-is
+ * - string: converted to JaypieEnvSecret with the string as envKey
+ */
+export type SecretsArrayItem = JaypieEnvSecret | string;
+/**
+ * Resolves secrets input to an array of JaypieEnvSecret instances.
+ *
+ * When an item is already a JaypieEnvSecret, it's passed through as-is.
+ * When an item is a string, a JaypieEnvSecret is created (or reused from cache)
+ * with the string as the envKey.
+ *
+ * Secrets are cached per scope to avoid creating duplicate secrets when
+ * multiple constructs in the same scope reference the same secret.
+ *
+ * @example
+ * // JaypieEnvSecret instances pass through
+ * const secret = new JaypieEnvSecret(scope, "MySecret", { envKey: "MY_KEY" });
+ * resolveSecrets(scope, [secret])
+ * // => [secret]
+ *
+ * @example
+ * // Strings create JaypieEnvSecret instances
+ * resolveSecrets(scope, ["AUTH0_SECRET", "MONGODB_URI"])
+ * // => [JaypieEnvSecret(envKey: "AUTH0_SECRET"), JaypieEnvSecret(envKey: "MONGODB_URI")]
+ *
+ * @example
+ * // Mixed input
+ * const existingSecret = new JaypieEnvSecret(scope, "Existing", { envKey: "EXISTING" });
+ * resolveSecrets(scope, [existingSecret, "NEW_SECRET"])
+ * // => [existingSecret, JaypieEnvSecret(envKey: "NEW_SECRET")]
+ *
+ * @example
+ * // Secrets are shared across calls with the same scope
+ * const secrets1 = resolveSecrets(scope, ["SHARED_SECRET"]);
+ * const secrets2 = resolveSecrets(scope, ["SHARED_SECRET"]);
+ * // secrets1[0] === secrets2[0] (same instance)
+ */
+export declare function resolveSecrets(scope: Construct, secrets?: SecretsArrayItem[]): JaypieEnvSecret[];
+/**
+ * Clears the secrets cache for a given scope.
+ * Primarily useful for testing.
+ */
+export declare function clearSecretsCache(scope: Construct): void;
+/**
+ * Clears all secrets caches.
+ * Primarily useful for testing.
+ */
+export declare function clearAllSecretsCaches(): void;