fix when set to NONE

woltsu · Jun 6, 2024 · bd2c659 · bd2c659
1 parent efe9e98
commit bd2c659
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 22 deletions.
diff --git a/src/queryBuilders/deleteItemQueryBuilder.integration.test.ts b/src/queryBuilders/deleteItemQueryBuilder.integration.test.ts
@@ -86,7 +86,7 @@ describe("DeleteItemQueryBuilder", () => {
 
     expect(res).toBeDefined();
   });
-  it("doesn't return values if no returnValues is specified", async () => {
+  it("doesn't return values if no returnValues is specified or its set to NONE", async () => {
     await tsynamoClient
       .putItem("myTable")
       .item({
@@ -101,8 +101,16 @@ describe("DeleteItemQueryBuilder", () => {
       .execute();
 
     expectTypeOf(res).toBeNever();
-
     expect(res).toBeUndefined();
+
+    const res2 = await tsynamoClient
+      .deleteItem("myTable")
+      .keys({ userId: "1", dataTimestamp: 2 })
+      .returnValues("NONE")
+      .execute();
+
+    expectTypeOf(res2).toBeNever();
+    expect(res2).toBeUndefined();
   });
   it("does return values if returnValues is specified", async () => {
     await tsynamoClient

diff --git a/src/queryBuilders/deleteItemQueryBuilder.ts b/src/queryBuilders/deleteItemQueryBuilder.ts
@@ -84,13 +84,21 @@ export interface DeleteItemQueryBuilderInterface<
     ...args: BuilderExprArg<DDB, Table, Key>
   ): DeleteItemQueryBuilder<DDB, Table, O>;
 
-  returnValues(
-    option: Extract<ReturnValuesOptions, "NONE" | "ALL_OLD">
-  ): DeleteItemQueryBuilder<DDB, Table, ExecuteOutput<DDB[Table]>>;
-
-  returnValuesOnConditionCheckFailure(
-    option: Extract<ReturnValuesOptions, "NONE" | "ALL_OLD">
-  ): DeleteItemQueryBuilder<DDB, Table, ExecuteOutput<DDB[Table]>>;
+  returnValues<Choice extends "NONE" | "ALL_OLD">(
+    option: Extract<ReturnValuesOptions, Choice>
+  ): DeleteItemQueryBuilder<
+    DDB,
+    Table,
+    "NONE" extends Choice ? O : ExecuteOutput<DDB[Table]>
+  >;
+
+  returnValuesOnConditionCheckFailure<Choice extends "NONE" | "ALL_OLD">(
+    option: Extract<ReturnValuesOptions, Choice>
+  ): DeleteItemQueryBuilder<
+    DDB,
+    Table,
+    "NONE" extends Choice ? O : ExecuteOutput<DDB[Table]>
+  >;
 
   keys<Keys extends PickPk<DDB[Table]> & PickSkRequired<DDB[Table]>>(
     pk: Keys
@@ -148,9 +156,13 @@ export class DeleteItemQueryBuilder<DDB, Table extends keyof DDB, O>
     });
   }
 
-  returnValues(
-    option: Extract<ReturnValuesOptions, "NONE" | "ALL_OLD">
-  ): DeleteItemQueryBuilder<DDB, Table, ExecuteOutput<DDB[Table]>> {
+  returnValues<Choice extends "NONE" | "ALL_OLD">(
+    option: Extract<ReturnValuesOptions, Choice>
+  ): DeleteItemQueryBuilder<
+    DDB,
+    Table,
+    "NONE" extends Choice ? O : ExecuteOutput<DDB[Table]>
+  > {
     return new DeleteItemQueryBuilder({
       ...this.#props,
       node: {
@@ -163,9 +175,13 @@ export class DeleteItemQueryBuilder<DDB, Table extends keyof DDB, O>
     });
   }
 
-  returnValuesOnConditionCheckFailure(
-    option: Extract<ReturnValuesOptions, "NONE" | "ALL_OLD">
-  ): DeleteItemQueryBuilder<DDB, Table, ExecuteOutput<DDB[Table]>> {
+  returnValuesOnConditionCheckFailure<Choice extends "NONE" | "ALL_OLD">(
+    option: Extract<ReturnValuesOptions, Choice>
+  ): DeleteItemQueryBuilder<
+    DDB,
+    Table,
+    "NONE" extends Choice ? O : ExecuteOutput<DDB[Table]>
+  > {
     return new DeleteItemQueryBuilder({
       ...this.#props,
       node: {

diff --git a/src/queryBuilders/putItemQueryBuilder.integration.test.ts b/src/queryBuilders/putItemQueryBuilder.integration.test.ts
@@ -44,14 +44,23 @@ describe("PutItemQueryBuilder", () => {
     expect(result).toEqual(itemToPut);
   });
 
-  it("doesnt return values without returnValues", async () => {
+  it("doesnt return values without returnValues or when its set to NONE", async () => {
     let result = await tsynamoClient
       .putItem("myTable")
       .item(itemToPut)
       .execute();
 
     expectTypeOf(result).toBeNever();
     expect(result).toBeUndefined();
+
+    let result2 = await tsynamoClient
+      .putItem("myTable")
+      .item(itemToPut)
+      .returnValues("NONE")
+      .execute();
+
+    expectTypeOf(result2).toBeNever();
+    expect(result2).toBeUndefined();
   });
 
   it("handles ReturnValues option", async () => {

diff --git a/src/queryBuilders/putItemQueryBuilder.ts b/src/queryBuilders/putItemQueryBuilder.ts
@@ -75,9 +75,13 @@ export interface PutItemQueryBuilderInterface<DDB, Table extends keyof DDB, O> {
     ...args: BuilderExprArg<DDB, Table, Key>
   ): PutItemQueryBuilder<DDB, Table, O>;
 
-  returnValues(
-    option: Extract<ReturnValuesOptions, "NONE" | "ALL_OLD">
-  ): PutItemQueryBuilder<DDB, Table, ExecuteOutput<DDB[Table]>>;
+  returnValues<Choice extends "NONE" | "ALL_OLD">(
+    option: Extract<ReturnValuesOptions, Choice>
+  ): PutItemQueryBuilder<
+    DDB,
+    Table,
+    "NONE" extends Choice ? O : ExecuteOutput<DDB[Table]>
+  >;
 
   item<Item extends ExecuteOutput<DDB[Table]>>(
     item: Item
@@ -147,9 +151,13 @@ export class PutItemQueryBuilder<DDB, Table extends keyof DDB, O>
     });
   }
 
-  returnValues(
-    option: Extract<ReturnValuesOptions, "NONE" | "ALL_OLD">
-  ): PutItemQueryBuilder<DDB, Table, ExecuteOutput<DDB[Table]>> {
+  returnValues<Choice extends "NONE" | "ALL_OLD">(
+    option: Extract<ReturnValuesOptions, Choice>
+  ): PutItemQueryBuilder<
+    DDB,
+    Table,
+    "NONE" extends Choice ? O : ExecuteOutput<DDB[Table]>
+  > {
     return new PutItemQueryBuilder({
       ...this.#props,
       node: {