betterddb 0.4.1 → 0.4.2

package/src/builders/query-builder.ts

@@ -1,8 +1,7 @@
-import { DynamoDB } from 'aws-sdk';
+import { QueryCommand, QueryCommandInput } from '@aws-sdk/lib-dynamodb';
 import { BetterDDB } from '../betterddb';
-import { z } from 'zod';
 
-export class QueryBuilder<S extends z.ZodType<any>> {
+export class QueryBuilder<T> {
   private filters: string[] = [];
   private expressionAttributeNames: Record<string, string> = {};
   private expressionAttributeValues: Record<string, any> = {};
@@ -12,7 +11,7 @@ export class QueryBuilder<S extends z.ZodType<any>> {
   private lastKey?: Record<string, any>;
   private ascending: boolean = true;
 
-  constructor(private parent: BetterDDB<S>, private key: Partial<S>) {}
+  constructor(private parent: BetterDDB<T>, private key: Partial<T>) {}
 
   public usingIndex(indexName: string): this {
     this.indexName = indexName;
@@ -30,7 +29,7 @@ export class QueryBuilder<S extends z.ZodType<any>> {
   }
 
   public where(
-    attribute: keyof S,
+    attribute: keyof T,
     operator: 'eq' | 'begins_with' | 'between',
     values: any | [any, any]
   ): this {
@@ -74,7 +73,7 @@ export class QueryBuilder<S extends z.ZodType<any>> {
   /**
    * Executes the query and returns a Promise that resolves with an array of items.
    */
-  public async execute(): Promise<S[]> {
+  public async execute(): Promise<T[]> {
     // Build a simple key condition for the partition key.
     const keys = this.parent.getKeys();
     const pkName = keys.primary.name;
@@ -91,7 +90,7 @@ export class QueryBuilder<S extends z.ZodType<any>> {
     }
 
     // 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,
@@ -106,23 +105,23 @@ export class QueryBuilder<S extends z.ZodType<any>> {
       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.
-  public then<TResult1 = S[], TResult2 = never>(
-    onfulfilled?: ((value: S[]) => TResult1 | PromiseLike<TResult1>) | null,
+  public then<TResult1 = T[], TResult2 = never>(
+    onfulfilled?: ((value: T[]) => TResult1 | PromiseLike<TResult1>) | null,
     onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
   ): Promise<TResult1 | TResult2> {
     return this.execute().then(onfulfilled, onrejected);
   }
   public catch<TResult = never>(
     onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-  ): Promise<S[] | TResult> {
+  ): Promise<T[] | TResult> {
     return this.execute().catch(onrejected);
   }
-  public finally(onfinally?: (() => void) | null): Promise<S[]> {
+  public finally(onfinally?: (() => void) | null): Promise<T[]> {
     return this.execute().finally(onfinally);
   }
 }

package/src/builders/scan-builder.ts

@@ -1,18 +1,17 @@
-import { DynamoDB } from 'aws-sdk';
+import { ScanCommand, ScanCommandInput } from '@aws-sdk/lib-dynamodb';
 import { BetterDDB } from '../betterddb';
-import { z } from 'zod';
 
-export class ScanBuilder<S extends z.ZodType<any>> {
+export class ScanBuilder<T> {
   private filters: string[] = [];
   private expressionAttributeNames: Record<string, string> = {};
   private expressionAttributeValues: Record<string, any> = {};
   private limit?: number;
   private lastKey?: Record<string, any>;
 
-  constructor(private parent: BetterDDB<S>) {}
+  constructor(private parent: BetterDDB<T>) {}
 
   public where(
-    attribute: keyof S,
+    attribute: keyof T,
     operator: 'eq' | 'begins_with' | 'between',
     values: any | [any, any]
   ): this {
@@ -56,8 +55,8 @@ export class ScanBuilder<S extends z.ZodType<any>> {
   /**
    * Executes the scan and returns a Promise that resolves with an array of items.
    */
-  public async execute(): Promise<S[]> {
-    const params: DynamoDB.DocumentClient.ScanInput = {
+  public async execute(): Promise<T[]> {
+    const params: ScanCommandInput = {
       TableName: this.parent.getTableName(),
       ExpressionAttributeNames: this.expressionAttributeNames,
       ExpressionAttributeValues: this.expressionAttributeValues,
@@ -69,23 +68,23 @@ export class ScanBuilder<S extends z.ZodType<any>> {
       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.
-  public then<TResult1 = S[], TResult2 = never>(
-    onfulfilled?: ((value: S[]) => TResult1 | PromiseLike<TResult1>) | null,
+  public then<TResult1 = T[], TResult2 = never>(
+    onfulfilled?: ((value: T[]) => TResult1 | PromiseLike<TResult1>) | null,
     onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
   ): Promise<TResult1 | TResult2> {
     return this.execute().then(onfulfilled, onrejected);
   }
   public catch<TResult = never>(
     onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-  ): Promise<S[] | TResult> {
+  ): Promise<T[] | TResult> {
     return this.execute().catch(onrejected);
   }
-  public finally(onfinally?: (() => void) | null): Promise<S[]> {
+  public finally(onfinally?: (() => void) | null): Promise<T[]> {
     return this.execute().finally(onfinally);
   }
 }

package/src/builders/update-builder.ts

@@ -1,44 +1,44 @@
 
-import { DynamoDB } from 'aws-sdk';
-import { BetterDDB } from '../betterddb';
-import { z } from 'zod';
 
-interface UpdateActions<S extends z.ZodType<any>> {
-  set?: Partial<S>;
-  remove?: (keyof S)[];
-  add?: Partial<Record<keyof S, number | Set<any>>>;
-  delete?: Partial<Record<keyof S, Set<any>>>;
+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)[];
+  add?: Partial<Record<keyof T, number | Set<any>>>;
+  delete?: Partial<Record<keyof T, Set<any>>>;
 }
 
-export class UpdateBuilder<S extends z.ZodType<any>> {
-  private actions: UpdateActions<S> = {};
+export class UpdateBuilder<T> {
+  private actions: UpdateActions<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<S>, private key: Partial<S>, expectedVersion?: number) {
+  constructor(private parent: BetterDDB<T>, private key: Partial<T>, expectedVersion?: number) {
     this.expectedVersion = expectedVersion;
   }
 
   // Chainable methods:
-  public set(attrs: Partial<S>): this {
+  public set(attrs: Partial<T>): this {
     this.actions.set = { ...this.actions.set, ...attrs };
     return this;
   }
 
-  public remove(attrs: (keyof S)[]): this {
+  public remove(attrs: (keyof T)[]): this {
     this.actions.remove = [...(this.actions.remove || []), ...attrs];
     return this;
   }
 
-  public add(attrs: Partial<Record<keyof S, number | Set<any>>>): this {
+  public add(attrs: Partial<Record<keyof T, number | Set<any>>>): this {
     this.actions.add = { ...this.actions.add, ...attrs };
     return this;
   }
 
-  public delete(attrs: Partial<Record<keyof S, Set<any>>>): this {
+  public delete(attrs: Partial<Record<keyof T, Set<any>>>): this {
     this.actions.delete = { ...this.actions.delete, ...attrs };
     return this;
   }
@@ -60,7 +60,7 @@ export class UpdateBuilder<S extends z.ZodType<any>> {
   /**
    * 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 {
@@ -174,9 +174,9 @@ export class UpdateBuilder<S extends z.ZodType<any>> {
   /**
    * 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,
@@ -192,15 +192,15 @@ export class UpdateBuilder<S extends z.ZodType<any>> {
   /**
    * Commits the update immediately by calling the parent's update method.
    */
-  public async execute(): Promise<S> {
+  public async execute(): Promise<T> {
     if (this.extraTransactItems.length > 0) {
       // Build our update transaction item.
       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) {
@@ -210,7 +210,7 @@ export class UpdateBuilder<S extends z.ZodType<any>> {
     } 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,
@@ -221,11 +221,11 @@ export class UpdateBuilder<S extends z.ZodType<any>> {
       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(),
@@ -26,7 +28,9 @@ const UserSchema = z.object({
   updatedAt: z.string(),
 });
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+const userDdb = new BetterDDB<User>({
   schema: UserSchema,
   tableName: TEST_TABLE,
   entityName: ENTITY_NAME,
@@ -53,7 +57,7 @@ describe('BetterDDB - Create Operation', () => {
 
     await userDdb.create(user as any).execute();
 
-    const result = await client.get({ TableName: TEST_TABLE, Key: { id: 'user-123', email: 'john@example.com' } }).promise();
+    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();

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(),
@@ -27,7 +28,9 @@ const UserSchema = z.object({
   updatedAt: z.string(),
 });
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+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({
@@ -28,7 +29,9 @@ const UserSchema = z.object({
   updatedAt: z.string(),
 });
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+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(),
@@ -26,7 +27,9 @@ const UserSchema = z.object({
   updatedAt: z.string(),
 });
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+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(),
@@ -26,7 +28,9 @@ const UserSchema = z.object({
   updatedAt: z.string(),
 });
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+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({
@@ -28,7 +29,9 @@ const UserSchema = z.object({
   version: z.number().optional(),
 });
 
-const userDdb = new BetterDDB({
+type User = z.infer<typeof UserSchema>;
+
+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.');