betterddb 0.5.1 → 0.5.3

package/lib/builders/query-builder.js

@@ -12,6 +12,11 @@ class QueryBuilder {
         this.expressionAttributeNames = {};
         this.expressionAttributeValues = {};
         this.ascending = true;
+        const keys = this.parent.getKeys();
+        let pkName = keys.primary.name;
+        let builtKey = this.parent.buildKey(this.key);
+        this.expressionAttributeNames['#pk'] = pkName;
+        this.expressionAttributeValues[':pk_value'] = builtKey[pkName];
     }
     usingIndex(indexName) {
         if (!this.parent.getKeys().gsis) {
@@ -21,6 +26,10 @@ class QueryBuilder {
             throw new Error('index does not exist');
         }
         this.index = this.parent.getKeys().gsis[indexName];
+        const pkName = this.index.primary.name;
+        const builtKey = this.parent.buildIndexes(this.key);
+        this.expressionAttributeNames['#pk'] = pkName;
+        this.expressionAttributeValues[':pk_value'] = builtKey[pkName];
         return this;
     }
     sortAscending() {
@@ -119,18 +128,7 @@ class QueryBuilder {
      */
     async execute() {
         var _a, _b, _c;
-        const keys = this.parent.getKeys();
-        let pkName = keys.primary.name;
-        let builtKey = this.parent.buildKey(this.key);
-        if (this.index) {
-            pkName = this.index.primary.name;
-            builtKey = this.parent.buildIndexes(this.key);
-        }
-        if (!this.expressionAttributeNames['#pk']) {
-            this.expressionAttributeNames['#pk'] = pkName;
-            this.expressionAttributeValues[':pk_value'] = builtKey[pkName];
-            this.keyConditions.unshift(`#pk = :pk_value`);
-        }
+        this.keyConditions.unshift(`#pk = :pk_value`);
         const keyConditionExpression = this.keyConditions.join(' AND ');
         const params = {
             TableName: this.parent.getTableName(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "betterddb",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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",

package/src/builders/query-builder.ts

@@ -13,7 +13,14 @@ export class QueryBuilder<T> {
   private lastKey?: Record<string, any>;
   private ascending: boolean = true;
 
-  constructor(private parent: BetterDDB<T>, private key: Partial<T>, ) {}
+  constructor(private parent: BetterDDB<T>, private key: Partial<T>, ) {
+    const keys = this.parent.getKeys();
+    let pkName = keys.primary.name;
+    let builtKey = this.parent.buildKey(this.key) as Record<string, any>;
+  
+    this.expressionAttributeNames['#pk'] = pkName;
+    this.expressionAttributeValues[':pk_value'] = builtKey[pkName];
+  }
 
   public usingIndex(indexName: string): this {
     if (!this.parent.getKeys().gsis) {
@@ -24,6 +31,12 @@ export class QueryBuilder<T> {
     }
     
     this.index = this.parent.getKeys().gsis![indexName];
+
+    const pkName = this.index.primary.name;
+    const builtKey = this.parent.buildIndexes(this.key);
+    this.expressionAttributeNames['#pk'] = pkName;
+    this.expressionAttributeValues[':pk_value'] = builtKey[pkName];
+
     return this;
   }
 
@@ -136,19 +149,7 @@ export class QueryBuilder<T> {
    * Executes the query and returns a Promise that resolves with an array of items.
    */
   public async execute(): Promise<PaginatedResult<T>> {
-    const keys = this.parent.getKeys();
-    let pkName = keys.primary.name;
-    let builtKey = this.parent.buildKey(this.key) as Record<string, any>;
-    if (this.index) {
-      pkName = this.index.primary.name;
-      builtKey = this.parent.buildIndexes(this.key);
-    }
-    if (!this.expressionAttributeNames['#pk']) {
-      this.expressionAttributeNames['#pk'] = pkName;
-      this.expressionAttributeValues[':pk_value'] = builtKey[pkName];
-      this.keyConditions.unshift(`#pk = :pk_value`);
-    }
-
+    this.keyConditions.unshift(`#pk = :pk_value`);
     const keyConditionExpression = this.keyConditions.join(' AND ');
 
     const params: QueryCommandInput = {

package/test/get.test.ts

@@ -77,4 +77,9 @@ describe('BetterDDB - Get Operation', () => {
     expect(user).not.toBeNull();
     expect(user?.id).toBe('user-123');
   });
+
+  it('should retrieve an item using GetBuilder that does not exist', async () => {
+    const user = await userDdb.get({ id: 'user-123', email: 'jane@example.com' }).execute();
+    expect(user).toBeNull();
+  });
 });

package/test/query.test.ts

@@ -179,4 +179,14 @@ describe('BetterDDB - Query Operation', () => {
       expect(result.name).toContain('B');
     });
   });
+
+  it('should query items using QueryBuilder with where clause on an index', async () => {
+    // Query the GSI for email "alice@example.com". Two items match.
+    // Then apply two filter conditions: name begins_with "Alice" and name contains "B" should only match one.
+    const results = await userDdb.query({ email: 'alice@example.com' })
+      .usingIndex('EmailIndex')
+      .where('begins_with', { email: 'alice' })
+      .execute();
+    expect(results.items.length).toEqual(2);
+  });
 });