@jaypie/constructs 1.2.41 → 1.2.43

package/dist/esm/JaypieApiGateway.d.ts

@@ -6,6 +6,15 @@ import * as route53 from "aws-cdk-lib/aws-route53";
 import { HostConfig } from "./helpers";
 export interface JaypieApiGatewayProps extends apiGateway.LambdaRestApiProps {
     certificate?: boolean | acm.ICertificate;
+    /**
+     * Force-delete any existing Route53 A record with the same name before
+     * creating the alias record. Useful when migrating from another construct
+     * (e.g., JaypieDistribution) that already owns the same hostname, where the
+     * default CloudFormation create-before-delete ordering would otherwise
+     * collide on the record name.
+     * @default false
+     */
+    deleteExistingRecord?: boolean;
     /**
      * The domain name for the API Gateway.
      *

package/dist/esm/JaypieDistribution.d.ts

@@ -66,6 +66,15 @@ export interface JaypieDistributionProps extends Omit<cloudfront.DistributionPro
      * Override default behavior (optional if handler is provided)
      */
     defaultBehavior?: cloudfront.BehaviorOptions;
+    /**
+     * Force-delete any existing Route53 A and AAAA records with the same name
+     * before creating the alias records. Useful when migrating from another
+     * construct (e.g., JaypieApiGateway) that already owns the same hostname,
+     * where the default CloudFormation create-before-delete ordering would
+     * otherwise collide on the record name.
+     * @default false
+     */
+    deleteExistingRecord?: boolean;
     /**
      * Log destination configuration for CloudFront access logs
      * - LambdaDestination: Use a specific Lambda destination for S3 notifications

package/dist/esm/JaypieDynamoDb.d.ts

@@ -6,25 +6,23 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
     /**
      * Configure GSIs for the table using @jaypie/fabric IndexDefinition format.
      * - `undefined`: No GSIs (default)
-     * - Array of IndexDefinition: Use the specified indexes
+     * - Array of IndexDefinition: Use the specified indexes (prefer fabricIndex())
      *
      * @example
      * // No GSIs (default)
      * new JaypieDynamoDb(this, "myTable");
      *
      * @example
-     * // With custom indexes
+     * // With fabricIndex-shaped indexes
+     * import { fabricIndex } from "@jaypie/fabric";
      * new JaypieDynamoDb(this, "myTable", {
-     *   indexes: [
-     *     { pk: ["scope", "model"], sk: ["sequence"] },
-     *     { pk: ["scope", "model", "type"], sk: ["sequence"], sparse: true },
-     *   ],
+     *   indexes: [fabricIndex(), fabricIndex("alias"), fabricIndex("xid")],
      * });
      */
     indexes?: IndexDefinition[];
     /**
      * Partition key attribute definition.
-     * @default { name: "model", type: AttributeType.STRING }
+     * @default { name: "id", type: AttributeType.STRING }
      */
     partitionKey?: dynamodb.Attribute;
     /**
@@ -40,8 +38,8 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
      */
     service?: string;
     /**
-     * Sort key attribute definition.
-     * @default { name: "id", type: AttributeType.STRING }
+     * Sort key attribute definition. Defaults to `undefined` (no sort key) —
+     * the Jaypie single-table pattern uses `id` as a unique partition key.
      */
     sortKey?: dynamodb.Attribute;
     /**
@@ -53,8 +51,7 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
  * DynamoDB table with Jaypie single-table design patterns.
  *
  * Creates a table with:
- * - Partition key: `model` (String)
- * - Sort key: `id` (String)
+ * - Partition key: `id` (String), no sort key
  * - Billing: PAY_PER_REQUEST (on-demand)
  * - Removal policy: RETAIN in production, DESTROY otherwise
  * - No GSIs by default (use `indexes` prop to add them)
@@ -65,13 +62,11 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // With explicit table name (overrides CDK-generated name)
+ * // With fabricIndex() for GSIs
+ * import { fabricIndex } from "@jaypie/fabric";
  * const table = new JaypieDynamoDb(this, "MyTable", {
  *   tableName: "custom-table-name",
- *   indexes: [
- *     { pk: ["scope", "model"] },
- *     { pk: ["scope", "model", "type"], sparse: true },
- *   ],
+ *   indexes: [fabricIndex(), fabricIndex("alias"), fabricIndex("xid")],
  * });
  */
 export declare class JaypieDynamoDb extends Construct implements dynamodb.ITableV2 {

package/dist/esm/index.js

@@ -26,7 +26,7 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import * as origins from 'aws-cdk-lib/aws-cloudfront-origins';
 import * as wafv2 from 'aws-cdk-lib/aws-wafv2';
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
-import { generateIndexName, DEFAULT_SORT_KEY } from '@jaypie/fabric';
+import { getGsiAttributeNames } from '@jaypie/fabric';
 import * as cr from 'aws-cdk-lib/custom-resources';
 import { Nextjs } from 'cdk-nextjs-standalone';
 import * as path from 'path';
@@ -1134,7 +1134,7 @@ function clearAllSecretsCaches() {
 class JaypieApiGateway extends Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const { certificate = true, handler, host: propsHost, name, roleTag = CDK$2.ROLE.API, zone: propsZone, } = props;
+        const { certificate = true, deleteExistingRecord = false, handler, host: propsHost, name, roleTag = CDK$2.ROLE.API, zone: propsZone, } = props;
         // Determine zone from props or environment
         let zone = propsZone;
         if (!zone && process.env.CDK_ENV_API_HOSTED_ZONE) {
@@ -1180,7 +1180,7 @@ class JaypieApiGateway extends Construct {
         // * `...lambdaRestApiProps` cannot be moved to the first const destructuring because it needs to exclude the custom properties first.
         // Ignore the variables we already assigned to other properties
         /* eslint-disable @typescript-eslint/no-unused-vars */
-        certificate: _certificate, host: _host, name: _name, roleTag: _roleTag, zone: _zone, handler: _handler, 
+        certificate: _certificate, deleteExistingRecord: _deleteExistingRecord, host: _host, name: _name, roleTag: _roleTag, zone: _zone, handler: _handler, 
         /* eslint-enable @typescript-eslint/no-unused-vars */
         ...lambdaRestApiProps } = props;
         this._api = new apiGateway.LambdaRestApi(this, apiGatewayName, {
@@ -1195,6 +1195,7 @@ class JaypieApiGateway extends Construct {
             });
             Tags.of(this._domainName).add(CDK$2.TAG.ROLE, roleTag);
             const record = new route53.ARecord(this, "AliasRecord", {
+                deleteExisting: deleteExistingRecord,
                 recordName: host,
                 target: route53.RecordTarget.fromAlias(new route53Targets.ApiGatewayDomain(this._domainName)),
                 zone: hostedZone,
@@ -2358,7 +2359,7 @@ const DEFAULT_MANAGED_RULES = [
 class JaypieDistribution extends Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const { certificate: certificateProp = true, defaultBehavior: propsDefaultBehavior, destination: destinationProp = true, handler, host: propsHost, logBucket: logBucketProp, originReadTimeout = Duration.seconds(CDK$2.DURATION.CLOUDFRONT_API), responseHeadersPolicy: responseHeadersPolicyProp, roleTag = CDK$2.ROLE.API, securityHeaders: securityHeadersProp, streaming = false, waf: wafProp = true, zone: propsZone, ...distributionProps } = props;
+        const { certificate: certificateProp = true, defaultBehavior: propsDefaultBehavior, deleteExistingRecord = false, destination: destinationProp = true, handler, host: propsHost, logBucket: logBucketProp, originReadTimeout = Duration.seconds(CDK$2.DURATION.CLOUDFRONT_API), responseHeadersPolicy: responseHeadersPolicyProp, roleTag = CDK$2.ROLE.API, securityHeaders: securityHeadersProp, streaming = false, waf: wafProp = true, zone: propsZone, ...distributionProps } = props;
         // Validate environment variables
         if (process.env.CDK_ENV_API_SUBDOMAIN &&
             !isValidSubdomain(process.env.CDK_ENV_API_SUBDOMAIN)) {
@@ -2718,12 +2719,14 @@ class JaypieDistribution extends Construct {
         // Create DNS records if we have host and zone
         if (host && hostedZone) {
             const aRecord = new route53.ARecord(this, "AliasRecord", {
+                deleteExisting: deleteExistingRecord,
                 recordName: host,
                 target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(this.distribution)),
                 zone: hostedZone,
             });
             Tags.of(aRecord).add(CDK$2.TAG.ROLE, CDK$2.ROLE.NETWORKING);
             const aaaaRecord = new route53.AaaaRecord(this, "AaaaAliasRecord", {
+                deleteExisting: deleteExistingRecord,
                 recordName: host,
                 target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(this.distribution)),
                 zone: hostedZone,
@@ -2892,41 +2895,39 @@ class JaypieDnsRecord extends Construct {
     }
 }
 
-//
-//
-// Constants
-//
-/** Composite key separator used in GSI partition keys */
-const SEPARATOR = "#";
 //
 //
 // Helper Functions
 //
 /**
- * Convert IndexDefinition[] from @jaypie/fabric to CDK GlobalSecondaryIndexPropsV2[]
+ * Convert IndexDefinition[] from @jaypie/fabric to CDK GlobalSecondaryIndexPropsV2[].
  *
- * @param indexes - Array of IndexDefinition from @jaypie/fabric
- * @returns Array of CDK GlobalSecondaryIndexPropsV2
+ * Uses `getGsiAttributeNames` as the single source of truth so runtime writes
+ * and CDK provisioning agree on attribute names. Composite sk indexes
+ * (sk.length > 1) get a dedicated STRING `{indexName}Sk` attribute; single-field
+ * sk indexes reference the field directly (STRING in the general case, NUMBER
+ * for the legacy `sequence` name).
  */
 function indexesToGsi(indexes) {
     return indexes.map((index) => {
-        // Generate index name from pk fields if not provided
-        const indexName = index.name ?? generateIndexName(index.pk);
-        // Sort key defaults to ["sequence"] if not provided
-        const skFields = index.sk ?? DEFAULT_SORT_KEY;
+        const { pk, sk } = getGsiAttributeNames(index);
+        let sortKey;
+        if (sk) {
+            if (sk === "sequence") {
+                sortKey = { name: "sequence", type: dynamodb.AttributeType.NUMBER };
+            }
+            else {
+                sortKey = { name: sk, type: dynamodb.AttributeType.STRING };
+            }
+        }
         return {
-            indexName,
+            indexName: pk,
             partitionKey: {
-                name: indexName,
+                name: pk,
                 type: dynamodb.AttributeType.STRING,
             },
             projectionType: dynamodb.ProjectionType.ALL,
-            sortKey: skFields.length === 1 && skFields[0] === "sequence"
-                ? { name: "sequence", type: dynamodb.AttributeType.NUMBER }
-                : {
-                    name: skFields.join(SEPARATOR),
-                    type: dynamodb.AttributeType.STRING,
-                },
+            ...(sortKey && { sortKey }),
         };
     });
 }
@@ -2938,8 +2939,7 @@ function indexesToGsi(indexes) {
  * DynamoDB table with Jaypie single-table design patterns.
  *
  * Creates a table with:
- * - Partition key: `model` (String)
- * - Sort key: `id` (String)
+ * - Partition key: `id` (String), no sort key
  * - Billing: PAY_PER_REQUEST (on-demand)
  * - Removal policy: RETAIN in production, DESTROY otherwise
  * - No GSIs by default (use `indexes` prop to add them)
@@ -2950,13 +2950,11 @@ function indexesToGsi(indexes) {
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // With explicit table name (overrides CDK-generated name)
+ * // With fabricIndex() for GSIs
+ * import { fabricIndex } from "@jaypie/fabric";
  * const table = new JaypieDynamoDb(this, "MyTable", {
  *   tableName: "custom-table-name",
- *   indexes: [
- *     { pk: ["scope", "model"] },
- *     { pk: ["scope", "model", "type"], sparse: true },
- *   ],
+ *   indexes: [fabricIndex(), fabricIndex("alias"), fabricIndex("xid")],
  * });
  */
 class JaypieDynamoDb extends Construct {
@@ -2968,11 +2966,11 @@ class JaypieDynamoDb extends Construct {
         const constructId = isShorthand ? `JaypieDynamoDb-${id}` : id;
         super(scope, constructId);
         const { billing = dynamodb.Billing.onDemand(), indexes, partitionKey = {
-            name: "model",
+            name: "id",
             type: dynamodb.AttributeType.STRING,
         }, project, removalPolicy = isProductionEnv()
             ? RemovalPolicy.RETAIN
-            : RemovalPolicy.DESTROY, roleTag = CDK$2.ROLE.STORAGE, service, sortKey = { name: "id", type: dynamodb.AttributeType.STRING }, vendorTag, ...restProps } = props;
+            : RemovalPolicy.DESTROY, roleTag = CDK$2.ROLE.STORAGE, service, sortKey, vendorTag, ...restProps } = props;
         // Convert IndexDefinition[] to CDK GSI props
         const globalSecondaryIndexes = indexes ? indexesToGsi(indexes) : undefined;
         this._table = new dynamodb.TableV2(this, "Table", {
@@ -2980,7 +2978,7 @@ class JaypieDynamoDb extends Construct {
             globalSecondaryIndexes,
             partitionKey,
             removalPolicy,
-            sortKey,
+            ...(sortKey && { sortKey }),
             ...restProps,
         });
         // Apply tags