quidproquo-actionprocessor-awslambda 0.0.103 → 0.0.104

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreDeleteActionProcessor.js

@@ -14,10 +14,10 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreDelete = (qpqConfig) => {
-    return ({ keyValueStoreName, key }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, key, sortKey }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
-        yield (0, dynamo_1.deleteItem)(dynamoTableName, key, region);
+        yield (0, dynamo_1.deleteItem)(dynamoTableName, region, key, sortKey);
         return (0, quidproquo_core_2.actionResult)(void 0);
     });
 };

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreQueryActionProcessor.js

@@ -13,7 +13,7 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
-const thing_1 = require("../../../logic/dynamo/qpqDynamoOrm/thing");
+const qpqDynamoOrm_1 = require("../../../logic/dynamo/qpqDynamoOrm");
 const getProcessKeyValueStoreQuery = (qpqConfig) => {
     return ({ keyValueStoreName, keyCondition, filterCondition }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
@@ -22,7 +22,7 @@ const getProcessKeyValueStoreQuery = (qpqConfig) => {
         if (!storeConfig) {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Could not find key value store with name "${keyValueStoreName}"`);
         }
-        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, filterCondition, (0, thing_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
+        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, filterCondition, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
         return (0, quidproquo_core_2.actionResult)(items);
     });
 };

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreUpdateActionProcessor.js

@@ -14,12 +14,10 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreUpdate = (qpqConfig) => {
-    return ({ keyValueStoreName, key, value, options }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, key, sortKey, updates, options }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
-        yield (0, dynamo_1.updateItem)(dynamoTableName, key, value, {
-            expires: options === null || options === void 0 ? void 0 : options.ttl,
-        }, region);
+        yield (0, dynamo_1.updateItem)(dynamoTableName, region, updates, key, sortKey);
         return (0, quidproquo_core_2.actionResult)(void 0);
     });
 };

package/lib/index.d.ts

@@ -4,3 +4,5 @@ export * as awsNamingUtils from './awsNamingUtils';
 export * from './runtimeConfig/QPQAWSResourceMap';
 export * from './types';
 export * from './logic/parametersManager/getParameter';
+export * from './logic/parametersManager/getParameters';
+export * from './logic/cache/memoFunc';

package/lib/index.js

@@ -33,3 +33,5 @@ exports.awsNamingUtils = __importStar(require("./awsNamingUtils"));
 __exportStar(require("./runtimeConfig/QPQAWSResourceMap"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./logic/parametersManager/getParameter"), exports);
+__exportStar(require("./logic/parametersManager/getParameters"), exports);
+__exportStar(require("./logic/cache/memoFunc"), exports);

package/lib/logic/dynamo/convertObjectToDynamoMap.d.ts

@@ -1,2 +1 @@
-export declare function convertObjectToDynamoMap(obj: any): any;
 export declare function convertDynamoMapToObject(dynamoMap: any): any;

package/lib/logic/dynamo/convertObjectToDynamoMap.js

@@ -1,41 +1,39 @@
 "use strict";
+// Deprecated: 2021-06-01
+// export function convertObjectToDynamoMap(obj: any) {
+//   const map: any = {};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertDynamoMapToObject = exports.convertObjectToDynamoMap = void 0;
-function convertObjectToDynamoMap(obj) {
-    const map = {};
-    for (const property in obj) {
-        const value = obj[property];
-        const valueType = typeof value;
-        switch (valueType) {
-            case 'string':
-                map[property] = { S: value };
-                break;
-            case 'number':
-                map[property] = { N: value.toString() };
-                break;
-            case 'boolean':
-                map[property] = { BOOL: value };
-                break;
-            case 'object':
-                if (Array.isArray(value)) {
-                    map[property] = {
-                        L: value.map((item) => convertObjectToDynamoMap({ temp: item }).temp),
-                    };
-                }
-                else if (value !== null) {
-                    map[property] = { M: convertObjectToDynamoMap(value) };
-                }
-                else {
-                    map[property] = { NULL: true };
-                }
-                break;
-            default:
-                throw new Error(`Unsupported data type: ${valueType}`);
-        }
-    }
-    return map;
-}
-exports.convertObjectToDynamoMap = convertObjectToDynamoMap;
+exports.convertDynamoMapToObject = void 0;
+//   for (const property in obj) {
+//     const value = obj[property];
+//     const valueType = typeof value;
+//     switch (valueType) {
+//       case 'string':
+//         map[property] = { S: value };
+//         break;
+//       case 'number':
+//         map[property] = { N: value.toString() };
+//         break;
+//       case 'boolean':
+//         map[property] = { BOOL: value };
+//         break;
+//       case 'object':
+//         if (Array.isArray(value)) {
+//           map[property] = {
+//             L: value.map((item) => convertObjectToDynamoMap({ temp: item }).temp),
+//           };
+//         } else if (value !== null) {
+//           map[property] = { M: convertObjectToDynamoMap(value) };
+//         } else {
+//           map[property] = { NULL: true };
+//         }
+//         break;
+//       default:
+//         throw new Error(`Unsupported data type: ${valueType}`);
+//     }
+//   }
+//   return map;
+// }
 function convertDynamoMapToObject(dynamoMap) {
     const obj = {};
     for (const property in dynamoMap) {

package/lib/logic/dynamo/deleteItem.d.ts

@@ -1 +1,2 @@
-export declare function deleteItem(tableName: string, key: string, region: string): Promise<void>;
+import { KvsCoreDataType } from 'quidproquo-core';
+export declare function deleteItem(tableName: string, region: string, key: KvsCoreDataType, sortKey?: KvsCoreDataType): Promise<void>;

package/lib/logic/dynamo/deleteItem.js

@@ -11,17 +11,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteItem = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
-function deleteItem(tableName, key, region) {
+const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
+function deleteItem(tableName, region, key, sortKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const dynamoClient = new client_dynamodb_1.DynamoDBClient({ region });
         const deleteItemParams = {
             TableName: tableName,
             Key: {
-                key: {
-                    S: key,
-                },
+                key: (0, qpqDynamoOrm_1.buildAttributeValue)(key),
             },
         };
+        if (sortKey != undefined) {
+            deleteItemParams.Key.sortKey = (0, qpqDynamoOrm_1.buildAttributeValue)(sortKey);
+        }
         yield dynamoClient.send(new client_dynamodb_1.DeleteItemCommand(deleteItemParams));
     });
 }

package/lib/logic/dynamo/putItem.d.ts

@@ -2,11 +2,4 @@ import { KvsKey } from 'quidproquo-core';
 export interface PutItemOptions {
     expires?: number;
 }
-export type KvsKeyValue<T> = {
-    key: KvsKey;
-    value: T;
-};
-export type DynamoAttributeType = 'S' | 'N' | 'B';
-export declare const readKvsAttributeValue: <T, K extends keyof T>(item: T, key: KvsKey) => KvsKeyValue<T[K]>;
-export declare const getDynamoValueTypeFromKvsKey: (key: KvsKey) => DynamoAttributeType;
 export declare function putItem<Item>(tableName: string, item: Item, attributes: KvsKey[], options: PutItemOptions, region: string): Promise<void>;

package/lib/logic/dynamo/putItem.js

@@ -9,46 +9,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.putItem = exports.getDynamoValueTypeFromKvsKey = exports.readKvsAttributeValue = void 0;
+exports.putItem = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
-const lodash_1 = require("lodash");
-const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
-const readKvsAttributeValue = (item, key) => {
-    const value = (0, lodash_1.get)(item, key.key);
-    return {
-        key,
-        value,
-    };
+const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
+// We currently only support objects as root items in dynamo
+// Storing a list (array) as the root of your DynamoDB record is indeed possible,
+// but there are some caveats. One of the main challenges is that DynamoDB doesn't support
+// complex operations on list items. For instance, you can't perform a conditional update or
+// delete on a specific item in the list based on its value. However, you can read and write
+// entire lists, and you can append items to a list with an update operation.
+//
+// TODO?: support lists as root items in dynamo ~ Probably not worth it
+// a root list probably should be a table!
+// Something like this:
+// const convertObjectOrListToDynamoMap = (value: KvsObjectDataType | KvsListDataType): AttributeValue => {
+//   const attributeValue = buildAttributeValue(value);
+//   if ('M' in attributeValue) {
+//     return attributeValue.M!;
+//   }
+//   if ('L' in attributeValue) {
+//     return attributeValue.L!;
+//   }
+//   throw new Error("Value must be an object or a list");
+// }
+const convertObjectToDynamoItem = (obj) => {
+    return (0, qpqDynamoOrm_1.buildAttributeValue)(obj).M;
 };
-exports.readKvsAttributeValue = readKvsAttributeValue;
-const getDynamoValueTypeFromKvsKey = (key) => {
-    switch (key.type) {
-        case 'string':
-            return 'S';
-        case 'number':
-            return 'N';
-        case 'binary':
-            return 'B';
-    }
-};
-exports.getDynamoValueTypeFromKvsKey = getDynamoValueTypeFromKvsKey;
 function putItem(tableName, item, attributes, options, region) {
     return __awaiter(this, void 0, void 0, function* () {
         const dynamoClient = new client_dynamodb_1.DynamoDBClient({ region });
-        // Read all the values from the item
-        const dynamoProps = attributes
-            .filter((a, index, self) => index === self.findIndex((t) => t.key === a.key))
-            .reduce((acc, attribute) => {
-            const { key, value } = (0, exports.readKvsAttributeValue)(item, attribute);
-            const attributeValue = {
-                [(0, exports.getDynamoValueTypeFromKvsKey)(key)]: value,
-            };
-            acc[key.key] = attributeValue;
-            return acc;
-        }, {});
         yield dynamoClient.send(new client_dynamodb_1.PutItemCommand({
             TableName: tableName,
-            Item: (0, convertObjectToDynamoMap_1.convertObjectToDynamoMap)(item),
+            Item: convertObjectToDynamoItem(item),
         }));
     });
 }

package/lib/logic/dynamo/qpqDynamoOrm/buildDynamoQuery.d.ts

@@ -1,7 +1,10 @@
-import { KvsQueryOperation, KvsQueryCondition, KvsLogicalOperator } from 'quidproquo-core';
+import { KvsQueryOperation, KvsQueryCondition, KvsLogicalOperator, KvsAdvancedDataType } from 'quidproquo-core';
 import { AttributeValue } from '@aws-sdk/client-dynamodb';
+export declare const getItemName: (name: string) => string;
+export declare const getValueName: (value: KvsAdvancedDataType) => string;
 export declare const isKvsQueryCondition: (query: KvsQueryOperation) => query is KvsQueryCondition;
 export declare const isKvsLogicalOperator: (query: KvsQueryOperation) => query is KvsLogicalOperator;
+export declare const buildAttributeValue: (value: KvsAdvancedDataType) => AttributeValue;
 export declare const buildDynamoQueryExpression: (query?: KvsQueryOperation) => string | undefined;
 export declare const buildExpressionAttributeValues: (queries: (KvsQueryOperation | undefined)[]) => Record<string, AttributeValue>;
 export declare const buildExpressionAttributeNames: (queries: (KvsQueryOperation | undefined)[]) => Record<string, string>;

package/lib/logic/dynamo/qpqDynamoOrm/buildDynamoQuery.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildExpressionAttributeNames = exports.buildExpressionAttributeValues = exports.buildDynamoQueryExpression = exports.isKvsLogicalOperator = exports.isKvsQueryCondition = void 0;
+exports.buildExpressionAttributeNames = exports.buildExpressionAttributeValues = exports.buildDynamoQueryExpression = exports.buildAttributeValue = exports.isKvsLogicalOperator = exports.isKvsQueryCondition = exports.getValueName = exports.getItemName = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const quidproquo_core_1 = require("quidproquo-core");
 // TODO: Come up with a better way of generating item name / values
@@ -15,52 +15,54 @@ const getHash = (name) => {
 const getItemName = (name) => {
     return `#${getHash(name)}`;
 };
+exports.getItemName = getItemName;
 const getValueName = (value) => {
     return `:${getHash(`${typeof value}-${JSON.stringify(value)}`)}`;
 };
+exports.getValueName = getValueName;
 const buildDynamoQueryExpressionBetween = (query) => {
     if (!query.key || !query.valueB || !query.valueB) {
         throw new Error(`Invalid query condition ${quidproquo_core_1.KvsQueryOperationType.Between}`);
     }
-    return `${getItemName(query.key)} BETWEEN ${getValueName(query.valueA)} AND ${getValueName(query.valueB)}`;
+    return `${(0, exports.getItemName)(query.key)} BETWEEN ${(0, exports.getValueName)(query.valueA)} AND ${(0, exports.getValueName)(query.valueB)}`;
 };
 const buildDynamoQueryExpressionEqual = (query) => {
-    return `${getItemName(query.key)} = ${getValueName(query.valueA)}`;
+    return `${(0, exports.getItemName)(query.key)} = ${(0, exports.getValueName)(query.valueA)}`;
 };
 const buildDynamoQueryExpressionNotEqual = (query) => {
-    return `${getItemName(query.key)} <> ${getValueName(query.valueA)}`;
+    return `${(0, exports.getItemName)(query.key)} <> ${(0, exports.getValueName)(query.valueA)}`;
 };
 const buildDynamoQueryExpressionLessThan = (query) => {
-    return `${getItemName(query.key)} < ${getValueName(query.valueA)}`;
+    return `${(0, exports.getItemName)(query.key)} < ${(0, exports.getValueName)(query.valueA)}`;
 };
 const buildDynamoQueryExpressionLessThanOrEqual = (query) => {
-    return `${getItemName(query.key)} <= ${getValueName(query.valueA)}`;
+    return `${(0, exports.getItemName)(query.key)} <= ${(0, exports.getValueName)(query.valueA)}`;
 };
 const buildDynamoQueryExpressionGreaterThan = (query) => {
-    return `${getItemName(query.key)} > ${getValueName(query.valueA)}`;
+    return `${(0, exports.getItemName)(query.key)} > ${(0, exports.getValueName)(query.valueA)}`;
 };
 const buildDynamoQueryExpressionGreaterThanOrEqual = (query) => {
-    return `${getItemName(query.key)} >= ${getValueName(query.valueA)}`;
+    return `${(0, exports.getItemName)(query.key)} >= ${(0, exports.getValueName)(query.valueA)}`;
 };
 const buildDynamoQueryExpressionIn = (query) => {
-    return `${getItemName(query.key)} IN (${query.valueA
-        .map((v) => getValueName(v))
+    return `${(0, exports.getItemName)(query.key)} IN (${query.valueA
+        .map((v) => (0, exports.getValueName)(v))
         .join(', ')})`;
 };
 const buildDynamoQueryExpressionExists = (query) => {
-    return `attribute_exists(${getItemName(query.key)})`;
+    return `attribute_exists(${(0, exports.getItemName)(query.key)})`;
 };
 const buildDynamoQueryExpressionNotExists = (query) => {
-    return `attribute_not_exists(${getItemName(query.key)})`;
+    return `attribute_not_exists(${(0, exports.getItemName)(query.key)})`;
 };
 const buildDynamoQueryExpressionBeginsWith = (query) => {
-    return `begins_with(${getItemName(query.key)}, ${getValueName(query.valueA)})`;
+    return `begins_with(${(0, exports.getItemName)(query.key)}, ${(0, exports.getValueName)(query.valueA)})`;
 };
 const buildDynamoQueryExpressionContains = (query) => {
-    return `contains(${getItemName(query.key)}, ${getValueName(query.valueA)})`;
+    return `contains(${(0, exports.getItemName)(query.key)}, ${(0, exports.getValueName)(query.valueA)})`;
 };
 const buildDynamoQueryExpressionNotContains = (query) => {
-    return `NOT contains(${getItemName(query.key)}, ${getValueName(query.valueA)})`;
+    return `NOT contains(${(0, exports.getItemName)(query.key)}, ${(0, exports.getValueName)(query.valueA)})`;
 };
 const buildDynamoQueryExpressionOr = (query) => {
     return query.conditions.map((c) => `(${buildDynamoQueryExpressionRoot(c)})`).join(' OR ');
@@ -118,7 +120,8 @@ const buildDynamoQueryExpressionRoot = (query) => {
     throw new Error(`Invalid query operation: ${JSON.stringify(query)}`);
 };
 const buildAttributeValue = (value) => {
-    switch (typeof value) {
+    const valueType = typeof value;
+    switch (valueType) {
         case 'string':
             return { S: value };
         case 'number':
@@ -127,17 +130,23 @@ const buildAttributeValue = (value) => {
             return { BOOL: value };
         case 'object':
             if (Array.isArray(value)) {
-                // check if all elements in the array are strings
-                if (value.every((item) => typeof item === 'string')) {
-                    return { L: value.map((item) => ({ S: item })) };
-                }
-                throw new Error(`Invalid attribute value array content: ${JSON.stringify(value)}`);
+                return {
+                    L: value.map((item) => (0, exports.buildAttributeValue)(item)),
+                };
+            }
+            else if (value !== null) {
+                return {
+                    M: Object.fromEntries(Object.entries(value).map(([k, v]) => [k, (0, exports.buildAttributeValue)(v)])),
+                };
+            }
+            else {
+                return { NULL: true };
             }
-            throw new Error(`Invalid attribute value type: ${typeof value}`);
         default:
-            throw new Error(`Invalid attribute value type: ${typeof value}`);
+            throw new Error(`Unsupported data type: ${valueType}`);
     }
 };
+exports.buildAttributeValue = buildAttributeValue;
 const buildDynamoQueryExpression = (query) => {
     if (!query) {
         return undefined;
@@ -150,12 +159,12 @@ const buildExpressionAttributeValues = (queries) => {
     const traverse = (query) => {
         if ((0, exports.isKvsQueryCondition)(query)) {
             if (query.valueA !== undefined) {
-                const valueNameA = getValueName(query.valueA);
-                values[valueNameA] = buildAttributeValue(query.valueA);
+                const valueNameA = (0, exports.getValueName)(query.valueA);
+                values[valueNameA] = (0, exports.buildAttributeValue)(query.valueA);
             }
             if (query.valueB !== undefined) {
-                const valueNameB = getValueName(query.valueB);
-                values[valueNameB] = buildAttributeValue(query.valueB);
+                const valueNameB = (0, exports.getValueName)(query.valueB);
+                values[valueNameB] = (0, exports.buildAttributeValue)(query.valueB);
             }
         }
         else if ((0, exports.isKvsLogicalOperator)(query)) {
@@ -172,7 +181,7 @@ const buildExpressionAttributeNames = (queries) => {
     const names = {};
     const traverse = (query) => {
         if ((0, exports.isKvsQueryCondition)(query)) {
-            const itemName = getItemName(query.key);
+            const itemName = (0, exports.getItemName)(query.key);
             names[itemName] = query.key;
         }
         else if ((0, exports.isKvsLogicalOperator)(query)) {

package/lib/logic/dynamo/qpqDynamoOrm/buildDynamoUpdate.d.ts

@@ -0,0 +1,11 @@
+import { AttributeValue } from '@aws-sdk/client-dynamodb';
+import { KvsUpdate } from 'quidproquo-core';
+interface ExpressionAttributeNameMap {
+    [key: string]: string;
+}
+export declare const buildUpdateExpressionAttributeNames: (updates: KvsUpdate) => ExpressionAttributeNameMap;
+export declare const buildUpdateExpressionAttributeValues: (updates: KvsUpdate) => {
+    [key: string]: AttributeValue;
+} | undefined;
+export declare const buildDynamoUpdateExpression: (updates: KvsUpdate) => string;
+export {};

package/lib/logic/dynamo/qpqDynamoOrm/buildDynamoUpdate.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildDynamoUpdateExpression = exports.buildUpdateExpressionAttributeValues = exports.buildUpdateExpressionAttributeNames = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
+const buildDynamoQuery_1 = require("./buildDynamoQuery");
+const buildUpdateExpressionAttributeNames = (updates) => {
+    let attributeNames = {};
+    for (let update of updates) {
+        if (Array.isArray(update.attributePath)) {
+            // Handle nested attributes
+            for (let i = 0; i < update.attributePath.length; i++) {
+                let attribute = update.attributePath[i];
+                if (typeof attribute === 'string') {
+                    const itemName = (0, buildDynamoQuery_1.getItemName)(attribute);
+                    attributeNames[itemName] = attribute;
+                    // Replace attribute name in path with safe name
+                    update.attributePath[i] = itemName;
+                }
+            }
+        }
+        else {
+            // Handle top-level attributes
+            const itemName = (0, buildDynamoQuery_1.getItemName)(update.attributePath);
+            attributeNames[itemName] = update.attributePath;
+            update.attributePath = itemName;
+        }
+    }
+    return attributeNames;
+};
+exports.buildUpdateExpressionAttributeNames = buildUpdateExpressionAttributeNames;
+const buildUpdateExpressionAttributeValues = (updates) => {
+    let attributeValues = {};
+    for (let update of updates) {
+        if (update.value !== undefined) {
+            const valuePlaceholder = (0, buildDynamoQuery_1.getValueName)(update.value);
+            attributeValues[valuePlaceholder] = (0, buildDynamoQuery_1.buildAttributeValue)(update.value);
+        }
+    }
+    return Object.keys(attributeValues).length > 0 ? attributeValues : undefined;
+};
+exports.buildUpdateExpressionAttributeValues = buildUpdateExpressionAttributeValues;
+const buildDynamoUpdateExpressionSet = (update) => {
+    if (!update.value) {
+        throw new Error("Value must be provided for 'SET' action");
+    }
+    return `SET ${getNestedItemName(update.attributePath)} = ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
+};
+const buildDynamoUpdateExpressionRemove = (update) => {
+    return `REMOVE ${getNestedItemName(update.attributePath)}`;
+};
+const buildDynamoUpdateExpressionAdd = (update) => {
+    if (!update.value) {
+        throw new Error("Value must be provided for 'ADD' action");
+    }
+    return `ADD ${getNestedItemName(update.attributePath)} ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
+};
+const buildDynamoUpdateExpressionDelete = (update) => {
+    if (update.value) {
+        return `DELETE ${getNestedItemName(update.attributePath)} ${(0, buildDynamoQuery_1.getValueName)(update.value)}`;
+    }
+    else {
+        return `DELETE ${getNestedItemName(update.attributePath)}`;
+    }
+};
+const getNestedItemName = (attributePath) => {
+    if (Array.isArray(attributePath)) {
+        let path = '';
+        for (let i = 0; i < attributePath.length; i++) {
+            if (typeof attributePath[i] === 'string') {
+                path += `.${(0, buildDynamoQuery_1.getItemName)(attributePath[i])}`;
+            }
+            else {
+                path += `[${attributePath[i]}]`;
+            }
+        }
+        return path.substring(1); // remove the leading dot
+    }
+    else {
+        return (0, buildDynamoQuery_1.getItemName)(attributePath);
+    }
+};
+const buildDynamoUpdateExpressionRoot = (update) => {
+    switch (update.action) {
+        case quidproquo_core_1.KvsUpdateActionType.Set:
+            return buildDynamoUpdateExpressionSet(update);
+        case quidproquo_core_1.KvsUpdateActionType.Remove:
+            return buildDynamoUpdateExpressionRemove(update);
+        case quidproquo_core_1.KvsUpdateActionType.Add:
+            return buildDynamoUpdateExpressionAdd(update);
+        case quidproquo_core_1.KvsUpdateActionType.Delete:
+            return buildDynamoUpdateExpressionDelete(update);
+        default:
+            throw new Error(`Invalid update action type: ${update.action}`);
+    }
+};
+const buildDynamoUpdateExpression = (updates) => {
+    return updates.map((update) => buildDynamoUpdateExpressionRoot(update)).join(', ');
+};
+exports.buildDynamoUpdateExpression = buildDynamoUpdateExpression;

package/lib/logic/dynamo/qpqDynamoOrm/index.d.ts

@@ -1 +1,3 @@
 export * from './buildDynamoQuery';
+export * from './buildDynamoUpdate';
+export * from './getDynamoTableIndexByConfigAndQuery';

package/lib/logic/dynamo/qpqDynamoOrm/index.js

@@ -15,3 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./buildDynamoQuery"), exports);
+__exportStar(require("./buildDynamoUpdate"), exports);
+__exportStar(require("./getDynamoTableIndexByConfigAndQuery"), exports);

package/lib/logic/dynamo/updateItem.d.ts

@@ -1,3 +1,2 @@
-export declare function updateItem(tableName: string, key: string, value: any, options: {
-    expires?: number | undefined;
-} | undefined, region: string): Promise<void>;
+import { KvsUpdate, KvsCoreDataType } from 'quidproquo-core';
+export declare function updateItem(tableName: string, region: string, update: KvsUpdate, key: KvsCoreDataType, sortKey?: KvsCoreDataType): Promise<void>;

package/lib/logic/dynamo/updateItem.js

@@ -11,44 +11,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateItem = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
-// THIS DOES NOT WORK ~ DO NOT USE
-function updateItem(tableName, key, value, options = {}, region) {
+const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
+function updateItem(tableName, region, update, key, sortKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const dynamoClient = new client_dynamodb_1.DynamoDBClient({ region });
-        const updateExpressions = Object.keys(value).map((attr, idx) => {
-            return `SET #value.#${attr} = :${attr}`;
-        });
-        const expressionAttributeNames = Object.assign({ '#value': 'value' }, Object.keys(value).reduce((obj, attr) => {
-            obj[`#${attr}`] = attr;
-            return obj;
-        }, {}));
-        const expressionAttributeValues = Object.keys(value).reduce((obj, attr) => {
-            obj[`:${attr}`] = { S: JSON.stringify(value[attr]) };
-            return obj;
-        }, {});
-        if (options.expires) {
-            updateExpressions.push('SET expires = :expires');
-            expressionAttributeValues[':expires'] = { N: options.expires.toString() };
-        }
-        const updateItemParams = {
+        const params = {
             TableName: tableName,
             Key: {
-                key: {
-                    S: key,
-                },
+                id: (0, qpqDynamoOrm_1.buildAttributeValue)(key),
             },
-            UpdateExpression: updateExpressions.join(', '),
-            ExpressionAttributeNames: expressionAttributeNames,
-            ExpressionAttributeValues: expressionAttributeValues,
+            UpdateExpression: (0, qpqDynamoOrm_1.buildDynamoUpdateExpression)(update),
+            ExpressionAttributeValues: (0, qpqDynamoOrm_1.buildUpdateExpressionAttributeValues)(update),
+            ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildUpdateExpressionAttributeNames)(update),
         };
-        console.log('updateItemParams:', JSON.stringify(updateItemParams, null, 2));
-        try {
-            yield dynamoClient.send(new client_dynamodb_1.UpdateItemCommand(updateItemParams));
-        }
-        catch (error) {
-            console.error('Error updating item:', error);
-            throw error;
+        if (sortKey) {
+            params.Key['sk'] = (0, qpqDynamoOrm_1.buildAttributeValue)(sortKey);
         }
+        console.log(yield dynamoClient.send(new client_dynamodb_1.UpdateItemCommand(params)));
     });
 }
 exports.updateItem = updateItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.103",
+  "version": "0.0.104",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",