@jaypie/constructs 1.2.13 → 1.2.15

package/dist/cjs/JaypieDistribution.d.ts

@@ -62,9 +62,8 @@ export interface JaypieDistributionProps extends Omit<cloudfront.DistributionPro
     host?: string | HostConfig;
     /**
      * Invoke mode for Lambda Function URLs.
-     * If not provided, auto-detects from handler if it has an invokeMode property
-     * (e.g., JaypieStreamingLambda).
-     * @default InvokeMode.BUFFERED (or auto-detected from handler)
+     * Use RESPONSE_STREAM for streaming responses with createLambdaStreamHandler.
+     * @default InvokeMode.BUFFERED
      */
     invokeMode?: lambda.InvokeMode;
     /**

package/dist/cjs/JaypieDynamoDb.d.ts

@@ -1,14 +1,35 @@
 import { Construct } from "constructs";
 import { RemovalPolicy } from "aws-cdk-lib";
 import * as dynamodb from "aws-cdk-lib/aws-dynamodb";
+import { type IndexDefinition } from "@jaypie/fabric";
 export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "globalSecondaryIndexes" | "partitionKey" | "sortKey"> {
     /**
-     * Configure GSIs for the table.
-     * - `undefined` or `true`: Creates all five Jaypie GSIs (Alias, Class, Scope, Type, Xid)
-     * - `false`: No GSIs
-     * - Array: Use the specified GSIs
+     * Configure GSIs for the table using @jaypie/fabric IndexDefinition format.
+     * - `undefined`: No GSIs (default)
+     * - Array of IndexDefinition: Use the specified indexes
+     *
+     * Use `JaypieDynamoDb.DEFAULT_INDEXES` for the standard Jaypie GSIs.
+     *
+     * @example
+     * // No GSIs (default)
+     * new JaypieDynamoDb(this, "myTable");
+     *
+     * @example
+     * // With default Jaypie indexes
+     * new JaypieDynamoDb(this, "myTable", {
+     *   indexes: JaypieDynamoDb.DEFAULT_INDEXES,
+     * });
+     *
+     * @example
+     * // With custom indexes
+     * new JaypieDynamoDb(this, "myTable", {
+     *   indexes: [
+     *     { pk: ["scope", "model"], sk: ["sequence"] },
+     *     { pk: ["scope", "model", "type"], sk: ["sequence"], sparse: true },
+     *   ],
+     * });
      */
-    globalSecondaryIndexes?: boolean | dynamodb.GlobalSecondaryIndexPropsV2[];
+    indexes?: IndexDefinition[];
     /**
      * Partition key attribute definition.
      * @default { name: "model", type: AttributeType.STRING }
@@ -44,43 +65,35 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
  * - Sort key: `id` (String)
  * - Billing: PAY_PER_REQUEST (on-demand)
  * - Removal policy: RETAIN in production, DESTROY otherwise
- * - Five GSIs for different access patterns (can be overridden)
+ * - No GSIs by default (use `indexes` prop to add them)
+ * - Table name: CDK-generated (includes stack name and unique suffix)
  *
  * @example
- * // Shorthand: tableName becomes "myApp", construct id is "JaypieDynamoDb-myApp"
+ * // Shorthand: construct id is "JaypieDynamoDb-myApp", table name is CDK-generated
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // Full configuration
- * const table = new JaypieDynamoDb(this, "MyTable", {
- *   tableName: "custom-table-name",
- *   globalSecondaryIndexes: [], // Disable GSIs
+ * // With default Jaypie indexes
+ * const table = new JaypieDynamoDb(this, "myApp", {
+ *   indexes: JaypieDynamoDb.DEFAULT_INDEXES,
  * });
  *
  * @example
- * // Use only specific GSIs
+ * // With explicit table name (overrides CDK-generated name)
  * const table = new JaypieDynamoDb(this, "MyTable", {
- *   globalSecondaryIndexes: [
- *     JaypieDynamoDb.GlobalSecondaryIndex.Scope,
- *     JaypieDynamoDb.GlobalSecondaryIndex.Type,
+ *   tableName: "custom-table-name",
+ *   indexes: [
+ *     { pk: ["scope", "model"] },
+ *     { pk: ["scope", "model", "type"], sparse: true },
  *   ],
  * });
  */
 export declare class JaypieDynamoDb extends Construct implements dynamodb.ITableV2 {
     /**
-     * Individual GSI definitions for Jaypie single-table design
-     */
-    static readonly GlobalSecondaryIndex: {
-        readonly Alias: dynamodb.GlobalSecondaryIndexPropsV2;
-        readonly Class: dynamodb.GlobalSecondaryIndexPropsV2;
-        readonly Scope: dynamodb.GlobalSecondaryIndexPropsV2;
-        readonly Type: dynamodb.GlobalSecondaryIndexPropsV2;
-        readonly Xid: dynamodb.GlobalSecondaryIndexPropsV2;
-    };
-    /**
-     * Array of all default Jaypie GSI definitions
+     * Default Jaypie GSI definitions from @jaypie/fabric.
+     * Pass to `indexes` prop to create all standard GSIs.
      */
-    static readonly GlobalSecondaryIndexes: dynamodb.GlobalSecondaryIndexPropsV2[];
+    static readonly DEFAULT_INDEXES: any;
     private readonly _table;
     constructor(scope: Construct, id: string, props?: JaypieDynamoDbProps);
     /**

package/dist/cjs/constants.d.ts

@@ -1,17 +1,3 @@
-export declare const LAMBDA_WEB_ADAPTER: {
-    ACCOUNT: string;
-    DEFAULT_PORT: number;
-    EXEC_WRAPPER: string;
-    INVOKE_MODE: {
-        BUFFERED: string;
-        RESPONSE_STREAM: string;
-    };
-    LAYER: {
-        ARM64: string;
-        X86: string;
-    };
-    VERSION: number;
-};
 export declare const CDK: {
     ACCOUNT: {
         DEVELOPMENT: string;

package/dist/cjs/index.cjs

@@ -22,6 +22,7 @@ var awsEventsTargets = require('aws-cdk-lib/aws-events-targets');
 var cloudfront = require('aws-cdk-lib/aws-cloudfront');
 var origins = require('aws-cdk-lib/aws-cloudfront-origins');
 var dynamodb = require('aws-cdk-lib/aws-dynamodb');
+var fabric = require('@jaypie/fabric');
 var cdkNextjsStandalone = require('cdk-nextjs-standalone');
 var path = require('path');
 var awsCloudtrail = require('aws-cdk-lib/aws-cloudtrail');
@@ -63,20 +64,6 @@ var origins__namespace = /*#__PURE__*/_interopNamespaceDefault(origins);
 var dynamodb__namespace = /*#__PURE__*/_interopNamespaceDefault(dynamodb);
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
-const LAMBDA_WEB_ADAPTER = {
-    ACCOUNT: "753240598075",
-    DEFAULT_PORT: 8000,
-    EXEC_WRAPPER: "/opt/bootstrap",
-    INVOKE_MODE: {
-        BUFFERED: "BUFFERED",
-        RESPONSE_STREAM: "RESPONSE_STREAM",
-    },
-    LAYER: {
-        ARM64: "LambdaAdapterLayerArm64",
-        X86: "LambdaAdapterLayerX86",
-    },
-    VERSION: 25,
-};
 const CDK$2 = {
     ACCOUNT: {
         DEVELOPMENT: "development",
@@ -782,7 +769,7 @@ function resolveDatadogLayers(scope, options = {}) {
     }
     const layerIdSuffix = uniqueId || process.env.PROJECT_NONCE || Date.now().toString();
     // Create Datadog Node.js layer
-    const datadogNodeLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(scope, `DatadogNodeLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Node20-x:${CDK$2.DATADOG.LAYER.NODE}`);
+    const datadogNodeLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(scope, `DatadogNodeLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Node24-x:${CDK$2.DATADOG.LAYER.NODE}`);
     // Create Datadog Extension layer
     const datadogExtensionLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(scope, `DatadogExtensionLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Extension:${CDK$2.DATADOG.LAYER.EXTENSION}`);
     return [datadogNodeLayer, datadogExtensionLayer];
@@ -2416,7 +2403,7 @@ class JaypieDistribution extends constructs.Construct {
         // IFunction before IFunctionUrl (IFunction doesn't have functionUrlId)
         let origin;
         if (handler) {
-            // Auto-detect invoke mode from handler (e.g., JaypieStreamingLambda)
+            // Auto-detect invoke mode from handler if it has an invokeMode property
             // Explicit invokeMode prop takes precedence over auto-detection
             const resolvedInvokeMode = invokeMode !== lambda__namespace.InvokeMode.BUFFERED
                 ? invokeMode // Explicit non-default value, use it
@@ -2577,7 +2564,7 @@ class JaypieDistribution extends constructs.Construct {
             !("url" in handler));
     }
     hasInvokeMode(handler) {
-        // Check if handler has an invokeMode property (e.g., JaypieStreamingLambda)
+        // Check if handler has an invokeMode property for streaming support
         return (typeof handler === "object" &&
             handler !== null &&
             "invokeMode" in handler &&
@@ -2715,69 +2702,40 @@ class JaypieDnsRecord extends constructs.Construct {
 //
 // Constants
 //
+/** Composite key separator used in GSI partition keys */
+const SEPARATOR = "#";
+//
+//
+// Helper Functions
+//
 /**
- * GSI attribute names used in Jaypie single-table design
- */
-const GSI_NAMES = {
-    ALIAS: "indexAlias",
-    CLASS: "indexClass",
-    SCOPE: "indexScope",
-    TYPE: "indexType",
-    XID: "indexXid",
-};
-/**
- * Individual GSI definitions for Jaypie single-table design.
- * All GSIs use a string partition key and numeric sort key (sequence).
- */
-const GlobalSecondaryIndex = {
-    Alias: {
-        indexName: GSI_NAMES.ALIAS,
-        partitionKey: {
-            name: GSI_NAMES.ALIAS,
-            type: dynamodb__namespace.AttributeType.STRING,
-        },
-        projectionType: dynamodb__namespace.ProjectionType.ALL,
-        sortKey: { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER },
-    },
-    Class: {
-        indexName: GSI_NAMES.CLASS,
-        partitionKey: {
-            name: GSI_NAMES.CLASS,
-            type: dynamodb__namespace.AttributeType.STRING,
-        },
-        projectionType: dynamodb__namespace.ProjectionType.ALL,
-        sortKey: { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER },
-    },
-    Scope: {
-        indexName: GSI_NAMES.SCOPE,
-        partitionKey: { name: GSI_NAMES.SCOPE, type: dynamodb__namespace.AttributeType.STRING },
-        projectionType: dynamodb__namespace.ProjectionType.ALL,
-        sortKey: { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER },
-    },
-    Type: {
-        indexName: GSI_NAMES.TYPE,
-        partitionKey: { name: GSI_NAMES.TYPE, type: dynamodb__namespace.AttributeType.STRING },
-        projectionType: dynamodb__namespace.ProjectionType.ALL,
-        sortKey: { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER },
-    },
-    Xid: {
-        indexName: GSI_NAMES.XID,
-        partitionKey: { name: GSI_NAMES.XID, type: dynamodb__namespace.AttributeType.STRING },
-        projectionType: dynamodb__namespace.ProjectionType.ALL,
-        sortKey: { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER },
-    },
-};
-/**
- * Array of all default Jaypie GSI definitions.
- * Used when no globalSecondaryIndexes are provided.
+ * Convert IndexDefinition[] from @jaypie/fabric to CDK GlobalSecondaryIndexPropsV2[]
+ *
+ * @param indexes - Array of IndexDefinition from @jaypie/fabric
+ * @returns Array of CDK GlobalSecondaryIndexPropsV2
  */
-const GlobalSecondaryIndexes = [
-    GlobalSecondaryIndex.Alias,
-    GlobalSecondaryIndex.Class,
-    GlobalSecondaryIndex.Scope,
-    GlobalSecondaryIndex.Type,
-    GlobalSecondaryIndex.Xid,
-];
+function indexesToGsi(indexes) {
+    return indexes.map((index) => {
+        // Generate index name from pk fields if not provided
+        const indexName = index.name ?? fabric.generateIndexName(index.pk);
+        // Sort key defaults to ["sequence"] if not provided
+        const skFields = index.sk ?? fabric.DEFAULT_SORT_KEY;
+        return {
+            indexName,
+            partitionKey: {
+                name: indexName,
+                type: dynamodb__namespace.AttributeType.STRING,
+            },
+            projectionType: dynamodb__namespace.ProjectionType.ALL,
+            sortKey: skFields.length === 1 && skFields[0] === "sequence"
+                ? { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER }
+                : {
+                    name: skFields.join(SEPARATOR),
+                    type: dynamodb__namespace.AttributeType.STRING,
+                },
+        };
+    });
+}
 //
 //
 // Main
@@ -2790,55 +2748,51 @@ const GlobalSecondaryIndexes = [
  * - Sort key: `id` (String)
  * - Billing: PAY_PER_REQUEST (on-demand)
  * - Removal policy: RETAIN in production, DESTROY otherwise
- * - Five GSIs for different access patterns (can be overridden)
+ * - No GSIs by default (use `indexes` prop to add them)
+ * - Table name: CDK-generated (includes stack name and unique suffix)
  *
  * @example
- * // Shorthand: tableName becomes "myApp", construct id is "JaypieDynamoDb-myApp"
+ * // Shorthand: construct id is "JaypieDynamoDb-myApp", table name is CDK-generated
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // Full configuration
- * const table = new JaypieDynamoDb(this, "MyTable", {
- *   tableName: "custom-table-name",
- *   globalSecondaryIndexes: [], // Disable GSIs
+ * // With default Jaypie indexes
+ * const table = new JaypieDynamoDb(this, "myApp", {
+ *   indexes: JaypieDynamoDb.DEFAULT_INDEXES,
  * });
  *
  * @example
- * // Use only specific GSIs
+ * // With explicit table name (overrides CDK-generated name)
  * const table = new JaypieDynamoDb(this, "MyTable", {
- *   globalSecondaryIndexes: [
- *     JaypieDynamoDb.GlobalSecondaryIndex.Scope,
- *     JaypieDynamoDb.GlobalSecondaryIndex.Type,
+ *   tableName: "custom-table-name",
+ *   indexes: [
+ *     { pk: ["scope", "model"] },
+ *     { pk: ["scope", "model", "type"], sparse: true },
  *   ],
  * });
  */
 class JaypieDynamoDb extends constructs.Construct {
     constructor(scope, id, props = {}) {
         // Determine if this is shorthand usage: new JaypieDynamoDb(this, "myApp")
-        // In shorthand, id becomes the tableName and construct id is prefixed
+        // In shorthand, construct id is prefixed for clarity; tableName left undefined
+        // so CDK generates it with stack prefix (e.g., cdk-sponsor-project-env-nonce-app-JaypieDynamoDb-myApp-Table-XXXXX)
         const isShorthand = !props.tableName && !id.includes("-");
         const constructId = isShorthand ? `JaypieDynamoDb-${id}` : id;
-        const tableName = props.tableName ?? (isShorthand ? id : undefined);
         super(scope, constructId);
-        const { billing = dynamodb__namespace.Billing.onDemand(), globalSecondaryIndexes: gsiInput, partitionKey = {
+        const { billing = dynamodb__namespace.Billing.onDemand(), indexes, partitionKey = {
             name: "model",
             type: dynamodb__namespace.AttributeType.STRING,
         }, project, removalPolicy = isProductionEnv()
             ? cdk.RemovalPolicy.RETAIN
             : cdk.RemovalPolicy.DESTROY, roleTag = CDK$2.ROLE.STORAGE, service, sortKey = { name: "id", type: dynamodb__namespace.AttributeType.STRING }, vendorTag, ...restProps } = props;
-        // Resolve GSI configuration: undefined/true = all, false = none, array = use as-is
-        const globalSecondaryIndexes = gsiInput === false
-            ? undefined
-            : Array.isArray(gsiInput)
-                ? gsiInput
-                : GlobalSecondaryIndexes;
+        // Convert IndexDefinition[] to CDK GSI props
+        const globalSecondaryIndexes = indexes ? indexesToGsi(indexes) : undefined;
         this._table = new dynamodb__namespace.TableV2(this, "Table", {
             billing,
             globalSecondaryIndexes,
             partitionKey,
             removalPolicy,
             sortKey,
-            tableName,
             ...restProps,
         });
         // Apply tags
@@ -2944,13 +2898,10 @@ class JaypieDynamoDb extends constructs.Construct {
     }
 }
 /**
- * Individual GSI definitions for Jaypie single-table design
+ * Default Jaypie GSI definitions from @jaypie/fabric.
+ * Pass to `indexes` prop to create all standard GSIs.
  */
-JaypieDynamoDb.GlobalSecondaryIndex = GlobalSecondaryIndex;
-/**
- * Array of all default Jaypie GSI definitions
- */
-JaypieDynamoDb.GlobalSecondaryIndexes = GlobalSecondaryIndexes;
+JaypieDynamoDb.DEFAULT_INDEXES = fabric.DEFAULT_INDEXES;
 
 class JaypieEventsRule extends constructs.Construct {
     /**
@@ -4166,75 +4117,6 @@ class JaypieStaticWebBucket extends JaypieWebDeploymentBucket {
     }
 }
 
-/**
- * A Lambda construct that uses AWS Lambda Web Adapter for streaming support.
- * This allows running web applications (Express, Fastify, etc.) with streaming responses.
- *
- * @example
- * ```typescript
- * const streamingLambda = new JaypieStreamingLambda(this, "StreamingApi", {
- *   code: "dist/api",
- *   handler: "run.sh",
- *   streaming: true,
- * });
- *
- * // Use with JaypieDistribution
- * new JaypieDistribution(this, "Distribution", {
- *   handler: streamingLambda,
- *   invokeMode: streamingLambda.invokeMode,
- * });
- * ```
- */
-class JaypieStreamingLambda extends JaypieLambda {
-    constructor(scope, id, props) {
-        const { architecture = lambda__namespace.Architecture.X86_64, environment: propsEnvironment, layers: propsLayers = [], port = LAMBDA_WEB_ADAPTER.DEFAULT_PORT, streaming = false, ...restProps } = props;
-        // Determine the Lambda Web Adapter layer ARN based on architecture
-        const region = cdk.Stack.of(scope).region;
-        const layerArn = architecture === lambda__namespace.Architecture.ARM_64
-            ? `arn:aws:lambda:${region}:${LAMBDA_WEB_ADAPTER.ACCOUNT}:layer:${LAMBDA_WEB_ADAPTER.LAYER.ARM64}:${LAMBDA_WEB_ADAPTER.VERSION}`
-            : `arn:aws:lambda:${region}:${LAMBDA_WEB_ADAPTER.ACCOUNT}:layer:${LAMBDA_WEB_ADAPTER.LAYER.X86}:${LAMBDA_WEB_ADAPTER.VERSION}`;
-        // Create the Lambda Web Adapter layer
-        const webAdapterLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(scope, `${id}WebAdapterLayer`, layerArn);
-        // Build environment variables with Lambda Web Adapter configuration
-        const lwaInvokeMode = streaming
-            ? LAMBDA_WEB_ADAPTER.INVOKE_MODE.RESPONSE_STREAM
-            : LAMBDA_WEB_ADAPTER.INVOKE_MODE.BUFFERED;
-        const webAdapterEnvironment = {
-            AWS_LAMBDA_EXEC_WRAPPER: LAMBDA_WEB_ADAPTER.EXEC_WRAPPER,
-            AWS_LWA_INVOKE_MODE: lwaInvokeMode,
-            PORT: String(port),
-        };
-        // Merge environment variables - props environment takes precedence
-        let mergedEnvironment;
-        if (Array.isArray(propsEnvironment)) {
-            // Array syntax: prepend our object to the array
-            mergedEnvironment = [webAdapterEnvironment, ...propsEnvironment];
-        }
-        else if (propsEnvironment && typeof propsEnvironment === "object") {
-            // Object syntax: merge objects
-            mergedEnvironment = {
-                ...webAdapterEnvironment,
-                ...propsEnvironment,
-            };
-        }
-        else {
-            mergedEnvironment = webAdapterEnvironment;
-        }
-        super(scope, id, {
-            architecture,
-            environment: mergedEnvironment,
-            layers: [webAdapterLayer, ...propsLayers],
-            roleTag: CDK$2.ROLE.API,
-            timeout: cdk.Duration.seconds(CDK$2.DURATION.EXPRESS_API),
-            ...restProps,
-        });
-        // Set invoke mode for use with JaypieDistribution
-        this.invokeMode = streaming
-            ? lambda__namespace.InvokeMode.RESPONSE_STREAM
-            : lambda__namespace.InvokeMode.BUFFERED;
-    }
-}
-
 class JaypieTraceSigningKeySecret extends JaypieEnvSecret {
     constructor(scope, id = "TraceSigningKey", props) {
         const defaultProps = {
@@ -4275,10 +4157,8 @@ exports.JaypieSsoPermissions = JaypieSsoPermissions;
 exports.JaypieSsoSyncApplication = JaypieSsoSyncApplication;
 exports.JaypieStack = JaypieStack;
 exports.JaypieStaticWebBucket = JaypieStaticWebBucket;
-exports.JaypieStreamingLambda = JaypieStreamingLambda;
 exports.JaypieTraceSigningKeySecret = JaypieTraceSigningKeySecret;
 exports.JaypieWebDeploymentBucket = JaypieWebDeploymentBucket;
-exports.LAMBDA_WEB_ADAPTER = LAMBDA_WEB_ADAPTER;
 exports.addDatadogLayers = addDatadogLayers;
 exports.clearAllCertificateCaches = clearAllCertificateCaches;
 exports.clearAllSecretsCaches = clearAllSecretsCaches;