@jaypie/constructs 1.2.42 → 1.2.44

package/dist/cjs/JaypieDynamoDb.d.ts

@@ -1,10 +1,10 @@
 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
      *
@@ -13,18 +13,18 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
      * new JaypieDynamoDb(this, "myTable");
      *
      * @example
-     * // With custom indexes
+     * // Inline indexes
      * new JaypieDynamoDb(this, "myTable", {
      *   indexes: [
-     *     { pk: ["scope", "model"], sk: ["sequence"] },
-     *     { pk: ["scope", "model", "type"], sk: ["sequence"], sparse: true },
+     *     { name: "indexModel", pk: ["model"], sk: ["scope", "updatedAt"] },
+     *     { name: "indexModelAlias", pk: ["model", "alias"], sk: ["scope", "updatedAt"], sparse: true },
      *   ],
      * });
      */
     indexes?: IndexDefinition[];
     /**
      * Partition key attribute definition.
-     * @default { name: "model", type: AttributeType.STRING }
+     * @default { name: "id", type: AttributeType.STRING }
      */
     partitionKey?: dynamodb.Attribute;
     /**
@@ -40,8 +40,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 +53,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,12 +64,12 @@ export interface JaypieDynamoDbProps extends Omit<dynamodb.TablePropsV2, "global
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // With explicit table name (overrides CDK-generated name)
+ * // With inline IndexDefinition for GSIs
  * const table = new JaypieDynamoDb(this, "MyTable", {
  *   tableName: "custom-table-name",
  *   indexes: [
- *     { pk: ["scope", "model"] },
- *     { pk: ["scope", "model", "type"], sparse: true },
+ *     { name: "indexModel", pk: ["model"], sk: ["scope", "updatedAt"] },
+ *     { name: "indexModelAlias", pk: ["model", "alias"], sk: ["scope", "updatedAt"], sparse: true },
  *   ],
  * });
  */

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');
@@ -2931,41 +2930,65 @@ class JaypieDnsRecord extends constructs.Construct {
     }
 }
 
-//
-//
-// Constants
-//
-/** Composite key separator used in GSI partition keys */
-const SEPARATOR = "#";
 //
 //
 // Helper Functions
 //
 /**
- * Convert IndexDefinition[] from @jaypie/fabric to CDK GlobalSecondaryIndexPropsV2[]
+ * Derive GSI attribute names for an index definition.
+ *
+ * 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.
  *
- * @param indexes - Array of IndexDefinition from @jaypie/fabric
- * @returns Array of CDK GlobalSecondaryIndexPropsV2
+ * - `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) => {
-        // 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;
+        const { pk, sk } = getGsiAttributeNames(index);
+        let sortKey;
+        if (sk) {
+            if (sk === "sequence") {
+                sortKey = { name: "sequence", type: dynamodb__namespace.AttributeType.NUMBER };
+            }
+            else {
+                sortKey = { name: sk, type: dynamodb__namespace.AttributeType.STRING };
+            }
+        }
         return {
-            indexName,
+            indexName: pk,
             partitionKey: {
-                name: indexName,
+                name: pk,
                 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,
-                },
+            ...(sortKey && { sortKey }),
         };
     });
 }
@@ -2977,8 +3000,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)
@@ -2989,12 +3011,12 @@ function indexesToGsi(indexes) {
  * const table = new JaypieDynamoDb(this, "myApp");
  *
  * @example
- * // With explicit table name (overrides CDK-generated name)
+ * // With inline IndexDefinition for GSIs
  * const table = new JaypieDynamoDb(this, "MyTable", {
  *   tableName: "custom-table-name",
  *   indexes: [
- *     { pk: ["scope", "model"] },
- *     { pk: ["scope", "model", "type"], sparse: true },
+ *     { name: "indexModel", pk: ["model"], sk: ["scope", "updatedAt"] },
+ *     { name: "indexModelAlias", pk: ["model", "alias"], sk: ["scope", "updatedAt"], sparse: true },
  *   ],
  * });
  */
@@ -3007,11 +3029,11 @@ class JaypieDynamoDb extends constructs.Construct {
         const constructId = isShorthand ? `JaypieDynamoDb-${id}` : id;
         super(scope, constructId);
         const { billing = dynamodb__namespace.Billing.onDemand(), indexes, partitionKey = {
-            name: "model",
+            name: "id",
             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;
+            : cdk.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__namespace.TableV2(this, "Table", {
@@ -3019,7 +3041,7 @@ class JaypieDynamoDb extends constructs.Construct {
             globalSecondaryIndexes,
             partitionKey,
             removalPolicy,
-            sortKey,
+            ...(sortKey && { sortKey }),
             ...restProps,
         });
         // Apply tags