@travetto/model-memory 8.0.0-alpha.10 → 8.0.0-alpha.12

package/README.md

@@ -17,4 +17,4 @@ This module provides a memory-based implementation for the [Data Modeling Suppor
    *  [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)
    *  [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/types/blob.ts#L8)
-   *  [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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-memory",
-  "version": "8.0.0-alpha.10",
+  "version": "8.0.0-alpha.12",
   "type": "module",
   "description": "Memory backing for the travetto model module.",
   "keywords": [
@@ -26,15 +26,15 @@
     "directory": "module/model-memory"
   },
   "dependencies": {
-    "@travetto/config": "^8.0.0-alpha.10",
-    "@travetto/di": "^8.0.0-alpha.10",
-    "@travetto/model": "^8.0.0-alpha.10",
-    "@travetto/model-indexed": "^8.0.0-alpha.10",
-    "@travetto/schema": "^8.0.0-alpha.10"
+    "@travetto/config": "^8.0.0-alpha.11",
+    "@travetto/di": "^8.0.0-alpha.11",
+    "@travetto/model": "^8.0.0-alpha.11",
+    "@travetto/model-indexed": "^8.0.0-alpha.12",
+    "@travetto/schema": "^8.0.0-alpha.11"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.15",
-    "@travetto/test": "^8.0.0-alpha.10"
+    "@travetto/cli": "^8.0.0-alpha.16",
+    "@travetto/test": "^8.0.0-alpha.11"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/service.ts

@@ -8,10 +8,11 @@ import {
   type ModelType, type ModelCrudSupport, type ModelExpirySupport, type ModelStorageSupport, ModelRegistryIndex,
   NotFoundError, ExistsError, type OptionalId, type ModelBlobSupport, ModelCrudUtil, ModelExpiryUtil, ModelStorageUtil,
   IndexNotSupported,
+  type ModelListOptions,
 } from '@travetto/model';
 import {
-  type ModelIndexedSupport, type KeyedIndexSelection, type KeyedIndexBody, type ListPageOptions, ModelIndexedUtil,
-  type SingleItemIndex, type SortedIndexSelection, type ListPageResult, type SortedIndex,
+  type ModelIndexedSupport, type KeyedIndexSelection, type KeyedIndexBody, type ModelPageOptions, ModelIndexedUtil,
+  type SingleItemIndex, type SortedIndexSelection, type ModelPageResult, type SortedIndex,
   type AllIndexes, isModelIndexedIndex, type FullKeyedIndexBody, type FullKeyedIndexWithPartialBody, ModelIndexedComputedIndex,
 } from '@travetto/model-indexed';
 
@@ -150,10 +151,18 @@ export class MemoryModelService implements
     const index = this.#indices[idx.type].get(indexName(cls, idx))?.get(computed.getKey());
     let id: string | undefined;
     if (index) {
-      if (index instanceof Map) {
-        id = getFirstId(index, computed.getSort()); // Grab first id
-      } else if (index instanceof Set) {
-        id = getFirstId(index); // Grab first id
+      if (computed.idPart) {
+        if (index.has(computed.idPart.value)) {
+          id = computed.idPart.value;
+        } else {
+          throw new NotFoundError(cls, computed.getKey({ sort: true }));
+        }
+      } else {
+        if (index instanceof Map) {
+          id = getFirstId(index, computed.getSort()); // Grab first id
+        } else if (index instanceof Set) {
+          id = getFirstId(index); // Grab first id
+        }
       }
     }
     if (id) {
@@ -162,11 +171,39 @@ export class MemoryModelService implements
     throw new NotFoundError(cls, computed.getKey({ sort: true }));
   }
 
-  #getIndexIds<
+  async * #iterateIds<T extends ModelType>(
+    ids: string[],
+    options?: ModelListOptions & ModelPageOptions<number>
+
+  ): AsyncIterable<string[]> {
+    let offset = options && 'offset' in options ? options.offset ?? 0 : 0;
+    const batchSize = options?.batchSizeHint ?? 100;
+    let produced = 0;
+    const maxCount = options?.limit ?? Number.MAX_SAFE_INTEGER;
+    while (offset < ids.length && produced < maxCount) {
+      if (options?.abort?.aborted) {
+        break;
+      }
+      const end = Math.min(offset + batchSize, ids.length, maxCount - produced + offset);
+      const batch = ids.slice(offset, end);
+      if (batch.length) {
+        yield batch;
+      }
+      offset += batchSize;
+      produced += batch.length;
+    }
+  }
+
+  async * #getIndexIds<
     T extends ModelType,
     K extends KeyedIndexSelection<T>,
     S extends SortedIndexSelection<T>
-  >(cls: Class<T>, idx: AllIndexes<T, K, S>, body: KeyedIndexBody<T, K>): string[] {
+  >(
+    cls: Class<T>,
+    idx: AllIndexes<T, K, S>,
+    body: KeyedIndexBody<T, K>,
+    options?: ModelListOptions & ModelPageOptions<number>
+  ): AsyncIterable<string[]> {
     const computed = ModelIndexedComputedIndex.get(idx, body).validate();
     if (!isModelIndexedIndex(idx)) {
       throw new IndexNotSupported(cls, idx, 'Only ModelIndexed indices can be used with MemoryModelService');
@@ -174,13 +211,15 @@ export class MemoryModelService implements
 
     const base = this.#indices[idx.type].get(indexName(cls, idx));
     const index = base?.get(computed.getKey());
+    let ids: string[];
     if (!index) {
-      return [];
+      ids = [];
     } else if (index instanceof Map) {
-      return [...index.entries()].toSorted((a, b) => a[1] - b[1]).map(([id,]) => id);
+      ids = [...index.entries()].toSorted((a, b) => a[1] - b[1]).map(([id,]) => id);
     } else {
-      return [...index];
+      ids = [...index];
     }
+    yield* this.#iterateIds(ids, options);
   }
 
   @PostConstruct()
@@ -253,15 +292,9 @@ export class MemoryModelService implements
     await this.#persist(cls, where, 'remove');
   }
 
-  async * list<T extends ModelType>(cls: Class<T>): AsyncIterable<T> {
-    for (const id of this.#getStore(cls).keys()) {
-      try {
-        yield await this.get(cls, id);
-      } catch (error) {
-        if (!(error instanceof NotFoundError)) {
-          throw error;
-        }
-      }
+  async * list<T extends ModelType>(cls: Class<T>, options?: ModelListOptions): AsyncIterable<T[]> {
+    for await (const batch of this.#iterateIds([...this.#getStore(cls).keys()], options)) {
+      yield ModelCrudUtil.filterOutNotFound(batch.map(id => this.get(cls, id)));
     }
   }
 
@@ -400,7 +433,7 @@ export class MemoryModelService implements
     return this.update(cls, item);
   }
 
-  async listByIndex<
+  async pageByIndex<
     T extends ModelType,
     K extends KeyedIndexSelection<T>,
     S extends SortedIndexSelection<T>
@@ -408,16 +441,31 @@ export class MemoryModelService implements
     cls: Class<T>,
     idx: SortedIndex<T, K, S>,
     body: KeyedIndexBody<T, K>,
-    options?: ListPageOptions
-  ): Promise<ListPageResult<T>> {
-    const ids = this.#getIndexIds(cls, idx, body);
+    options?: ModelPageOptions
+  ): Promise<ModelPageResult<T>> {
     const offset = options?.offset ? JSONUtil.fromBase64<number>(options.offset) : 0;
-    const limit = options?.limit ?? 100;
+    let produced = 0;
 
     const items: T[] = [];
-    for (const id of ids.slice(offset, offset + limit)) {
-      items.push(await this.get(cls, id));
+    for await (const batch of this.#getIndexIds(cls, idx, body, { limit: 100, ...options, offset })) {
+      produced += batch.length;
+      items.push(...await ModelCrudUtil.filterOutNotFound(batch.map(id => this.get(cls, id))));
+    }
+    return { items, nextOffset: items.length ? JSONUtil.toBase64(offset + produced) : undefined };
+  }
+
+  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>,
+    options?: ModelListOptions
+  ): AsyncIterable<T[]> {
+    for await (const batch of this.#getIndexIds(cls, idx, body, options)) {
+      yield ModelCrudUtil.filterOutNotFound(batch.map(id => this.get(cls, id)));
     }
-    return { items, nextOffset: items.length ? JSONUtil.toBase64(offset + items.length) : undefined };
   }
 }