fix batchcallback where rows are not unmarkshalled

frankleng · Oct 20, 2023 · 462fc2e · 462fc2e
1 parent 04dd78b
commit 462fc2e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dynadash",
-  "version": "1.9.16",
+  "version": "1.9.17",
   "description": "DynamoDb helpers",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",

diff --git a/src/query.ts b/src/query.ts
@@ -29,7 +29,7 @@ export async function handleQueryCommand<R>(
       result = await client.send(new QueryCommand(query));
 
       if (batchCallback) {
-        await batchCallback([...(result.Items || [])] as R[]);
+        await batchCallback((result.Items || []).map((row) => unmarshall(row) as R));
         result.Items = undefined;
       } else {
         // Concatenating the retrieved items

diff --git a/src/utils.ts b/src/utils.ts
@@ -413,7 +413,7 @@ function mergeIndexCapacities(
 
   const mergedIndexes: Record<string, Capacity> = { ...statsIndexes };
 
-  for (const index in resultIndexes) {
+  for (const index in resultIndexes || {}) {
     const capacity = mergeCapacity(mergedIndexes[index], resultIndexes[index]);
     if (capacity) mergedIndexes[index as keyof typeof resultIndexes] = capacity;
   }