@lafken/dynamo 0.12.29 → 0.13.0

package/lib/resolver/table/internal/internal.d.ts

@@ -12,6 +12,7 @@ export declare class InternalTable extends InternalTable_base {
     constructor(scope: Construct, props: InternalTableProps);
     private static getAttributes;
     private static getBillingModeProps;
+    private static toKeys;
     private static getIndexes;
     private createFilterCriteria;
     private getKeyFilterCriteria;

package/lib/resolver/table/internal/internal.js

@@ -13,7 +13,7 @@ const mapFieldType = {
 class InternalTable extends resolver_1.lafkenResource.make(dynamodb_table_1.DynamodbTable) {
     constructor(scope, props) {
         const { modelProps, partitionKey: partitionKeyName, sortKey: sortKeyName, fields, } = (0, service_1.getModelInformation)(props.classResource);
-        const { globalIndexes, localIndexes, indexAttributes } = InternalTable.getIndexes(scope, modelProps.indexes, sortKeyName);
+        const { globalIndexes, localIndexes, indexAttributes } = InternalTable.getIndexes(modelProps.indexes, sortKeyName);
         const availableAttributes = new Set([...(indexAttributes || new Set())]);
         availableAttributes.add(partitionKeyName.toString());
         if (sortKeyName) {
@@ -124,7 +124,10 @@ class InternalTable extends resolver_1.lafkenResource.make(dynamodb_table_1.Dyna
             };
         }
     }
-    static getIndexes(scope, indexes = [], sortKeyName) {
+    static toKeys(key) {
+        return Array.isArray(key) ? key.map((k) => k.toString()) : [key.toString()];
+    }
+    static getIndexes(indexes = [], sortKeyName) {
         if (indexes.length === 0) {
             return {};
         }
@@ -150,14 +153,39 @@ class InternalTable extends resolver_1.lafkenResource.make(dynamodb_table_1.Dyna
                 });
                 continue;
             }
-            indexAttributes.add(index.partitionKey.toString());
-            if (index.sortKey) {
-                indexAttributes.add(index.sortKey.toString());
+            const partitionKeys = InternalTable.toKeys(index.partitionKey);
+            const sortKeys = index.sortKey ? InternalTable.toKeys(index.sortKey) : [];
+            for (const attribute of [...partitionKeys, ...sortKeys]) {
+                indexAttributes.add(attribute);
+            }
+            const isMultiAttribute = partitionKeys.length > 1 || sortKeys.length > 1;
+            if (isMultiAttribute) {
+                if (partitionKeys.length > 4 || sortKeys.length > 4) {
+                    throw new Error(`A multi-attribute index supports up to 4 partition and 4 sort attributes. Check the index "${index.name}".`);
+                }
+                globalIndexes.push({
+                    name: index.name,
+                    keySchema: [
+                        ...partitionKeys.map((attributeName) => ({
+                            attributeName,
+                            keyType: 'HASH',
+                        })),
+                        ...sortKeys.map((attributeName) => ({
+                            attributeName,
+                            keyType: 'RANGE',
+                        })),
+                    ],
+                    projectionType,
+                    nonKeyAttributes,
+                    readCapacity: index.readCapacity,
+                    writeCapacity: index.writeCapacity,
+                });
+                continue;
             }
             globalIndexes.push({
                 name: index.name,
-                hashKey: index.partitionKey.toString(),
-                rangeKey: index.sortKey ? index.sortKey.toString() : undefined,
+                hashKey: partitionKeys[0],
+                rangeKey: sortKeys[0],
                 projectionType,
                 nonKeyAttributes,
                 readCapacity: index.readCapacity,

package/lib/service/query-builder/base/base.utils.d.ts

@@ -18,5 +18,5 @@ export declare const filterResolver: {
     in: (key: string, valueName: any, values: any[]) => ExpressionResolverResult;
     notContains(key: string, valueName: string, value: any): ExpressionResolverResult;
 };
-export declare const notValueKeys: Set<"lessThan" | "lessOrEqualThan" | "greaterThan" | "greaterOrEqualThan" | "between" | "exist" | "notExist" | "contains" | "notContains" | "notEqual" | "in" | "beginsWith" | "equal">;
+export declare const notValueKeys: Set<"beginsWith" | "between" | "contains" | "equal" | "exist" | "greaterOrEqualThan" | "greaterThan" | "in" | "lessOrEqualThan" | "lessThan" | "notContains" | "notEqual" | "notExist">;
 export declare const filterKeys: Set<string>;

package/lib/service/query-builder/batch-write/batch-write.js

@@ -14,6 +14,7 @@ class BatchWriteBuilder extends base_1.QueryBuilderBase {
     getCommand() {
         return this.commands;
     }
+    // biome-ignore lint/suspicious/noConfusingVoidType: exec() resolves to void[] from Promise.all of void-returning commands
     then(resolve, reject) {
         return this.exec().then(resolve, reject);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/dynamo",
-  "version": "0.12.29",
+  "version": "0.13.0",
   "private": false,
   "description": "Define DynamoDB tables using TypeScript decorators - type-safe, declarative infrastructure with Lafken",
   "keywords": [
@@ -56,30 +56,30 @@
     "lib"
   ],
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.1062.0",
-    "@aws-sdk/util-dynamodb": "^3.996.2",
+    "@aws-sdk/client-dynamodb": "^3.1090.0",
+    "@aws-sdk/util-dynamodb": "^3.996.7",
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.12.29"
+    "@lafken/resolver": "0.13.0"
   },
   "devDependencies": {
-    "@cdktn/provider-aws": "^24.4.0",
-    "@swc/core": "^1.15.40",
+    "@cdktn/provider-aws": "^24.11.0",
+    "@swc/core": "^1.15.43",
     "@swc/helpers": "^0.5.23",
-    "@vitest/runner": "^4.1.8",
+    "@vitest/runner": "^4.1.10",
     "aws-sdk-client-mock": "^4.1.0",
-    "cdktn": "^0.23.2",
+    "cdktn": "^0.23.4",
     "cdktn-vitest": "^1.0.0",
-    "constructs": "^10.6.0",
-    "typescript": "6.0.3",
+    "constructs": "^10.7.0",
+    "typescript": "7.0.2",
     "unplugin-swc": "^1.5.9",
-    "vitest": "^4.1.8",
-    "@lafken/common": "0.12.29"
+    "vitest": "^4.1.10",
+    "@lafken/common": "0.13.0"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.12.29"
+    "@lafken/common": "0.13.0"
   },
   "engines": {
     "node": ">=20.19"