@lafken/dynamo 0.11.6 → 0.11.8

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

@@ -8,6 +8,7 @@ export declare class QueryBuilderBase<E extends ClassResource> {
     constructor(options: QueryBuilderProps<E>);
     protected attributeNames: Record<string, string>;
     protected attributeValues: Record<string, any>;
+    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 getAttributesAndNames(): {

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

@@ -11,6 +11,7 @@ class QueryBuilderBase {
     }
     attributeNames = {};
     attributeValues = {};
+    expressionGroupCounter = 0;
     getKeyConditionExpression(expression, index) {
         const { partition, sort } = expression;
         const isGlobalIndex = index?.type === 'global';

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

@@ -35,16 +35,21 @@ class UpdateBuilder extends base_1.QueryBuilderBase {
             Object.keys(setValues).length > 0) {
             throw new Error('You must assign a value to update');
         }
-        let setExpression = this.setValues(setValues, true);
+        let setExpression = '';
+        if (Object.keys(setValues).length > 0) {
+            setExpression = this.setValues(setValues, true, [], this.expressionGroupCounter++);
+        }
         if (Object.keys(replaceValues).length > 0) {
-            setExpression += ` ${this.setValues(replaceValues, false)}`;
+            setExpression += ` ${this.setValues(replaceValues, false, [], this.expressionGroupCounter++)}`;
         }
         const removeExpression = this.removeValues(removeValues);
         const keyCondition = this.queryOptions.inputProps.keyCondition;
         this.command = {
             TableName: this.queryOptions.modelProps.name,
             Key: (0, util_dynamodb_1.marshall)(keyCondition),
-            ConditionExpression: condition ? this.getFilterExpression(condition) : undefined,
+            ConditionExpression: condition
+                ? this.getFilterExpression(condition, [], 'and', this.expressionGroupCounter++)
+                : undefined,
             UpdateExpression: `${setExpression ? `SET ${setExpression}` : ''} ${removeExpression ? `REMOVE ${removeExpression}` : ''}`.trim(),
             ...this.getAttributesAndNames(),
             ReturnValues: this.queryOptions.inputProps.returnValue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/dynamo",
-  "version": "0.11.6",
+  "version": "0.11.8",
   "private": false,
   "description": "Define DynamoDB tables using TypeScript decorators - type-safe, declarative infrastructure with Lafken",
   "keywords": [
@@ -60,7 +60,7 @@
     "@aws-sdk/util-dynamodb": "^3.996.2",
     "aws-xray-sdk": "^3.12.0",
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.11.6"
+    "@lafken/resolver": "0.11.8"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^23.5.0",
@@ -75,13 +75,13 @@
     "typescript": "6.0.2",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.2",
-    "@lafken/common": "0.11.6"
+    "@lafken/common": "0.11.8"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.11.6"
+    "@lafken/common": "0.11.8"
   },
   "engines": {
     "node": ">=20.19"