@travetto/model-memory 5.0.13 → 5.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-memory",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "description": "Memory backing for the travetto model module.",
   "keywords": [
     "datastore",
@@ -25,14 +25,14 @@
     "directory": "module/model-memory"
   },
   "dependencies": {
-    "@travetto/config": "^5.0.12",
-    "@travetto/di": "^5.0.12",
-    "@travetto/model": "^5.0.13",
-    "@travetto/schema": "^5.0.12"
+    "@travetto/config": "^5.0.14",
+    "@travetto/di": "^5.0.14",
+    "@travetto/model": "^5.0.15",
+    "@travetto/schema": "^5.0.14"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.15",
-    "@travetto/test": "^5.0.14"
+    "@travetto/cli": "^5.0.17",
+    "@travetto/test": "^5.0.16"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/service.ts

@@ -65,7 +65,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
     return this.#store.get(key)!;
   }
 
-  #find<T extends ModelType>(cls: Class<T> | string, id?: string, errorState?: 'data' | 'notfound'): StoreType {
+  #find<T extends ModelType>(cls: Class<T> | string, id?: string, errorState?: 'exists' | 'notfound'): StoreType {
     const store = this.#getStore(cls);
 
     if (id && errorState && (errorState === 'notfound' ? !store.has(id) : store.has(id))) {
@@ -185,7 +185,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
     if (!item.id) {
       item.id = this.idSource.create();
     }
-    this.#find(cls, item.id, 'data');
+    this.#find(cls, item.id, 'exists');
     return await this.upsert(cls, item);
   }
 
@@ -279,7 +279,18 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
 
   // Expiry
   async deleteExpired<T extends ModelType>(cls: Class<T>): Promise<number> {
-    return ModelExpiryUtil.naiveDeleteExpired(this, cls);
+    const store = this.#getStore(cls);
+    let deleted = 0;
+    for (const key of [...store.keys()]) {
+      try {
+        const res = await ModelCrudUtil.load(cls, store.get(key)!);
+        if (ModelExpiryUtil.getExpiryState(cls, res).expired) {
+          store.delete(key);
+          deleted += 1;
+        }
+      } catch { } // Do not let a single error stop the process
+    }
+    return deleted;
   }
 
   // Storage Support
@@ -292,7 +303,6 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
     this.#indices.unsorted.clear();
   }
 
-
   async createModel<T extends ModelType>(cls: Class<T>): Promise<void> {
     for (const idx of ModelRegistry.get(cls).indices ?? []) {
       if (idx.type === 'sorted' || idx.type === 'unsorted') {