triangle-utils 1.4.34 → 1.4.36

package/dist/src/UtilsDynamoDB.d.ts

@@ -10,7 +10,7 @@ export declare class UtilsDynamoDB {
         concurrency?: number;
     }): Promise<Record<string, any>[]>;
     get(table: string, key: Record<string, any>, consistent?: boolean): Promise<Record<string, any> | undefined>;
-    get_max(table_index_name: string, primary_key: Record<string, any>): Promise<Record<string, any> | undefined>;
+    get_max(table_index_name: string, primary_key: Record<string, string | number>): Promise<Record<string, any> | undefined>;
     query(table_index_name: string, primary_key: Record<string, any>, options?: {
         reverse?: boolean;
         compile?: boolean;

package/dist/src/UtilsDynamoDB.js

@@ -158,24 +158,18 @@ export class UtilsDynamoDB {
     async get_max(table_index_name, primary_key) {
         const table_name = table_index_name.split(":")[0];
         const index_name = table_index_name.split(":")[1];
-        if (Object.keys(primary_key).length !== 1) {
-            return undefined;
-        }
-        const key = Object.keys(primary_key)[0];
-        const value = convert_input(Object.values(primary_key)[0]);
-        if (value === undefined) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
+            index_name !== undefined && Object.keys(primary_key).length !== index_name.split("-").length) {
             return undefined;
         }
         const request = {
             TableName: table_name,
             IndexName: index_name,
-            ExpressionAttributeNames: {
-                "#a": key
-            },
-            ExpressionAttributeValues: {
-                ":a": value
-            },
-            KeyConditionExpression: "#a = :a",
+            ExpressionAttributeNames: Object.fromEntries(Object.keys(primary_key).map(key => ["#" + key, key])),
+            ExpressionAttributeValues: Object.fromEntries(Object.entries(primary_key)
+                .map(([key, value]) => [":" + key, convert_input(value)])
+                .filter(([key, value]) => value !== undefined)),
+            KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
             Limit: 1,
             ScanIndexForward: false
         };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.34",
+    "version": "1.4.36",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsDynamoDB.ts

@@ -183,28 +183,25 @@ export class UtilsDynamoDB {
 
     async get_max(
         table_index_name : string,
-        primary_key : Record<string, any>
+        primary_key : Record<string, string | number>
     ) : Promise<Record<string, any> | undefined> {
         const table_name : string = table_index_name.split(":")[0]
         const index_name : string | undefined = table_index_name.split(":")[1]
-        if (Object.keys(primary_key).length !== 1) {
-            return undefined
-        }
-        const key = Object.keys(primary_key)[0]
-        const value = convert_input(Object.values(primary_key)[0])
-        if (value === undefined) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
+            index_name !== undefined && Object.keys(primary_key).length !== index_name.split("-").length
+        ) {
             return undefined
         }
         const request : QueryCommandInput = {
             TableName : table_name,
             IndexName : index_name,
-            ExpressionAttributeNames: {
-                "#a": key
-            },
-            ExpressionAttributeValues: {
-                ":a": value
-            },
-            KeyConditionExpression: "#a = :a",
+            ExpressionAttributeNames: Object.fromEntries(Object.keys(primary_key).map(key => ["#" + key, key])),
+            ExpressionAttributeValues: Object.fromEntries(
+                Object.entries(primary_key)
+                    .map(([key, value]) => [":" + key, convert_input(value)])
+                    .filter(([key, value]) => value !== undefined)
+            ),
+            KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
             Limit : 1,
             ScanIndexForward : false
         }