@lafken/dynamo 0.12.18 → 0.12.20

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

@@ -11,6 +11,7 @@ export declare class QueryBuilderBase<E extends ClassResource> {
     protected expressionGroupCounter: number;
     protected getKeyConditionExpression(expression: KeyCondition<E>, index?: LocalIndex<E> | GlobalIndexProperty): string;
     protected getFilterExpression<T>(filter: Filter<T> | OrFilter<T> | AndFilter<T>, names?: string[], union?: 'or' | 'and', counter?: number): string;
+    protected getProjectionExpression(projection?: (string | number | symbol)[] | 'ALL'): string | undefined;
     protected getAttributesAndNames(): {
         ExpressionAttributeNames: Record<string, string> | undefined;
         ExpressionAttributeValues: Record<string, import("@aws-sdk/client-dynamodb").AttributeValue> | undefined;

package/lib/service/query-builder/base/base.js

@@ -155,6 +155,18 @@ class QueryBuilderBase {
         }
         return filterExpression.join(` ${union} `);
     }
+    getProjectionExpression(projection) {
+        if (!projection || projection === 'ALL') {
+            return undefined;
+        }
+        return projection
+            .map((attribute) => {
+            const name = String(attribute);
+            this.attributeNames[`#${name}`] = name;
+            return `#${name}`;
+        })
+            .join(', ');
+    }
     getAttributesAndNames() {
         return {
             ExpressionAttributeNames: Object.keys(this.attributeNames).length > 0 ? this.attributeNames : undefined,

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

@@ -37,7 +37,7 @@ class BatchGetBuilder extends base_1.QueryBuilderBase {
     }
     prepare() {
         const { consistentRead, projection } = this.queryOptions.options ?? {};
-        const projectionExpression = projection && projection !== 'ALL' ? projection.join(', ') : undefined;
+        const projectionExpression = this.getProjectionExpression(projection);
         const chunkedKeys = this.chunkKeys(this.queryOptions.keys, 100);
         for (const keys of chunkedKeys) {
             this.commands.push({
@@ -46,6 +46,9 @@ class BatchGetBuilder extends base_1.QueryBuilderBase {
                         Keys: keys.map((key) => (0, util_dynamodb_1.marshall)(key, { removeUndefinedValues: true })),
                         ConsistentRead: consistentRead,
                         ProjectionExpression: projectionExpression,
+                        ExpressionAttributeNames: projectionExpression
+                            ? this.attributeNames
+                            : undefined,
                     },
                 },
             });

package/lib/service/query-builder/find/find.js

@@ -34,7 +34,7 @@ class FindBuilder extends base_1.QueryBuilderBase {
                 : undefined,
             Limit: limit,
             ScanIndexForward: sortDirection === 'asc',
-            ProjectionExpression: projection === 'ALL' ? undefined : projection.join(', '),
+            ProjectionExpression: this.getProjectionExpression(projection),
             ...this.getAttributesAndNames(),
         };
     }

package/lib/service/query-builder/get-item/get-item.js

@@ -32,13 +32,15 @@ class GetItemBuilder extends base_1.QueryBuilderBase {
     }
     prepare() {
         const { consistentRead, projection } = this.queryOptions.options ?? {};
+        const projectionExpression = this.getProjectionExpression(projection);
         this.command = {
             TableName: this.queryOptions.modelProps.name,
             Key: (0, util_dynamodb_1.marshall)(this.queryOptions.key, {
                 removeUndefinedValues: true,
             }),
             ConsistentRead: consistentRead,
-            ProjectionExpression: projection && projection !== 'ALL' ? projection.join(', ') : undefined,
+            ProjectionExpression: projectionExpression,
+            ExpressionAttributeNames: projectionExpression ? this.attributeNames : undefined,
         };
     }
 }

package/lib/service/query-builder/scan/scan.js

@@ -34,7 +34,7 @@ class ScanBuilder extends base_1.QueryBuilderBase {
                 ? (0, util_dynamodb_1.marshall)(cursor, { removeUndefinedValues: true })
                 : undefined,
             Limit: limit,
-            ProjectionExpression: projection === 'ALL' ? undefined : projection.join(', '),
+            ProjectionExpression: this.getProjectionExpression(projection),
             ...this.getAttributesAndNames(),
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/dynamo",
-  "version": "0.12.18",
+  "version": "0.12.20",
   "private": false,
   "description": "Define DynamoDB tables using TypeScript decorators - type-safe, declarative infrastructure with Lafken",
   "keywords": [
@@ -59,7 +59,7 @@
     "@aws-sdk/client-dynamodb": "^3.1062.0",
     "@aws-sdk/util-dynamodb": "^3.996.2",
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.12.18"
+    "@lafken/resolver": "0.12.20"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^24.4.0",
@@ -73,13 +73,13 @@
     "typescript": "6.0.3",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.8",
-    "@lafken/common": "0.12.18"
+    "@lafken/common": "0.12.20"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.12.18"
+    "@lafken/common": "0.12.20"
   },
   "engines": {
     "node": ">=20.19"