@jaypie/constructs 1.2.43 → 1.2.45

package/dist/cjs/JaypieDistribution.d.ts

@@ -9,6 +9,15 @@ import * as wafv2 from "aws-cdk-lib/aws-wafv2";
 import { Construct } from "constructs";
 import { HostConfig } from "./helpers";
 export interface JaypieWafConfig {
+    /**
+     * Unique name for this distribution's WAF resources. Required when passing a
+     * WAF config object. Injected into the WebACL name and WAF log bucket name
+     * so multiple JaypieDistribution instances can coexist in the same
+     * account/env without S3/WAFv2 name collisions.
+     *
+     * Pass `waf: true` (or omit) to retain the legacy, non-namespaced names.
+     */
+    name: string;
     /**
      * Whether WAF is enabled
      * @default true

package/dist/cjs/JaypieDynamoDb.d.ts

@@ -1,22 +1,24 @@
 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";
+import type { IndexDefinition } from "./types/IndexDefinition";
 export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "globalSecondaryIndexes" | "partitionKey" | "sortKey"> {
     /**
-     * Configure GSIs for the table using @jaypie/fabric IndexDefinition format.
+     * Configure GSIs for the table using the IndexDefinition format.
      * - `undefined`: No GSIs (default)
-     * - Array of IndexDefinition: Use the specified indexes (prefer fabricIndex())
+     * - Array of IndexDefinition: Use the specified indexes
      *
      * @example
      * // No GSIs (default)
      * new JaypieDynamoDb(this, "myTable");
      *
      * @example
-     * // With fabricIndex-shaped indexes
-     * import { fabricIndex } from "@jaypie/fabric";
+     * // Inline indexes
      * new JaypieDynamoDb(this, "myTable", {
-     *   indexes: [fabricIndex(), fabricIndex("alias"), fabricIndex("xid")],
+     *   indexes: [
+     *     { name: "indexModel", pk: ["model"], sk: ["scope", "updatedAt"] },
+     *     { name: "indexModelAlias", pk: ["model", "alias"], sk: ["scope", "updatedAt"], sparse: true },
+     *   ],
      * });
      */
     indexes?: IndexDefinition[];
@@ -62,11 +64,13 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // With fabricIndex() for GSIs
- * import { fabricIndex } from "@jaypie/fabric";
+ * // With inline IndexDefinition for GSIs
  * const table = new JaypieDynamoDb(this, "MyTable", {
  *   tableName: "custom-table-name",
- *   indexes: [fabricIndex(), fabricIndex("alias"), fabricIndex("xid")],
+ *   indexes: [
+ *     { name: "indexModel", pk: ["model"], sk: ["scope", "updatedAt"] },
+ *     { name: "indexModelAlias", pk: ["model", "alias"], sk: ["scope", "updatedAt"], sparse: true },
+ *   ],
  * });
  */
 export declare class JaypieDynamoDb extends Construct implements dynamodb.ITableV2 {

package/dist/cjs/index.cjs

@@ -23,7 +23,6 @@ var cloudfront = require('aws-cdk-lib/aws-cloudfront');
 var origins = require('aws-cdk-lib/aws-cloudfront-origins');
 var wafv2 = require('aws-cdk-lib/aws-wafv2');
 var dynamodb = require('aws-cdk-lib/aws-dynamodb');
-var fabric = require('@jaypie/fabric');
 var cr = require('aws-cdk-lib/custom-resources');
 var cdkNextjsStandalone = require('cdk-nextjs-standalone');
 var path = require('path');
@@ -2690,14 +2689,17 @@ class JaypieDistribution extends constructs.Construct {
                         sampledRequestsEnabled: true,
                     },
                 });
+                const webAclName = wafConfig.name
+                    ? constructEnvName(`${wafConfig.name}-WebAcl`)
+                    : constructEnvName("WebAcl");
                 const webAcl = new wafv2__namespace.CfnWebACL(this, "WebAcl", {
                     defaultAction: { allow: {} },
-                    name: constructEnvName("WebAcl"),
+                    name: webAclName,
                     rules,
                     scope: "CLOUDFRONT",
                     visibilityConfig: {
                         cloudWatchMetricsEnabled: true,
-                        metricName: constructEnvName("WebAcl"),
+                        metricName: webAclName,
                         sampledRequestsEnabled: true,
                     },
                 });
@@ -2713,8 +2715,14 @@ class JaypieDistribution extends constructs.Construct {
             let wafLogBucket;
             if (wafLogBucketProp === true) {
                 // Create inline WAF logging bucket with Datadog forwarding
-                const createdBucket = new s3__namespace.Bucket(this, constructEnvName("WafLogBucket"), {
-                    bucketName: `aws-waf-logs-${constructEnvName("waf").toLowerCase()}`,
+                const wafLogBucketId = wafConfig.name
+                    ? constructEnvName(`${wafConfig.name}-WafLogBucket`)
+                    : constructEnvName("WafLogBucket");
+                const wafLogBucketName = wafConfig.name
+                    ? `aws-waf-logs-${constructEnvName(`${wafConfig.name}-waf`).toLowerCase()}`
+                    : `aws-waf-logs-${constructEnvName("waf").toLowerCase()}`;
+                const createdBucket = new s3__namespace.Bucket(this, wafLogBucketId, {
+                    bucketName: wafLogBucketName,
                     lifecycleRules: [
                         {
                             expiration: cdk.Duration.days(90),
@@ -2936,17 +2944,43 @@ class JaypieDnsRecord extends constructs.Construct {
 // Helper Functions
 //
 /**
- * Convert IndexDefinition[] from @jaypie/fabric to CDK GlobalSecondaryIndexPropsV2[].
+ * Derive GSI attribute names for an index definition.
  *
- * 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).
+ * Mirrors `@jaypie/fabric`'s `getGsiAttributeNames` so CDK provisioning and
+ * any runtime write path agree on the attribute names. Kept local to avoid
+ * a runtime dependency on the pre-1.0 `@jaypie/fabric` package.
+ *
+ * - `pk` is always the index name (`index.name` or generated from `index.pk`)
+ * - `sk` is the single sk field name when `sk.length === 1`, or
+ *   `{indexName}Sk` when `sk.length > 1` (composite sk attribute)
+ */
+function getGsiAttributeNames(index) {
+    const name = index.name ?? generateIndexName(index.pk);
+    let sk;
+    if (index.sk && index.sk.length > 1) {
+        sk = `${name}Sk`;
+    }
+    else if (index.sk && index.sk.length === 1) {
+        sk = index.sk[0];
+    }
+    return { pk: name, sk };
+}
+function generateIndexName(pk) {
+    const suffix = pk
+        .map((field) => field.charAt(0).toUpperCase() + field.slice(1))
+        .join("");
+    return `index${suffix}`;
+}
+/**
+ * Convert IndexDefinition[] to CDK GlobalSecondaryIndexPropsV2[].
+ *
+ * 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) => {
-        const { pk, sk } = fabric.getGsiAttributeNames(index);
+        const { pk, sk } = getGsiAttributeNames(index);
         let sortKey;
         if (sk) {
             if (sk === "sequence") {
@@ -2986,11 +3020,13 @@ function indexesToGsi(indexes) {
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // With fabricIndex() for GSIs
- * import { fabricIndex } from "@jaypie/fabric";
+ * // With inline IndexDefinition for GSIs
  * const table = new JaypieDynamoDb(this, "MyTable", {
  *   tableName: "custom-table-name",
- *   indexes: [fabricIndex(), fabricIndex("alias"), fabricIndex("xid")],
+ *   indexes: [
+ *     { name: "indexModel", pk: ["model"], sk: ["scope", "updatedAt"] },
+ *     { name: "indexModelAlias", pk: ["model", "alias"], sk: ["scope", "updatedAt"], sparse: true },
+ *   ],
  * });
  */
 class JaypieDynamoDb extends constructs.Construct {