wirejs-deploy-amplify-basic 0.0.74-table-resource → 0.0.76-table-resource

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.38",
-		"wirejs-resources": "^0.1.42-table-resource"
+		"wirejs-resources": "^0.1.44-table-resource"
 	}
 }

package/dist/resources/distributed-table.js

@@ -13,13 +13,26 @@ function isFieldComparison(filter) {
 function buildFilterExpression(filter) {
     console.log('Building filter expression for filter:', filter);
     if (filter.and) {
-        return `(${filter.and.map(buildFilterExpression).join(' AND ')})`;
+        let pl = '(';
+        let pr = ')';
+        if (filter.and.length === 1) {
+            pl = '';
+            pr = '';
+        }
+        return `${pl}${filter.and.map(buildFilterExpression).join(' AND ')}${pr}`;
     }
     if (filter.or) {
-        return `(${filter.or.map(buildFilterExpression).join(' OR ')})`;
+        let pl = '(';
+        ;
+        let pr = ')';
+        if (filter.or.length === 1) {
+            pl = '';
+            pr = '';
+        }
+        return `${pl}${filter.or.map(buildFilterExpression).join(' OR ')}${pr}`;
     }
     if (filter.not) {
-        return `(NOT ${buildFilterExpression(filter.not)})`;
+        return `NOT ${buildFilterExpression(filter.not)}`;
     }
     if (!isFieldComparison(filter)) {
         throw new Error(`Unsupported filter: ${JSON.stringify(filter)}`);
@@ -236,17 +249,9 @@ export class DistributedTable extends Resource {
             partition: this.key.partition,
             sort: this.key.sort
         });
-        console.log('DynamoDB query params', {
-            TableName: this.table,
-            IndexName: isIndexNameTheDefault ? undefined : options.by,
-            KeyConditionExpression: keyConditionExpression,
-            FilterExpression: filterExpression,
-            ExpressionAttributeValues: expressionAttributeValues,
-            ExpressionAttributeNames: expressionAttributeNames,
-        });
         let lastEvaluatedKey = undefined;
         do {
-            const result = await this.ddbClient.send(new QueryCommand({
+            const command = new QueryCommand({
                 TableName: this.table,
                 IndexName: isIndexNameTheDefault ? undefined : options.by,
                 KeyConditionExpression: keyConditionExpression,
@@ -254,16 +259,23 @@ export class DistributedTable extends Resource {
                 ExpressionAttributeValues: expressionAttributeValues,
                 ExpressionAttributeNames: expressionAttributeNames,
                 ExclusiveStartKey: lastEvaluatedKey,
-                Select: 'ALL_ATTRIBUTES',
-            }));
-            console.log('DDB Query result:', result);
-            for (const item of result.Items || []) {
-                if (!item)
-                    continue;
-                const record = this.parse(item);
-                yield record;
+            });
+            console.log('DynamoDB query command:', JSON.stringify(command, null, 2));
+            try {
+                const result = await this.ddbClient.send(command);
+                console.log('DDB Query result:', result);
+                for (const item of result.Items || []) {
+                    if (!item)
+                        continue;
+                    const record = this.parse(item);
+                    yield record;
+                }
+                lastEvaluatedKey = result.LastEvaluatedKey;
+            }
+            catch (error) {
+                console.error('Error executing query:', error);
+                throw error;
             }
-            lastEvaluatedKey = result.LastEvaluatedKey;
         } while (lastEvaluatedKey);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.74-table-resource",
+	"version": "0.0.76-table-resource",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -32,7 +32,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.38",
-		"wirejs-resources": "^0.1.42-table-resource"
+		"wirejs-resources": "^0.1.44-table-resource"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",