betterddb 0.5.0 → 0.5.2

package/lib/builders/create-builder.js

@@ -54,9 +54,21 @@ class CreateBuilder {
         return this;
     }
     toTransactPut() {
+        const validated = this.parent.getSchema().parse(this.item);
+        let finalItem = { ...this.item, entityType: this.parent.getEntityType() };
+        if (this.parent.getTimestamps()) {
+            const now = new Date().toISOString();
+            finalItem = { ...finalItem, createdAt: now, updatedAt: now };
+        }
+        // Compute and merge primary key.
+        const computedKeys = this.parent.buildKey(validated);
+        finalItem = { ...finalItem, ...computedKeys };
+        // Compute and merge index attributes.
+        const indexAttributes = this.parent.buildIndexes(validated);
+        finalItem = { ...finalItem, ...indexAttributes };
         const putItem = {
             TableName: this.parent.getTableName(),
-            Item: this.item,
+            Item: finalItem,
         };
         return { Put: putItem };
     }

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(),
@@ -146,6 +144,7 @@ class QueryBuilder {
         this.expressionAttributeNames['#entity'] = 'entityType';
         this.expressionAttributeValues[':entity_value'] = this.parent.getEntityType();
         params.FilterExpression = this.filterConditions.join(' AND ');
+        console.log(params);
         const result = await this.parent.getClient().send(new lib_dynamodb_1.QueryCommand(params));
         return { items: this.parent.getSchema().array().parse(result.Items), lastKey: (_c = result.LastEvaluatedKey) !== null && _c !== void 0 ? _c : undefined };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "betterddb",
-  "version": "0.5.0",
+  "version": "0.5.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",

package/src/builders/create-builder.ts

@@ -59,9 +59,23 @@ export class CreateBuilder<T> {
   }
 
   public toTransactPut(): TransactWriteItem{
+    const validated = this.parent.getSchema().parse(this.item);
+    let finalItem: T = { ...this.item , entityType: this.parent.getEntityType() };
+    if (this.parent.getTimestamps()) {
+      const now = new Date().toISOString();
+      finalItem = { ...finalItem, createdAt: now, updatedAt: now } as T;
+    }
+
+    // Compute and merge primary key.
+    const computedKeys = this.parent.buildKey(validated as Partial<T>);
+    finalItem = { ...finalItem, ...computedKeys };
+
+    // Compute and merge index attributes.
+    const indexAttributes = this.parent.buildIndexes(validated as Partial<T>);
+    finalItem = { ...finalItem, ...indexAttributes };
     const putItem: Put = {
       TableName: this.parent.getTableName(),
-      Item: this.item as Record<string, AttributeValue>,
+      Item: finalItem as Record<string, AttributeValue>,
     };
     return { Put: putItem };
   }

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 = {
@@ -167,6 +168,7 @@ export class QueryBuilder<T> {
     this.expressionAttributeValues[':entity_value'] = this.parent.getEntityType();
     params.FilterExpression = this.filterConditions.join(' AND ');
 
+    console.log(params);
     const result = await this.parent.getClient().send(new QueryCommand(params));
     return {items: this.parent.getSchema().array().parse(result.Items) as T[], lastKey: result.LastEvaluatedKey ?? undefined};
   }