electrodb 2.14.3 → 2.15.1

package/index.d.ts

@@ -2718,33 +2718,21 @@ type GoBatchGetTerminal<
   ? "preserveBatchOrder" extends keyof Options
     ? Options["preserveBatchOrder"] extends true
       ? Promise<{
-          data: Array<
-            Resolve<
-              | {
-                  [Name in keyof ResponseItem as Name extends Attr
-                    ? Name
-                    : never]: ResponseItem[Name];
-                }
-              | null
-            >
-          >;
-          unprocessed: Array<
-            Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
-          >;
-        }>
+        data: Array<
+          Resolve<
+            | {
+            [Name in keyof ResponseItem as Name extends Attr
+              ? Name
+              : never]: ResponseItem[Name];
+          }
+            | null
+          >
+        >;
+        unprocessed: Array<
+          Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
+        >;
+      }>
       : Promise<{
-          data: Array<
-            Resolve<{
-              [Name in keyof ResponseItem as Name extends Attr
-                ? Name
-                : never]: ResponseItem[Name];
-            }>
-          >;
-          unprocessed: Array<
-            Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
-          >;
-        }>
-    : Promise<{
         data: Array<
           Resolve<{
             [Name in keyof ResponseItem as Name extends Attr
@@ -2756,24 +2744,36 @@ type GoBatchGetTerminal<
           Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
         >;
       }>
+    : Promise<{
+      data: Array<
+        Resolve<{
+          [Name in keyof ResponseItem as Name extends Attr
+            ? Name
+            : never]: ResponseItem[Name];
+        }>
+      >;
+      unprocessed: Array<
+        Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
+      >;
+    }>
   : "preserveBatchOrder" extends keyof Options
-  ? Options["preserveBatchOrder"] extends true
-    ? {
+    ? Options["preserveBatchOrder"] extends true
+      ? Promise<{
         data: Array<Resolve<ResponseItem | null>>;
         unprocessed: Array<
           Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
         >;
-      }
-    : {
+      }>
+      : Promise<{
         data: Array<Resolve<ResponseItem>>;
         unprocessed: Array<
           Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>
         >;
-      }
-  : {
+      }>
+    : Promise<{
       data: Array<Resolve<ResponseItem>>;
       unprocessed: Array<Resolve<AllTableIndexCompositeAttributes<A, F, C, S>>>;
-    };
+    }>;
 
 type GoGetTerminal<
   A extends string,
@@ -2912,16 +2912,14 @@ export type DeleteRecordOperationGo<ResponseType, Keys> = <
   options?: Options,
 ) => Options extends infer O
   ? "response" extends keyof O
-    ? O["response"] extends "all_new"
-      ? Promise<{ data: T }>
-      : O["response"] extends "all_old"
-      ? Promise<{ data: T }>
+    ? O["response"] extends "all_old"
+      ? Promise<{ data: T | null }>
       : O["response"] extends "default"
-      ? Promise<{ data: Keys }>
+      ? Promise<{ data: Keys | null }>
       : O["response"] extends "none"
       ? Promise<{ data: null }>
-      : Promise<{ data: Partial<T> }>
-    : Promise<{ data: Keys }>
+      : Promise<{ data: Keys | null }>
+    : Promise<{ data: Keys | null }>
   : never;
 
 export type BatchWriteGo<ResponseType> = <O extends BulkOptions>(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrodb",
-  "version": "2.14.3",
+  "version": "2.15.1",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {
@@ -55,6 +55,7 @@
     "@types/mocha": "^8.0.3",
     "@types/node": "^15.14.9",
     "@types/uuid": "^8.3.0",
+    "aws-cdk-lib": "^2.100.0",
     "aws-sdk": "2.630.0",
     "browserify": "^17.0.0",
     "chai": "4.2.0",
@@ -72,8 +73,7 @@
     "ts-node": "^10.9.1",
     "tsd": "^0.28.1",
     "typescript": "^5.2.2",
-    "uuid": "7.0.1",
-    "aws-cdk-lib": "^2.100.0"
+    "uuid": "7.0.1"
   },
   "keywords": [
     "electrodb",
@@ -88,7 +88,8 @@
     "directory": "test"
   },
   "dependencies": {
-    "@aws-sdk/lib-dynamodb": "3.395.0",
+    "@aws-sdk/lib-dynamodb": "^3.654.0",
+    "@aws-sdk/util-dynamodb": "^3.654.0",
     "jsonschema": "1.2.7"
   }
 }

package/src/client.js

@@ -1,5 +1,5 @@
 const lib = require('@aws-sdk/lib-dynamodb')
-const util = require('@aws-sdk/lib-dynamodb/dist-cjs/commands/utils')
+const util = require('@aws-sdk/util-dynamodb')
 const { isFunction } = require("./validations");
 const { ElectroError, ErrorCodes } = require("./errors");
 const DocumentClientVersions = {
@@ -7,7 +7,16 @@ const DocumentClientVersions = {
   v3: "v3",
   electro: "electro",
 };
-const unmarshallOutput = util.unmarshallOutput || ((val) => val);
+const unmarshallItem = (value) => {
+  const unmarshall = util.unmarshall || ((val) => val);
+  try {
+    value.Item = unmarshall(value.Item);
+  } catch(err) {
+    console.error('Internal Error: Failed to unmarshal input', err);
+  }
+
+  return value;
+}
 
 const v3Methods = ["send"];
 const v2Methods = [
@@ -89,7 +98,7 @@ class DocumentClientV2Wrapper {
               return {
                 canceled: cancellationReasons.map((reason) => {
                   if (reason.Item) {
-                    return unmarshallOutput(reason, [{ key: "Item" }]);
+                    return unmarshallItem(reason);
                   }
                   return reason;
                 }),
@@ -202,7 +211,7 @@ class DocumentClientV3Wrapper {
             return {
               canceled: err.CancellationReasons.map((reason) => {
                 if (reason.Item) {
-                  return unmarshallOutput(reason, [{ key: "Item" }]);
+                  return unmarshallItem(reason);
                 }
                 return reason;
               }),
@@ -225,7 +234,7 @@ class DocumentClientV3Wrapper {
             return {
               canceled: err.CancellationReasons.map((reason) => {
                 if (reason.Item) {
-                  return unmarshallOutput(reason, [{ key: "Item" }]);
+                  return unmarshallItem(reason);
                 }
                 return reason;
               }),