betterddb 0.4.0 → 0.4.2

package/lib/betterddb.d.ts

@@ -1,11 +1,11 @@
-import { ZodSchema } from 'zod';
-import { DynamoDB } from 'aws-sdk';
+import { z } from 'zod';
 import { QueryBuilder } from './builders/query-builder';
 import { ScanBuilder } from './builders/scan-builder';
 import { UpdateBuilder } from './builders/update-builder';
 import { CreateBuilder } from './builders/create-builder';
 import { GetBuilder } from './builders/get-builder';
 import { DeleteBuilder } from './builders/delete-builder';
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 export type PrimaryKeyValue = string | number;
 /**
  * A key definition can be either a simple key (a property name)
@@ -60,11 +60,11 @@ export interface KeysConfig<T> {
  * Options for initializing BetterDDB.
  */
 export interface BetterDDBOptions<T> {
-    schema: ZodSchema<T>;
+    schema: z.AnyZodObject;
     tableName: string;
     entityName: string;
     keys: KeysConfig<T>;
-    client: DynamoDB.DocumentClient;
+    client: DynamoDBDocumentClient;
     /**
      * If true, automatically inject timestamp fields:
      * - On create, sets both `createdAt` and `updatedAt`
@@ -78,17 +78,17 @@ export interface BetterDDBOptions<T> {
  * BetterDDB is a definition-based DynamoDB wrapper library.
  */
 export declare class BetterDDB<T> {
-    protected schema: ZodSchema<T>;
+    protected schema: z.AnyZodObject;
     protected tableName: string;
     protected entityName: string;
-    protected client: DynamoDB.DocumentClient;
+    protected client: DynamoDBDocumentClient;
     protected keys: KeysConfig<T>;
     protected autoTimestamps: boolean;
     constructor(options: BetterDDBOptions<T>);
     getKeys(): KeysConfig<T>;
     getTableName(): string;
-    getClient(): DynamoDB.DocumentClient;
-    getSchema(): ZodSchema<T>;
+    getClient(): DynamoDBDocumentClient;
+    getSchema(): z.AnyZodObject;
     getAutoTimestamps(): boolean;
     protected getKeyValue(def: KeyDefinition<T>, rawKey: Partial<T>): string;
     /**

package/lib/builders/create-builder.d.ts

@@ -1,4 +1,4 @@
-import { DynamoDB } from 'aws-sdk';
+import { TransactWriteItem } from '@aws-sdk/client-dynamodb';
 import { BetterDDB } from '../betterddb';
 export declare class CreateBuilder<T> {
     private parent;
@@ -6,8 +6,8 @@ export declare class CreateBuilder<T> {
     private extraTransactItems;
     constructor(parent: BetterDDB<T>, item: T);
     execute(): Promise<T>;
-    transactWrite(ops: DynamoDB.DocumentClient.TransactWriteItemList | DynamoDB.DocumentClient.TransactWriteItem): this;
-    toTransactPut(): DynamoDB.DocumentClient.TransactWriteItem;
+    transactWrite(ops: TransactWriteItem[] | TransactWriteItem): this;
+    toTransactPut(): TransactWriteItem;
     then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
     catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): Promise<T | TResult>;
     finally(onfinally?: (() => void) | null): Promise<T>;

package/lib/builders/create-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateBuilder = void 0;
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 class CreateBuilder {
     constructor(parent, item) {
         this.parent = parent;
@@ -13,9 +14,9 @@ class CreateBuilder {
             const myTransactItem = this.toTransactPut();
             // Combine with extra transaction items.
             const allItems = [...this.extraTransactItems, myTransactItem];
-            await this.parent.getClient().transactWrite({
+            await this.parent.getClient().send(new lib_dynamodb_1.TransactWriteCommand({
                 TransactItems: allItems
-            }).promise();
+            }));
             // After transaction, retrieve the updated item.
             const result = await this.parent.get(this.item).execute();
             if (result === null) {
@@ -38,10 +39,10 @@ class CreateBuilder {
             // Compute and merge index attributes.
             const indexAttributes = this.parent.buildIndexes(validated);
             finalItem = { ...finalItem, ...indexAttributes };
-            await this.parent.getClient().put({
+            await this.parent.getClient().send(new lib_dynamodb_1.PutCommand({
                 TableName: this.parent.getTableName(),
                 Item: finalItem
-            }).promise();
+            }));
             return validated;
         }
     }

package/lib/builders/delete-builder.d.ts

@@ -1,5 +1,5 @@
-import { DynamoDB } from 'aws-sdk';
 import { BetterDDB } from '../betterddb';
+import { TransactWriteItem } from '@aws-sdk/client-dynamodb';
 export declare class DeleteBuilder<T> {
     private parent;
     private key;
@@ -11,8 +11,8 @@ export declare class DeleteBuilder<T> {
      */
     withCondition(expression: string, attributeValues: Record<string, any>): this;
     execute(): Promise<void>;
-    transactWrite(ops: DynamoDB.DocumentClient.TransactWriteItemList | DynamoDB.DocumentClient.TransactWriteItem): this;
-    toTransactDelete(): DynamoDB.DocumentClient.TransactWriteItem;
+    transactWrite(ops: TransactWriteItem[] | TransactWriteItem): this;
+    toTransactDelete(): TransactWriteItem;
     then<TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
     catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): Promise<void | TResult>;
     finally(onfinally?: (() => void) | null): Promise<void>;

package/lib/builders/delete-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteBuilder = void 0;
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 class DeleteBuilder {
     constructor(parent, key) {
         this.parent = parent;
@@ -26,9 +27,9 @@ class DeleteBuilder {
             const myTransactItem = this.toTransactDelete();
             // Combine with extra transaction items.
             const allItems = [...this.extraTransactItems, myTransactItem];
-            await this.parent.getClient().transactWrite({
+            await this.parent.getClient().send(new lib_dynamodb_1.TransactWriteCommand({
                 TransactItems: allItems
-            }).promise();
+            }));
             // After transaction, retrieve the updated item.
             const result = await this.parent.get(this.key).execute();
             if (result === null) {
@@ -44,7 +45,7 @@ class DeleteBuilder {
                 params.ConditionExpression = this.condition.expression;
                 params.ExpressionAttributeValues = this.condition.attributeValues;
             }
-            await this.parent.getClient().delete(params).promise();
+            await this.parent.getClient().send(new lib_dynamodb_1.DeleteCommand(params));
         }
     }
     transactWrite(ops) {

package/lib/builders/get-builder.d.ts

@@ -1,5 +1,5 @@
-import { DynamoDB } from 'aws-sdk';
 import { BetterDDB } from '../betterddb';
+import { TransactGetItem } from '@aws-sdk/client-dynamodb';
 export declare class GetBuilder<T> {
     private parent;
     private key;
@@ -12,8 +12,8 @@ export declare class GetBuilder<T> {
      */
     withProjection(attributes: (keyof T)[]): this;
     execute(): Promise<T | null>;
-    transactGet(ops: DynamoDB.DocumentClient.TransactGetItemList | DynamoDB.DocumentClient.TransactGetItem): this;
-    toTransactGet(): DynamoDB.DocumentClient.TransactGetItem;
+    transactGet(ops: TransactGetItem[] | TransactGetItem): this;
+    toTransactGet(): TransactGetItem;
     then<TResult1 = T | null, TResult2 = never>(onfulfilled?: ((value: T | null) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
     catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): Promise<T | null | TResult>;
     finally(onfinally?: (() => void) | null): Promise<T | null>;

package/lib/builders/get-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetBuilder = void 0;
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 class GetBuilder {
     constructor(parent, key) {
         this.parent = parent;
@@ -24,9 +25,9 @@ class GetBuilder {
             const myTransactItem = this.toTransactGet();
             // Combine with extra transaction items.
             const allItems = [...this.extraTransactItems, myTransactItem];
-            await this.parent.getClient().transactGet({
+            await this.parent.getClient().send(new lib_dynamodb_1.TransactGetCommand({
                 TransactItems: allItems
-            }).promise();
+            }));
             // After transaction, retrieve the updated item.
             const result = await this.parent.get(this.key).execute();
             return result;
@@ -40,7 +41,7 @@ class GetBuilder {
                 params.ProjectionExpression = this.projectionExpression;
                 params.ExpressionAttributeNames = this.expressionAttributeNames;
             }
-            const result = await this.parent.getClient().get(params).promise();
+            const result = await this.parent.getClient().send(new lib_dynamodb_1.GetCommand(params));
             if (!result.Item)
                 return null;
             return this.parent.getSchema().parse(result.Item);

package/lib/builders/query-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBuilder = void 0;
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 class QueryBuilder {
     constructor(parent, key) {
         this.parent = parent;
@@ -89,7 +90,7 @@ class QueryBuilder {
         if (this.filters.length > 0) {
             params.FilterExpression = this.filters.join(' AND ');
         }
-        const result = await this.parent.getClient().query(params).promise();
+        const result = await this.parent.getClient().send(new lib_dynamodb_1.QueryCommand(params));
         return this.parent.getSchema().array().parse(result.Items);
     }
     // Thenable implementation.

package/lib/builders/scan-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScanBuilder = void 0;
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 class ScanBuilder {
     constructor(parent) {
         this.parent = parent;
@@ -59,7 +60,7 @@ class ScanBuilder {
         if (this.filters.length > 0) {
             params.FilterExpression = this.filters.join(' AND ');
         }
-        const result = await this.parent.getClient().scan(params).promise();
+        const result = await this.parent.getClient().send(new lib_dynamodb_1.ScanCommand(params));
         return this.parent.getSchema().array().parse(result.Items);
     }
     // Thenable implementation.

package/lib/builders/update-builder.d.ts

@@ -1,5 +1,5 @@
-import { DynamoDB } from 'aws-sdk';
 import { BetterDDB } from '../betterddb';
+import { TransactWriteItem } from '@aws-sdk/client-dynamodb';
 export declare class UpdateBuilder<T> {
     private parent;
     private key;
@@ -19,7 +19,7 @@ export declare class UpdateBuilder<T> {
     /**
      * Specifies additional transaction items to include when executing this update as a transaction.
      */
-    transactWrite(ops: DynamoDB.DocumentClient.TransactWriteItemList | DynamoDB.DocumentClient.TransactWriteItem): this;
+    transactWrite(ops: TransactWriteItem[] | TransactWriteItem): this;
     /**
      * Builds the update expression and associated maps.
      */
@@ -27,7 +27,7 @@ export declare class UpdateBuilder<T> {
     /**
      * Returns a transaction update item that can be included in a transactWrite call.
      */
-    toTransactUpdate(): DynamoDB.DocumentClient.TransactWriteItem;
+    toTransactUpdate(): TransactWriteItem;
     /**
      * Commits the update immediately by calling the parent's update method.
      */

package/lib/builders/update-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateBuilder = void 0;
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 class UpdateBuilder {
     // Reference to the parent BetterDDB instance and key.
     constructor(parent, key, expectedVersion) {
@@ -170,9 +171,9 @@ class UpdateBuilder {
             const myTransactItem = this.toTransactUpdate();
             // Combine with extra transaction items.
             const allItems = [...this.extraTransactItems, myTransactItem];
-            await this.parent.getClient().transactWrite({
+            await this.parent.getClient().send(new lib_dynamodb_1.TransactWriteCommand({
                 TransactItems: allItems
-            }).promise();
+            }));
             // After transaction, retrieve the updated item.
             const result = await this.parent.get(this.key).execute();
             if (result === null) {
@@ -194,7 +195,7 @@ class UpdateBuilder {
             if (this.condition && this.condition.expression) {
                 params.ConditionExpression = this.condition.expression;
             }
-            const result = await this.parent.getClient().update(params).promise();
+            const result = await this.parent.getClient().send(new lib_dynamodb_1.UpdateCommand(params));
             if (!result.Attributes) {
                 throw new Error('No attributes returned after update');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "betterddb",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "A definition-based DynamoDB wrapper library that provides a schema-driven and fully typesafe DAL.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,7 +28,8 @@
   "author": "R.R. Wang",
   "license": "MIT",
   "dependencies": {
-    "aws-sdk": "^2.1370.0",
+    "@aws-sdk/lib-dynamodb": "^3.744.0",
+    "@aws-sdk/client-dynamodb": "^3.744.0",
     "zod": "^3.21.4"
   },
   "devDependencies": {

package/src/betterddb.ts

@@ -1,11 +1,11 @@
-import { ZodSchema } from 'zod';
-import { DynamoDB } from 'aws-sdk';
+import { z, ZodSchema } from 'zod';
 import { QueryBuilder } from './builders/query-builder';
 import { ScanBuilder } from './builders/scan-builder';
 import { UpdateBuilder } from './builders/update-builder';
 import { CreateBuilder } from './builders/create-builder';
 import { GetBuilder } from './builders/get-builder';
 import { DeleteBuilder } from './builders/delete-builder';
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 
 export type PrimaryKeyValue = string | number;
 
@@ -69,11 +69,11 @@ export interface KeysConfig<T> {
  * Options for initializing BetterDDB.
  */
 export interface BetterDDBOptions<T> {
-  schema: ZodSchema<T>;
+  schema: z.AnyZodObject;
   tableName: string;
   entityName: string;
   keys: KeysConfig<T>;
-  client: DynamoDB.DocumentClient;
+  client: DynamoDBDocumentClient;
   /**
    * If true, automatically inject timestamp fields:
    * - On create, sets both `createdAt` and `updatedAt`
@@ -88,10 +88,10 @@ export interface BetterDDBOptions<T> {
  * BetterDDB is a definition-based DynamoDB wrapper library.
  */
 export class BetterDDB<T> {
-  protected schema: ZodSchema<T>;
+  protected schema: z.AnyZodObject;
   protected tableName: string;
   protected entityName: string;
-  protected client: DynamoDB.DocumentClient;
+  protected client: DynamoDBDocumentClient;
   protected keys: KeysConfig<T>;
   protected autoTimestamps: boolean;
 
@@ -112,12 +112,12 @@ export class BetterDDB<T> {
     return this.tableName;
   }
   
-  public getClient(): DynamoDB.DocumentClient {
+  public getClient(): DynamoDBDocumentClient {
     return this.client;
   }
   
   
-  public getSchema(): ZodSchema<T> {
+  public getSchema(): z.AnyZodObject {
     return this.schema;
   }
 

package/src/builders/create-builder.ts

@@ -1,8 +1,10 @@
-import { DynamoDB } from 'aws-sdk';
+
+import { AttributeValue, Put, TransactWriteItem } from '@aws-sdk/client-dynamodb';
 import { BetterDDB } from '../betterddb';
+import { PutCommand, TransactWriteCommand } from '@aws-sdk/lib-dynamodb';
 
 export class CreateBuilder<T> {
-  private extraTransactItems: DynamoDB.DocumentClient.TransactWriteItemList = [];
+  private extraTransactItems: TransactWriteItem[] = [];
 
   constructor(private parent: BetterDDB<T>, private item: T) {}
 
@@ -12,9 +14,9 @@ export class CreateBuilder<T> {
       const myTransactItem = this.toTransactPut();
       // Combine with extra transaction items.
       const allItems = [...this.extraTransactItems, myTransactItem];
-      await this.parent.getClient().transactWrite({
+      await this.parent.getClient().send(new TransactWriteCommand({
         TransactItems: allItems
-      }).promise();
+      }));
       // After transaction, retrieve the updated item.
       const result = await this.parent.get(this.item).execute();
       if (result === null) {
@@ -32,23 +34,23 @@ export class CreateBuilder<T> {
     let finalItem = { ...validated };
 
     // Compute and merge primary key.
-    const computedKeys = this.parent.buildKey(validated);
+    const computedKeys = this.parent.buildKey(validated as Partial<T>);
     finalItem = { ...finalItem, ...computedKeys };
 
     // Compute and merge index attributes.
-    const indexAttributes = this.parent.buildIndexes(validated);
+    const indexAttributes = this.parent.buildIndexes(validated as Partial<T>);
     finalItem = { ...finalItem, ...indexAttributes };
 
-    await this.parent.getClient().put({
+    await this.parent.getClient().send(new PutCommand({
       TableName: this.parent.getTableName(),
-      Item: finalItem as DynamoDB.DocumentClient.PutItemInputAttributeMap
-    }).promise();
+      Item: finalItem
+    }));
 
-      return validated;
+      return validated as T;
     }
   }
 
-  public transactWrite(ops: DynamoDB.DocumentClient.TransactWriteItemList | DynamoDB.DocumentClient.TransactWriteItem): this {
+  public transactWrite(ops: TransactWriteItem[] | TransactWriteItem): this {
     if (Array.isArray(ops)) {
       this.extraTransactItems.push(...ops);
     } else {
@@ -57,10 +59,10 @@ export class CreateBuilder<T> {
     return this;
   }
 
-  public toTransactPut(): DynamoDB.DocumentClient.TransactWriteItem {
-    const putItem: DynamoDB.DocumentClient.Put = {
+  public toTransactPut(): TransactWriteItem{
+    const putItem: Put = {
       TableName: this.parent.getTableName(),
-      Item: this.item as DynamoDB.DocumentClient.PutItemInputAttributeMap,
+      Item: this.item as Record<string, AttributeValue>,
     };
     return { Put: putItem };
   }

package/src/builders/delete-builder.ts

@@ -1,9 +1,9 @@
-import { DynamoDB } from 'aws-sdk';
 import { BetterDDB } from '../betterddb';
-
+import { TransactWriteItem, DeleteItemInput } from '@aws-sdk/client-dynamodb';
+import { TransactWriteCommand, DeleteCommand } from '@aws-sdk/lib-dynamodb';
 export class DeleteBuilder<T> {
   private condition?: { expression: string; attributeValues: Record<string, any> };
-  private extraTransactItems: DynamoDB.DocumentClient.TransactWriteItemList = [];
+  private extraTransactItems: TransactWriteItem[] = [];
   constructor(private parent: BetterDDB<T>, private key: Partial<T>) {}
 
   /**
@@ -25,16 +25,16 @@ export class DeleteBuilder<T> {
       const myTransactItem = this.toTransactDelete();
       // Combine with extra transaction items.
       const allItems = [...this.extraTransactItems, myTransactItem];
-      await this.parent.getClient().transactWrite({
+      await this.parent.getClient().send(new TransactWriteCommand({
         TransactItems: allItems
-      }).promise();
+      }));
       // After transaction, retrieve the updated item.
       const result = await this.parent.get(this.key).execute();
       if (result === null) {
         throw new Error('Item not found after transaction delete');
       }
     } else {
-    const params: DynamoDB.DocumentClient.DeleteItemInput = {
+    const params: DeleteItemInput = {
       TableName: this.parent.getTableName(),
       Key: this.parent.buildKey(this.key)
     };
@@ -42,11 +42,11 @@ export class DeleteBuilder<T> {
       params.ConditionExpression = this.condition.expression;
         params.ExpressionAttributeValues = this.condition.attributeValues;
       }
-      await this.parent.getClient().delete(params).promise();
+      await this.parent.getClient().send(new DeleteCommand(params));
     }
   }
 
-  public transactWrite(ops: DynamoDB.DocumentClient.TransactWriteItemList | DynamoDB.DocumentClient.TransactWriteItem): this {
+  public transactWrite(ops: TransactWriteItem[] | TransactWriteItem): this {
     if (Array.isArray(ops)) {
       this.extraTransactItems.push(...ops);
     } else {
@@ -55,8 +55,8 @@ export class DeleteBuilder<T> {
     return this;
   }
 
-  public toTransactDelete(): DynamoDB.DocumentClient.TransactWriteItem {
-    const deleteItem: DynamoDB.DocumentClient.Delete = {
+  public toTransactDelete(): TransactWriteItem {
+    const deleteItem: DeleteItemInput = {
       TableName: this.parent.getTableName(),
       Key: this.parent.buildKey(this.key)
     };

package/src/builders/get-builder.ts

@@ -1,10 +1,10 @@
-import { DynamoDB } from 'aws-sdk';
 import { BetterDDB } from '../betterddb';
-
+import { TransactGetCommand, GetCommand } from '@aws-sdk/lib-dynamodb';
+import { GetItemInput, TransactGetItem } from '@aws-sdk/client-dynamodb';
 export class GetBuilder<T> {
   private projectionExpression?: string;
   private expressionAttributeNames: Record<string, string> = {};
-  private extraTransactItems: DynamoDB.DocumentClient.TransactGetItemList = [];
+  private extraTransactItems: TransactGetItem[] = [];
   constructor(private parent: BetterDDB<T>, private key: Partial<T>) {}
 
   /**
@@ -24,14 +24,14 @@ export class GetBuilder<T> {
       const myTransactItem = this.toTransactGet();
       // Combine with extra transaction items.
       const allItems = [...this.extraTransactItems, myTransactItem];
-      await this.parent.getClient().transactGet({
+      await this.parent.getClient().send(new TransactGetCommand({
         TransactItems: allItems
-      }).promise();
+      }));
       // After transaction, retrieve the updated item.
       const result = await this.parent.get(this.key).execute();
       return result;
     } else {
-    const params: DynamoDB.DocumentClient.GetItemInput = {
+    const params: GetItemInput = {
       TableName: this.parent.getTableName(),
       Key: this.parent.buildKey(this.key)
     };
@@ -39,13 +39,13 @@ export class GetBuilder<T> {
       params.ProjectionExpression = this.projectionExpression;
       params.ExpressionAttributeNames = this.expressionAttributeNames;
     }
-    const result = await this.parent.getClient().get(params).promise();
+    const result = await this.parent.getClient().send(new GetCommand(params));
     if (!result.Item) return null;
-      return this.parent.getSchema().parse(result.Item);
+      return this.parent.getSchema().parse(result.Item) as T;
     }
   }
 
-  public transactGet(ops: DynamoDB.DocumentClient.TransactGetItemList | DynamoDB.DocumentClient.TransactGetItem): this {
+  public transactGet(ops: TransactGetItem[] | TransactGetItem): this {
     if (Array.isArray(ops)) {
       this.extraTransactItems.push(...ops);
     } else {
@@ -54,8 +54,8 @@ export class GetBuilder<T> {
     return this;
   }
 
-  public toTransactGet(): DynamoDB.DocumentClient.TransactGetItem {
-    const getItem: DynamoDB.DocumentClient.Get = {
+  public toTransactGet(): TransactGetItem {
+    const getItem: GetItemInput = {
       TableName: this.parent.getTableName(),
       Key: this.parent.buildKey(this.key)
     };

package/src/builders/query-builder.ts

@@ -1,4 +1,4 @@
-import { DynamoDB } from 'aws-sdk';
+import { QueryCommand, QueryCommandInput } from '@aws-sdk/lib-dynamodb';
 import { BetterDDB } from '../betterddb';
 
 export class QueryBuilder<T> {
@@ -90,7 +90,7 @@ export class QueryBuilder<T> {
     }
 
     // If any filters were added, set them as FilterExpression.
-    const params: DynamoDB.DocumentClient.QueryInput = {
+    const params: QueryCommandInput = {
       TableName: this.parent.getTableName(),
       KeyConditionExpression: keyConditionExpression,
       ExpressionAttributeNames: this.expressionAttributeNames,
@@ -105,8 +105,8 @@ export class QueryBuilder<T> {
       params.FilterExpression = this.filters.join(' AND ');
     }
 
-    const result = await this.parent.getClient().query(params).promise();
-    return this.parent.getSchema().array().parse(result.Items);
+    const result = await this.parent.getClient().send(new QueryCommand(params));
+    return this.parent.getSchema().array().parse(result.Items) as T[];
   }
 
   // Thenable implementation.

package/src/builders/scan-builder.ts

@@ -1,4 +1,4 @@
-import { DynamoDB } from 'aws-sdk';
+import { ScanCommand, ScanCommandInput } from '@aws-sdk/lib-dynamodb';
 import { BetterDDB } from '../betterddb';
 
 export class ScanBuilder<T> {
@@ -56,7 +56,7 @@ export class ScanBuilder<T> {
    * Executes the scan and returns a Promise that resolves with an array of items.
    */
   public async execute(): Promise<T[]> {
-    const params: DynamoDB.DocumentClient.ScanInput = {
+    const params: ScanCommandInput = {
       TableName: this.parent.getTableName(),
       ExpressionAttributeNames: this.expressionAttributeNames,
       ExpressionAttributeValues: this.expressionAttributeValues,
@@ -68,8 +68,8 @@ export class ScanBuilder<T> {
       params.FilterExpression = this.filters.join(' AND ');
     }
 
-    const result = await this.parent.getClient().scan(params).promise();
-    return this.parent.getSchema().array().parse(result.Items);
+    const result = await this.parent.getClient().send(new ScanCommand(params));
+    return this.parent.getSchema().array().parse(result.Items) as T[];
   }
 
   // Thenable implementation.

package/src/builders/update-builder.ts

@@ -1,7 +1,8 @@
 
-import { DynamoDB } from 'aws-sdk';
-import { BetterDDB } from '../betterddb';
 
+import { TransactWriteCommand, UpdateCommand } from '@aws-sdk/lib-dynamodb';
+import { BetterDDB } from '../betterddb';
+import { TransactWriteItem, Update, UpdateItemInput } from '@aws-sdk/client-dynamodb';
 interface UpdateActions<T> {
   set?: Partial<T>;
   remove?: (keyof T)[];
@@ -14,7 +15,7 @@ export class UpdateBuilder<T> {
   private condition?: { expression: string; attributeValues: Record<string, any> };
   private expectedVersion?: number;
   // When using transaction mode, we store extra transaction items.
-  private extraTransactItems: DynamoDB.DocumentClient.TransactWriteItemList = [];
+  private extraTransactItems: TransactWriteItem[] = [];
 
   // Reference to the parent BetterDDB instance and key.
   constructor(private parent: BetterDDB<T>, private key: Partial<T>, expectedVersion?: number) {
@@ -59,7 +60,7 @@ export class UpdateBuilder<T> {
   /**
    * Specifies additional transaction items to include when executing this update as a transaction.
    */
-  public transactWrite(ops: DynamoDB.DocumentClient.TransactWriteItemList | DynamoDB.DocumentClient.TransactWriteItem): this {
+  public transactWrite(ops: TransactWriteItem[] | TransactWriteItem): this {
     if (Array.isArray(ops)) {
       this.extraTransactItems.push(...ops);
     } else {
@@ -173,9 +174,9 @@ export class UpdateBuilder<T> {
   /**
    * Returns a transaction update item that can be included in a transactWrite call.
    */
-  public toTransactUpdate(): DynamoDB.DocumentClient.TransactWriteItem {
+  public toTransactUpdate(): TransactWriteItem {
     const { updateExpression, attributeNames, attributeValues } = this.buildExpression();
-    const updateItem: DynamoDB.DocumentClient.Update = {
+    const updateItem: Update = {
       TableName: this.parent.getTableName(),
       Key: this.parent.buildKey(this.key),
       UpdateExpression: updateExpression,
@@ -197,9 +198,9 @@ export class UpdateBuilder<T> {
       const myTransactItem = this.toTransactUpdate();
       // Combine with extra transaction items.
       const allItems = [...this.extraTransactItems, myTransactItem];
-      await this.parent.getClient().transactWrite({
+      await this.parent.getClient().send(new TransactWriteCommand({
         TransactItems: allItems
-      }).promise();
+      }));
       // After transaction, retrieve the updated item.
       const result = await this.parent.get(this.key).execute();
       if (result === null) {
@@ -209,7 +210,7 @@ export class UpdateBuilder<T> {
     } else {
       // Normal update flow.
       const { updateExpression, attributeNames, attributeValues } = this.buildExpression();
-      const params: DynamoDB.DocumentClient.UpdateItemInput = {
+      const params: UpdateItemInput = {
         TableName: this.parent.getTableName(),
         Key: this.parent.buildKey(this.key),
         UpdateExpression: updateExpression,
@@ -220,11 +221,11 @@ export class UpdateBuilder<T> {
       if (this.condition && this.condition.expression) {
         params.ConditionExpression = this.condition.expression;
       }
-      const result = await this.parent.getClient().update(params).promise();
+      const result = await this.parent.getClient().send(new UpdateCommand(params));
       if (!result.Attributes) {
         throw new Error('No attributes returned after update');
       }
-      return this.parent.getSchema().parse(result.Attributes);
+      return this.parent.getSchema().parse(result.Attributes) as T;
     }
   }
 }

package/test/create.test.ts

@@ -1,8 +1,10 @@
 import { z } from 'zod';
 import { BetterDDB } from '../src/betterddb';
-import { DynamoDB } from 'aws-sdk';
 import { createTestTable, deleteTestTable } from './utils/table-setup';
-
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
+import { GetCommand } from '@aws-sdk/lib-dynamodb';
+import { KeySchemaElement, AttributeDefinition } from '@aws-sdk/client-dynamodb';
 const TEST_TABLE = "create-test-table";
 const ENDPOINT = 'http://localhost:4566';
 const REGION = 'us-east-1';
@@ -11,12 +13,12 @@ const PRIMARY_KEY = 'id';
 const PRIMARY_KEY_TYPE = 'S';
 const SORT_KEY = 'email';
 const SORT_KEY_TYPE = 'S';
-const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }];
-const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }];
-const client = new DynamoDB.DocumentClient({
+const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }] as KeySchemaElement[];
+const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }] as AttributeDefinition[];
+const client = DynamoDBDocumentClient.from(new DynamoDB({
   region: REGION,
   endpoint: ENDPOINT,
-});
+}));
 
 const UserSchema = z.object({
   id: z.string(),
@@ -24,15 +26,18 @@ const UserSchema = z.object({
   email: z.string().email(),
   createdAt: z.string(),
   updatedAt: z.string(),
-}).passthrough();
+});
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,
   keys: {
-    primary: { name: PRIMARY_KEY, definition: { build: (raw) => raw.id! } },
-    sort: { name: SORT_KEY, definition: { build: (raw) => raw.email! } },
+    primary: { name: "pk", definition: { build: (raw) => `USER#${raw.id}` } },
+    sort: { name: "sk", definition: { build: (raw) => `EMAIL#${raw.email}` } },
+    gsis: { gsi1: { name: 'gsi1', primary: { name: "gsi1pk", definition: { build: (raw) => "NAME" } }, sort: { name: "gsi1sk", definition: { build: (raw) => `NAME#${raw.name}` } } } },
   },
   client,
   autoTimestamps: true,
@@ -49,11 +54,24 @@ afterAll(async () => {
 describe('BetterDDB - Create Operation', () => {
   it('should insert an item using CreateBuilder', async () => {
     const user = { id: 'user-123', name: 'John Doe', email: 'john@example.com' };
+
     await userDdb.create(user as any).execute();
-    const createdUser = await userDdb.get({ id: 'user-123', email: 'john@example.com' }).execute();
-    expect(createdUser).not.toBeNull();
-    expect(createdUser?.id).toBe('user-123');
-    expect(createdUser).toHaveProperty('createdAt');
-    expect(createdUser).toHaveProperty('updatedAt');
+
+    const result = await client.send(new GetCommand({ TableName: TEST_TABLE, Key: { id: 'user-123', email: 'john@example.com' } }));
+
+    expect(result).not.toBeNull();
+    expect(result.Item).not.toBeNull();
+    expect(result.Item?.pk).toBe('USER#user-123');
+    expect(result.Item?.sk).toBe('EMAIL#john@example.com');
+    expect(result.Item?.gsi1pk).toBe('NAME');
+    expect(result.Item?.gsi1sk).toBe('NAME#John Doe');
+    expect(result.Item?.id).toBe('user-123');
+    expect(result.Item?.createdAt).not.toBeNull();
+    expect(result.Item?.updatedAt).not.toBeNull();
+  });
+
+  it('should fails to validate and not insert an item', async () => {
+    const user = { id: 'user-123', email: 'john@example.com' };
+    await expect(userDdb.create(user as any).execute()).rejects.toThrow();
   });
 });

package/test/delete.test.ts

@@ -1,9 +1,10 @@
 // __tests__/delete.test.ts
 import { z } from 'zod';
 import { BetterDDB } from '../src/betterddb';
-import { DynamoDB } from 'aws-sdk';
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
 import { createTestTable, deleteTestTable } from './utils/table-setup';
-
+import { KeySchemaElement, AttributeDefinition } from '@aws-sdk/client-dynamodb';
 const TEST_TABLE = "delete-test-table";
 const ENDPOINT = 'http://localhost:4566';
 const REGION = 'us-east-1';
@@ -12,12 +13,12 @@ const PRIMARY_KEY = 'id';
 const PRIMARY_KEY_TYPE = 'S';
 const SORT_KEY = 'email';
 const SORT_KEY_TYPE = 'S';
-const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }];
-const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }];
-const client = new DynamoDB.DocumentClient({
+const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }] as KeySchemaElement[];
+const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }] as AttributeDefinition[];
+const client = DynamoDBDocumentClient.from(new DynamoDB({
   region: REGION,
   endpoint: ENDPOINT,
-});
+}));
 
 const UserSchema = z.object({
   id: z.string(),
@@ -25,9 +26,11 @@ const UserSchema = z.object({
   email: z.string().email(),
   createdAt: z.string(),
   updatedAt: z.string(),
-}).passthrough();
+});
+
+type User = z.infer<typeof UserSchema>;
 
-const userDdb = new BetterDDB({
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,

package/test/get.test.ts

@@ -1,9 +1,10 @@
 // __tests__/get.test.ts
 import { z } from 'zod';
 import { BetterDDB } from '../src/betterddb';
-import { DynamoDB } from 'aws-sdk';
 import { createTestTable, deleteTestTable } from './utils/table-setup';
-
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
+import { KeySchemaElement, AttributeDefinition } from '@aws-sdk/client-dynamodb';
 const TEST_TABLE = "get-test-table";
 const ENDPOINT = 'http://localhost:4566';
 const REGION = 'us-east-1';
@@ -12,12 +13,12 @@ const PRIMARY_KEY = 'id';
 const PRIMARY_KEY_TYPE = 'S';
 const SORT_KEY = 'email';
 const SORT_KEY_TYPE = 'S';
-const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }];
-const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }];
-const client = new DynamoDB.DocumentClient({
+const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }] as KeySchemaElement[];
+const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }] as AttributeDefinition[];
+const client = DynamoDBDocumentClient.from(new DynamoDB({
   region: REGION,
   endpoint: ENDPOINT,
-});
+}));
 
 
 const UserSchema = z.object({
@@ -26,9 +27,11 @@ const UserSchema = z.object({
   email: z.string().email(),
   createdAt: z.string(),
   updatedAt: z.string(),
-}).passthrough();
+});
+
+type User = z.infer<typeof UserSchema>;
 
-const userDdb = new BetterDDB({
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,

package/test/query.test.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { BetterDDB } from '../src/betterddb';
-import { DynamoDB } from 'aws-sdk';
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
+import { AttributeDefinition, DynamoDB, KeySchemaElement } from '@aws-sdk/client-dynamodb';
 import { createTestTable, deleteTestTable } from './utils/table-setup';
 
 const TEST_TABLE = "query-test-table";
@@ -11,12 +12,12 @@ const PRIMARY_KEY = 'id';
 const PRIMARY_KEY_TYPE = 'S';
 const SORT_KEY = 'email';
 const SORT_KEY_TYPE = 'S';
-const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }];
-const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }];
-const client = new DynamoDB.DocumentClient({
+const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }] as KeySchemaElement[];
+const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }] as AttributeDefinition[];
+const client = DynamoDBDocumentClient.from(new DynamoDB({
   region: REGION,
   endpoint: ENDPOINT,
-});
+}));
 
 const UserSchema = z.object({
   id: z.string(),
@@ -24,9 +25,11 @@ const UserSchema = z.object({
   email: z.string().email(),
   createdAt: z.string(),
   updatedAt: z.string(),
-}).passthrough();
+});
+
+type User = z.infer<typeof UserSchema>;
 
-const userDdb = new BetterDDB({
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,

package/test/scan.test.ts

@@ -1,8 +1,9 @@
 import { z } from 'zod';
 import { BetterDDB } from '../src/betterddb';
-import { DynamoDB } from 'aws-sdk';
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
 import { createTestTable, deleteTestTable } from './utils/table-setup';
-
+import { KeySchemaElement, AttributeDefinition } from '@aws-sdk/client-dynamodb';
 const TEST_TABLE = "scan-test-table";
 const ENDPOINT = 'http://localhost:4566';
 const REGION = 'us-east-1';
@@ -11,12 +12,13 @@ const PRIMARY_KEY = 'id';
 const PRIMARY_KEY_TYPE = 'S';
 const SORT_KEY = 'email';
 const SORT_KEY_TYPE = 'S';
-const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }];
-const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }];
-const client = new DynamoDB.DocumentClient({
+const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }] as KeySchemaElement[];
+const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }] as AttributeDefinition[];
+const client = DynamoDBDocumentClient.from(new DynamoDB({
   region: REGION,
   endpoint: ENDPOINT,
-});
+}));
+
 
 const UserSchema = z.object({
   id: z.string(),
@@ -24,9 +26,11 @@ const UserSchema = z.object({
   email: z.string().email(),
   createdAt: z.string(),
   updatedAt: z.string(),
-}).passthrough();
+});
+
+type User = z.infer<typeof UserSchema>;
 
-const userDdb = new BetterDDB({
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,

package/test/update.test.ts

@@ -1,8 +1,9 @@
 import { z } from 'zod';
 import { BetterDDB } from '../src/betterddb';
-import { DynamoDB } from 'aws-sdk';
+import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { createTestTable, deleteTestTable } from './utils/table-setup';
-
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
+import { KeySchemaElement, AttributeDefinition } from '@aws-sdk/client-dynamodb';
 const TEST_TABLE = "update-test-table";
 const ENDPOINT = 'http://localhost:4566';
 const REGION = 'us-east-1';
@@ -11,12 +12,12 @@ const PRIMARY_KEY = 'id';
 const PRIMARY_KEY_TYPE = 'S';
 const SORT_KEY = 'email';
 const SORT_KEY_TYPE = 'S';
-const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }];
-const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }];
-const client = new DynamoDB.DocumentClient({
+const KEY_SCHEMA = [{ AttributeName: PRIMARY_KEY, KeyType: 'HASH' }, { AttributeName: SORT_KEY, KeyType: 'RANGE' }] as KeySchemaElement[];
+const ATTRIBUTE_DEFINITIONS = [{ AttributeName: PRIMARY_KEY, AttributeType: PRIMARY_KEY_TYPE }, { AttributeName: SORT_KEY, AttributeType: SORT_KEY_TYPE }] as AttributeDefinition[];
+const client = DynamoDBDocumentClient.from(new DynamoDB({
   region: REGION,
   endpoint: ENDPOINT,
-});
+}));
 
 
 const UserSchema = z.object({
@@ -26,9 +27,11 @@ const UserSchema = z.object({
   createdAt: z.string(),
   updatedAt: z.string(),
   version: z.number().optional(),
-}).passthrough();
+});
+
+type User = z.infer<typeof UserSchema>;
 
-const userDdb = new BetterDDB({
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,

package/test/utils/table-setup.ts

@@ -1,6 +1,6 @@
-import { DynamoDB } from 'aws-sdk';
+import { CreateTableCommandInput, DynamoDB } from '@aws-sdk/client-dynamodb';
 
-export const createTestTable = async (tableName: string, keySchema: DynamoDB.CreateTableInput['KeySchema'], attributeDefinitions: DynamoDB.CreateTableInput['AttributeDefinitions']) => {
+export const createTestTable = async (tableName: string, keySchema: CreateTableCommandInput['KeySchema'], attributeDefinitions: CreateTableCommandInput['AttributeDefinitions']) => {
   const dynamoDB = new DynamoDB({
     region: 'us-east-1',
     endpoint: 'http://localhost:4566',
@@ -14,7 +14,7 @@ export const createTestTable = async (tableName: string, keySchema: DynamoDB.Cre
       KeySchema: keySchema,
       AttributeDefinitions: attributeDefinitions,
       BillingMode: 'PAY_PER_REQUEST',
-    }).promise();
+    });
   } catch (error: any) {
     if (error.code === 'ResourceInUseException') {
       console.log('Table already exists, skipping creation.');
@@ -25,14 +25,14 @@ export const createTestTable = async (tableName: string, keySchema: DynamoDB.Cre
 
   // Wait for the table to become active.
   let attempts = 0;
-  while (attempts < 60) { // wait up to 60 seconds
-    const { Table } = await dynamoDB.describeTable({ TableName: tableName }).promise();
+  while (attempts < 60) { // wait up to 15 seconds
+    const { Table } = await dynamoDB.describeTable({ TableName: tableName });
     if (Table?.TableStatus === 'ACTIVE') {
       console.log('DynamoDB table is ready.');
       return;
     }
     console.log('Waiting for table to become ACTIVE...');
-    await new Promise((res) => setTimeout(res, 1000));
+    await new Promise((res) => setTimeout(res, 250));
     attempts++;
   }
   throw new Error('Table did not become active in time.');
@@ -44,7 +44,7 @@ export const deleteTestTable = async (tableName: string) => {
     endpoint: 'http://localhost:4566',
   });
   try {
-    await dynamoDB.deleteTable({ TableName: tableName }).promise();
+    await dynamoDB.deleteTable({ TableName: tableName });
   } catch (error: any) {
     if (error.code === 'ResourceNotFoundException') {
       console.log('Table not found during deletion.');