wirejs-deploy-amplify-basic 0.0.65-table-resource → 0.0.67-table-resource

package/amplify-backend-assets/backend.ts

@@ -7,14 +7,15 @@ import { Bucket, BlockPublicAccess } from 'aws-cdk-lib/aws-s3';
 import { Table, AttributeType, BillingMode } from 'aws-cdk-lib/aws-dynamodb';
 import { api } from './functions/api/resource';
 import { auth } from './auth/resource';
+import { KeyFieldDefinition } from 'wirejs-resources';
+
+// @ts-ignore
+import generated from './generated-resources';
 
 const APP_ID = process.env.AWS_APP_ID ?? process.env.PWD?.replace(/[^a-zA-Z0-9-_]/g, '_');
 const BRANCH_ID = process.env.AWS_BRANCH ?? process.env.USER ?? 'anonymous';
 const TABLE_NAME_PREFIX = `${APP_ID}-${BRANCH_ID}-`;
 
-// @ts-ignore
-import generated from './generated-resources';
-
 /**
  * Amplify resources
  */
@@ -59,25 +60,30 @@ function isDistributedTable(resource: any): resource is {
   type: 'DistributedTable';
   options: {
     absoluteId: string;
-    partitionKey: string;
-    sortKey: string[];
+    partitionKey: KeyFieldDefinition<any, any, any>;
+    sortKey: KeyFieldDefinition<any, any, any> | undefined;
   }
 } {
   return resource.type === 'DistributedTable';
 }
 
+const PKFieldTypes = {
+  'string': AttributeType.STRING,
+  'number': AttributeType.NUMBER,
+}
+
 // TODO: Need to get AttributeType from customer definition.
 for (const resource of generated) {
   if (isDistributedTable(resource)) {
     const sanitizedId = resource.options.absoluteId.replace(/[^a-zA-Z0-9-_]/g, '_');
     const table = new Table(backend.stack, sanitizedId, {
       partitionKey: {
-        name: resource.options.partitionKey,
-        type: AttributeType.STRING,
+        name: resource.options.partitionKey.field,
+        type: PKFieldTypes[resource.options.partitionKey.type],
       },
       sortKey: resource.options.sortKey ? {
-        name: resource.options.sortKey[0],
-        type: AttributeType.STRING,
+        name: resource.options.sortKey.field,
+        type: PKFieldTypes[resource.options.sortKey.type],
       } : undefined,
       removalPolicy: RemovalPolicy.RETAIN,
       tableName: `${TABLE_NAME_PREFIX}${sanitizedId}`,

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.33-table-resource"
+		"wirejs-resources": "^0.1.35-table-resource"
 	}
 }

package/dist/resources/distributed-table.d.ts

@@ -1,5 +1,5 @@
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { Filter, Parser, RecordKey, Resource } from 'wirejs-resources';
+import { AnyKeyFieldOption, Filter, Parser, RecordKey, Resource } from 'wirejs-resources';
 export declare function PassThruParser<T>(record: Record<string, any>): T;
 /**
  * A table of records that favors very high *overall* scalability at the expense of
@@ -12,7 +12,7 @@ export declare function PassThruParser<T>(record: Record<string, any>): T;
  *
  * High cardinality, non-sequential partition keys allow for the best overall scaling.
  */
-export declare class DistributedTable<const P extends Parser<any>, const T extends ReturnType<P>, const PK extends keyof T & string, const SK extends (keyof T & string)[] | undefined> extends Resource {
+export declare class DistributedTable<const P extends Parser<any>, const T extends ReturnType<P>, const PK extends AnyKeyFieldOption<T>, const SK extends AnyKeyFieldOption<T> | undefined> extends Resource {
     #private;
     parse: P;
     partitionKey: PK;
@@ -26,6 +26,8 @@ export declare class DistributedTable<const P extends Parser<any>, const T exten
             sort?: SK;
         };
     });
+    get partitionKeyName(): PK['field'];
+    get sortKeyName(): 'field' extends (string & keyof SK) ? SK['field'] : undefined;
     save(item: T): Promise<void>;
     saveMany(items: T[]): Promise<void>;
     delete(item: RecordKey<T, PK, SK>): Promise<void>;
@@ -34,7 +36,7 @@ export declare class DistributedTable<const P extends Parser<any>, const T exten
     scan(options?: {
         filter?: Filter<T>;
     }): AsyncGenerator<T>;
-    query(partition: Pick<T, PK>, options?: {
+    query(partition: Pick<T, PK['field']>, options?: {
         filter?: Filter<T>;
     }): AsyncGenerator<T>;
 }

package/dist/resources/distributed-table.js

@@ -1,6 +1,6 @@
 import { env } from 'process';
-import { DynamoDBClient, DeleteItemCommand, } from '@aws-sdk/client-dynamodb';
-import { PutCommand, GetCommand, QueryCommand, ScanCommand, } from '@aws-sdk/lib-dynamodb';
+import { DynamoDBClient, } from '@aws-sdk/client-dynamodb';
+import { PutCommand, GetCommand, QueryCommand, ScanCommand, DeleteCommand, } from '@aws-sdk/lib-dynamodb';
 import { Resource, } from 'wirejs-resources';
 import { addResource } from '../resource-collector.js';
 function isFieldComparison(filter) {
@@ -111,14 +111,20 @@ export class DistributedTable extends Resource {
             sortKey: this.sort,
         });
     }
+    get partitionKeyName() {
+        const [pkField] = Object.keys(this.partitionKey);
+        return pkField;
+    }
+    get sortKeyName() {
+        const [skField] = Object.keys(this.sort ?? {});
+        return skField;
+    }
     #getDDBKey(key) {
         const ddbKey = {
-            [this.partitionKey]: key[this.partitionKey]
+            [this.partitionKeyName]: key[this.partitionKeyName]
         };
-        if (this.sort) {
-            for (const sk of this.sort) {
-                ddbKey[sk] = key[sk];
-            }
+        if (typeof this.sortKeyName === 'string') {
+            ddbKey[this.sortKeyName] = key[this.sortKeyName];
         }
         return ddbKey;
     }
@@ -141,7 +147,7 @@ export class DistributedTable extends Resource {
     async delete(item) {
         const key = this.#getDDBKey(item);
         console.log('Deleting item from DynamoDB:', key);
-        await this.ddbClient.send(new DeleteItemCommand({
+        await this.ddbClient.send(new DeleteCommand({
             TableName: this.table,
             Key: key,
         }));
@@ -191,9 +197,9 @@ export class DistributedTable extends Resource {
             const expressionAttributeValues = options.filter ? buildExpressionAttributeValues(options.filter) : undefined;
             const result = await this.ddbClient.send(new QueryCommand({
                 TableName: this.table,
-                KeyConditionExpression: `${this.partitionKey} = :partitionKey`,
+                KeyConditionExpression: `${this.partitionKeyName} = :partitionKey`,
                 ExpressionAttributeValues: {
-                    ':partitionKey': ddbKey[this.partitionKey],
+                    ':partitionKey': ddbKey[this.partitionKeyName],
                     ...expressionAttributeValues
                 },
                 FilterExpression: filterExpression,

package/package.json

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