@travetto/model-memory 6.0.0-rc.0 → 6.0.0-rc.2

package/README.md

@@ -14,7 +14,7 @@ yarn add @travetto/model-memory
 ```
 
 This module provides a memory-based implementation for the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations."). Supported features:
-   *  [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts#L11)
-   *  [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/service/expiry.ts#L11)
-   *  [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/service/indexed.ts#L12)
-   *  [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/service/blob.ts#L8)
+   *  [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/src/types/indexed.ts#L11)
+   *  [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/types/blob.ts#L8)

package/__index__.ts

@@ -1 +1 @@
-export * from './src/service';
+export * from './src/service.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-memory",
-  "version": "6.0.0-rc.0",
+  "version": "6.0.0-rc.2",
   "description": "Memory backing for the travetto model module.",
   "keywords": [
     "datastore",
@@ -25,14 +25,14 @@
     "directory": "module/model-memory"
   },
   "dependencies": {
-    "@travetto/config": "^6.0.0-rc.0",
-    "@travetto/di": "^6.0.0-rc.0",
-    "@travetto/model": "^6.0.0-rc.0",
-    "@travetto/schema": "^6.0.0-rc.0"
+    "@travetto/config": "^6.0.0-rc.2",
+    "@travetto/di": "^6.0.0-rc.2",
+    "@travetto/model": "^6.0.0-rc.2",
+    "@travetto/schema": "^6.0.0-rc.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^6.0.0-rc.0",
-    "@travetto/test": "^6.0.0-rc.0"
+    "@travetto/cli": "^6.0.0-rc.2",
+    "@travetto/test": "^6.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/service.ts

@@ -6,15 +6,11 @@ import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import {
   ModelType, IndexConfig, ModelCrudSupport, ModelExpirySupport, ModelStorageSupport, ModelIndexedSupport,
-  ModelRegistry, NotFoundError, ExistsError, OptionalId, ModelBlobSupport
+  ModelRegistry, NotFoundError, ExistsError, OptionalId, ModelBlobSupport,
+  ModelCrudUtil, ModelExpiryUtil, ModelIndexedUtil, ModelStorageUtil, ModelBlobUtil,
 } from '@travetto/model';
 
-import { ModelCrudUtil } from '@travetto/model/src/internal/service/crud';
-import { ModelExpiryUtil } from '@travetto/model/src/internal/service/expiry';
-import { ModelIndexedUtil } from '@travetto/model/src/internal/service/indexed';
-import { ModelStorageUtil } from '@travetto/model/src/internal/service/storage';
-import { MODEL_BLOB, ModelBlobNamespace, ModelBlobUtil } from '@travetto/model/src/internal/service/blob';
-
+const ModelBlobNamespace = '__blobs';
 const ModelBlobMetaNamespace = `${ModelBlobNamespace}_meta`;
 
 type StoreType = Map<string, Buffer>;
@@ -35,7 +31,7 @@ function getFirstId(data: Map<string, unknown> | Set<string>, value?: string | n
   if (data instanceof Set) {
     id = data.values().next().value;
   } else {
-    id = [...data.entries()].find(([k, v]) => value === undefined || v === value)?.[0];
+    id = [...data.entries()].find(([, v]) => value === undefined || v === value)?.[0];
   }
   return id;
 }
@@ -314,12 +310,12 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
   }
 
   async truncateModel<T extends ModelType>(cls: Class<T>): Promise<void> {
-    if (cls === MODEL_BLOB) {
-      this.#getStore(ModelBlobNamespace).clear();
-      this.#getStore(ModelBlobMetaNamespace).clear();
-    } else {
-      this.#getStore(cls).clear();
-    }
+    this.#getStore(cls).clear();
+  }
+
+  async truncateBlob(): Promise<void> {
+    this.#getStore(ModelBlobNamespace).clear();
+    this.#getStore(ModelBlobMetaNamespace).clear();
   }
 
   // Indexed
@@ -346,7 +342,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
           yield this.get(cls, id);
         }
       } else {
-        for (const id of [...index.entries()].sort((a, b) => +a[1] - +b[1]).map(([a, b]) => a)) {
+        for (const id of [...index.entries()].toSorted((a, b) => +a[1] - +b[1]).map(([a,]) => a)) {
           yield this.get(cls, id);
         }
       }