@moicky/dynamodb 1.1.1 → 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.1",
+  "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

@@ -1,7 +1,5 @@
 # @moicky/dynamodb
 
-## Stats
-
 ![](https://img.shields.io/github/languages/top/moicky/dynamodb)
 ![](https://img.shields.io/github/actions/workflow/status/moicky/dynamodb/npm-publish.yml?label=build)
 ![](https://img.shields.io/github/actions/workflow/status/moicky/dynamodb/run-tests.yml?label=tests)
@@ -14,6 +12,7 @@ Contains convenience functions for all major dynamodb operations. Requires very
 
 - 🎁 Will **automatically marshall and unmarshall** items
 - 📦 Will **group items into batches** to avoid aws limits and improve performance
+- ⏱ Will **automatically** add `createdAt` and `updatedAt` attributes on all items to track their most recent create/update operation timestamp. Example value: `Date.now() -> 1685138436000`
 - 🔄 Will **retry** some operations (getItems, deleteItems) **up to 3 times** on unprocessed items
 - 🔒 When specifying an item using its keySchema, all additional attributes (apart from **PK** and **SK**) will be removed to avoid errors
 - 👻 Will **use placeholders** to avoid colliding with [reserved words](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ReservedWords.html) if applicable
@@ -98,28 +97,20 @@ await getAllItems();
 ```ts
 import { deleteItem, deleteItems } from "@moicky/dynamodb";
 
-// Passing more than just the key is possible, but will be removed to avoid errors
-
 // Delete single item
 await deleteItem({
   PK: "User/1",
   SK: "Book/1",
-  title: "The Great Gatsby", // additional fields will be removed before sending
+  title: "The Great Gatsby", // additional fields will be removed before sending to avoid errors
   author: "F. Scott Fitzgerald",
   released: 1925,
 });
 
 // Delete multiple items
-// Keys will be grouped into batches of 25 and will be retried up to 3 times if there are unprocessed items
-// Will also only delete each keySchema once, even if it is present multiple times in the array to improve performance
+// KeySchemas will be grouped into batches of 25 and will be retried up to 3 times if there are unprocessed items
+// Will only delete each keySchema only once, even if it is present multiple times in the array to improve performance
 await deleteItems([
-  {
-    PK: "User/1",
-    SK: "Book/1",
-    title: "The Great Gatsby", // additional fields will be removed before sending
-    author: "F. Scott Fitzgerald",
-    released: 1925,
-  },
+  { PK: "User/1", SK: "Book/1" },
   // ... infinite more items (will be grouped into batches of 25 due to aws limit) and retried up to 3 times
 ]);
 ```
@@ -129,27 +120,26 @@ await deleteItems([
 ```ts
 import { updateItem, removeAttributes } from "@moicky/dynamodb";
 
-// Passing more than just the key is possible, but will be removed to avoid errors
-
 // Update the item and overwrite all supplied fields
 await updateItem(
-  {
-    PK: "User/1",
-    SK: "Book/1",
-    title: "The Great Gatsby", // additional fields will be removed before sending
-  },
+  { PK: "User/1", SK: "Book/1" },
   { description: "A book about a rich guy", author: "F. Scott Fitzgerald" }
 );
 
-// Completely remove fields from the item
-await removeAttributes(
-  {
-    PK: "User/1",
-    SK: "Book/1",
-    title: "The Great Gatsby", // additional fields will be removed before sending
-  },
-  ["description"]
+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"]);
 ```
 
 ### Query Items
@@ -157,7 +147,7 @@ await removeAttributes(
 ```ts
 import { query, queryItems, queryAllItems } from "@moicky/dynamodb";
 
-// You have to use placeholders for the keyCondition & filterExpression:
+// You HAVE TO use placeholders for the keyCondition & filterExpression:
 // prefix the attributeNames with a hash (#) and the attributeValues with a colon (:)
 
 // Query only using keyCondition and retrieve complete response
@@ -189,7 +179,7 @@ const booksWithFilter = await queryAllItems(
     to: 2000,
   },
   // additional args with filterExpression
-  { FilterExpression: "#released BETWEEN :from AND :to" }
+  { FilterExpression: "#released BETWEEN :from AND :to" } // allows to override all args
 );
 ```
 
@@ -202,15 +192,14 @@ import { itemExists, getNewId } from "@moicky/dynamodb";
 const exists = await itemExists({ PK: "User/1", SK: "Book/1" });
 
 // Generate ascending ID
+
 // Example Structure 1: PK: "User/1", SK: "{{ ASCENDING_ID }}"
 // Last item: { PK: "User/1", SK: "00000009" }
-
 const id1 = await getNewId({ PK: "User/1" });
 console.log(id1); // "00000010"
 
 // Example Structure 2: PK: "User/1", SK: "Book/{{ ASCENDING_ID }}"
 // Last item: { PK: "User/1", SK: "Book/00000009" }
-
 const id2 = await getNewId({ PK: "User/1", SK: "Book" });
 console.log(id2); // "00000010"