@travetto/model-dynamodb 8.0.0-alpha.10 → 8.0.0-alpha.11

package/README.md

@@ -18,7 +18,7 @@ This module provides an [DynamoDB](https://aws.amazon.com/dynamodb/)-based imple
 Supported features:
    *  [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/types/crud.ts#L11)
    *  [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/types/expiry.ts#L10)
-   *  [Indexed](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L23)
+   *  [Indexed](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L15)
 
 Out of the box, by installing the module, everything should be wired up by default.If you need to customize any aspect of the source or config, you can override and register it with the [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support.") module.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-dynamodb",
-  "version": "8.0.0-alpha.10",
+  "version": "8.0.0-alpha.11",
   "type": "module",
   "description": "DynamoDB backing for the travetto model module.",
   "keywords": [
@@ -29,7 +29,7 @@
     "@aws-sdk/client-dynamodb": "^3.1019.0",
     "@travetto/config": "^8.0.0-alpha.10",
     "@travetto/model": "^8.0.0-alpha.10",
-    "@travetto/model-indexed": "^8.0.0-alpha.10"
+    "@travetto/model-indexed": "^8.0.0-alpha.11"
   },
   "peerDependencies": {
     "@travetto/cli": "^8.0.0-alpha.15"

package/src/service.ts

@@ -1,4 +1,4 @@
-import { type AttributeValue, DynamoDB, type PutItemCommandInput, type PutItemCommandOutput, type QueryCommandOutput } from '@aws-sdk/client-dynamodb';
+import { type AttributeValue, DynamoDB, type PutItemCommandInput, type PutItemCommandOutput, type QueryCommandInput, type QueryCommandOutput } from '@aws-sdk/client-dynamodb';
 
 import { castTo, JSONUtil, ShutdownManager, TimeUtil, type Class } from '@travetto/runtime';
 import { Injectable, PostConstruct } from '@travetto/di';
@@ -101,16 +101,22 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
     const safeName = DynamoDBUtil.toSafeName(idx.name);
     const sorted = idx.type === 'indexed:sorted';
 
-    const query = {
+    const query: QueryCommandInput = {
       TableName: this.#resolveTable(cls),
       IndexName: safeName,
       ProjectionExpression: 'id',
-      KeyConditionExpression: [sorted ? `${safeName}_sort__ = :${safeName}_sort` : '', `${safeName}__ = :${safeName}`]
-        .filter(expr => !!expr)
+      KeyConditionExpression: [
+        ...(sorted ? [`${safeName}_sort__ = :${safeName}_sort`] : []),
+        `${safeName}__ = :${safeName}`
+      ]
         .join(' and '),
+      ...(computed.idPart ? {
+        FilterExpression: 'id = :id'
+      } : {}),
       ExpressionAttributeValues: {
         [`:${safeName}`]: getKey(computed),
-        ...(sorted ? { [`:${safeName}_sort`]: getSort(computed) } : {})
+        ...(sorted ? { [`:${safeName}_sort`]: getSort(computed) } : {}),
+        ...(computed.idPart ? { ':id': DynamoDBUtil.toValue(computed.idPart.value) } : {})
       }
     };
 
@@ -445,7 +451,7 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
     return this.update(cls, item);
   }
 
-  async listByIndex<
+  async pageByIndex<
     T extends ModelType,
     K extends KeyedIndexSelection<T>,
     S extends SortedIndexSelection<T>
@@ -486,4 +492,26 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
 
     return { items, nextOffset };
   }
+
+  async * listByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(
+    cls: Class<T>,
+    idx: SortedIndex<T, K, S>,
+    body: KeyedIndexBody<T, K>,
+  ): AsyncIterable<T> {
+    for await (const batch of this.#scanIndex(cls, idx, body, { limit: Number.MAX_SAFE_INTEGER })) {
+      for (const item of batch.Items ?? []) {
+        try {
+          yield await DynamoDBUtil.loadAndCheckExpiry(cls, item.body.S!);
+        } catch (error) {
+          if (!(error instanceof NotFoundError)) {
+            throw error;
+          }
+        }
+      }
+    }
+  }
 }