@moicky/dynamodb 1.1.2 → 1.1.3

package/dist/operations/get.d.ts

@@ -1,4 +1,4 @@
 import { BatchGetItemCommandInput, GetItemCommandInput, ScanCommandInput } from "@aws-sdk/client-dynamodb";
 export declare function getItem(key: any, args?: Partial<GetItemCommandInput>): Promise<Record<string, any>>;
-export declare function getItems(keys: any[], args?: Partial<BatchGetItemCommandInput>, retry?: number): Promise<Record<string, any> | Record<string, any>[]>;
+export declare function getItems(keys: any[], args?: Partial<BatchGetItemCommandInput>, retry?: number): Promise<Record<string, any>[]>;
 export declare function getAllItems(args?: Partial<ScanCommandInput>): Promise<Record<string, any>[]>;

package/dist/operations/misc.js

@@ -27,8 +27,6 @@ async function getNewId({ PK, SK, length = 8, }) {
     }
     const newId = parseInt(lastId) + 1 + "";
     const withPadding = newId.padStart(length || 0, "0");
-    return SK
-        ? `${SK}${!SK.endsWith("/") ? "/" : ""}${withPadding}`
-        : withPadding;
+    return withPadding;
 }
 exports.getNewId = getNewId;

package/dist/operations/update.d.ts

@@ -1,3 +1,3 @@
 import { UpdateItemCommandInput, UpdateItemCommandOutput } from "@aws-sdk/client-dynamodb";
-export declare function updateItem(key: any, data: any, args?: Partial<UpdateItemCommandInput>): Promise<UpdateItemCommandOutput>;
+export declare function updateItem(key: any, data: any, args?: Partial<UpdateItemCommandInput>): Promise<undefined | Record<string, any>>;
 export declare function removeAttributes(key: any, attributes: string[]): Promise<UpdateItemCommandOutput>;

package/dist/operations/update.js

@@ -4,22 +4,31 @@ exports.removeAttributes = exports.updateItem = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const client_1 = require("../lib/client");
 const helpers_1 = require("../lib/helpers");
+const util_dynamodb_1 = require("@aws-sdk/util-dynamodb");
 async function updateItem(key, data, args = {}) {
     if (!Object.keys(data).includes("updatedAt")) {
         data.updatedAt = Date.now();
     }
-    const UpdateExpression = "SET " +
-        Object.keys(data)
-            .map((key) => `#${key} = :${key}`)
-            .join(", ");
-    return client_1.client.send(new client_dynamodb_1.UpdateItemCommand({
+    const valuesInCondition = (0, helpers_1.getAttributesFromExpression)(args?.ConditionExpression || "", ":");
+    const namesInCondition = (0, helpers_1.getAttributesFromExpression)(args?.ConditionExpression || "");
+    const attributesToUpdate = Object.keys(data).filter((key) => !valuesInCondition.includes(key));
+    const UpdateExpression = "SET " + attributesToUpdate.map((key) => `#${key} = :${key}`).join(", ");
+    return client_1.client
+        .send(new client_dynamodb_1.UpdateItemCommand({
         TableName: client_1.TableName,
         Key: (0, helpers_1.stripKey)(key),
         UpdateExpression,
-        ExpressionAttributeValues: (0, helpers_1.getAttributeValues)(data),
-        ExpressionAttributeNames: (0, helpers_1.getAttributeNames)(data),
+        ExpressionAttributeValues: (0, helpers_1.getAttributeValues)(data, [
+            ...attributesToUpdate,
+            ...valuesInCondition,
+        ]),
+        ExpressionAttributeNames: (0, helpers_1.getAttributeNames)(data, [
+            ...attributesToUpdate,
+            ...namesInCondition,
+        ]),
         ...args,
-    }));
+    }))
+        .then((res) => args?.ReturnValues ? (0, util_dynamodb_1.unmarshall)(res.Attributes) : undefined);
 }
 exports.updateItem = updateItem;
 async function removeAttributes(key, attributes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moicky/dynamodb",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Contains a collection of convenience functions for working with AWS DynamoDB",

package/readme.md

@@ -126,6 +126,19 @@ await updateItem(
   { description: "A book about a rich guy", author: "F. Scott Fitzgerald" }
 );
 
+await updateItem(
+  { PK: "User/1", SK: "Book/1" },
+  { released: 2000, maxReleased: 1950 }, // maxReleased will not be updated, since it is referenced inside the ConditionExpression
+  { ConditionExpression: "#released < :maxReleased" }
+);
+
+const newItem = await updateItem(
+  { PK: "User/1", SK: "Book/1" },
+  { released: 2000 },
+  { ReturnValues: "ALL_NEW" }
+);
+console.log(newItem); // { "PK": "User/1", "SK": "Book/1", "released": 2000 }
+
 await removeAttributes({ PK: "User/1", SK: "Book/1" }, ["description"]);
 ```