wirejs-deploy-amplify-basic 0.0.73-table-resource → 0.0.75-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.41-table-resource"
+		"wirejs-resources": "^0.1.43-table-resource"
 	}
 }

package/dist/resources/distributed-table.js

@@ -4,7 +4,7 @@ import { PutCommand, GetCommand, QueryCommand, ScanCommand, DeleteCommand, } fro
 import { Resource, indexName } from 'wirejs-resources';
 import { addResource } from '../resource-collector.js';
 function fieldAlias(name) {
-    return `#a_${name}`;
+    return `#FN${name}`;
 }
 function isFieldComparison(filter) {
     console.log('Checking if filter is a field comparison:', filter);
@@ -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)}`);
@@ -254,7 +267,9 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.73-table-resource",
+	"version": "0.0.75-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.41-table-resource"
+		"wirejs-resources": "^0.1.43-table-resource"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",