@travetto/model 3.1.3 → 3.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,13 +26,13 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^3.1.1",
+    "@travetto/config": "^3.1.2",
     "@travetto/di": "^3.1.1",
     "@travetto/registry": "^3.1.1",
-    "@travetto/schema": "^3.1.1"
+    "@travetto/schema": "^3.1.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.1.1",
+    "@travetto/cli": "^3.1.2",
     "@travetto/test": "^3.1.1"
   },
   "peerDependenciesMeta": {

package/src/provider/file.ts

@@ -211,13 +211,17 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
   // Expiry
   async deleteExpired<T extends ModelType>(cls: Class<T>): Promise<number> {
-    const deleted = [];
+    const deleting = [];
     for await (const el of this.list(cls)) {
       if (ModelExpiryUtil.getExpiryState(cls, el).expired) {
-        deleted.push(this.delete(cls, el.id));
+        deleting.push(this.delete(cls, el.id).catch(err => {
+          if (!(err instanceof NotFoundError)) {
+            throw err;
+          }
+        }));
       }
     }
-    return (await Promise.all(deleted)).length;
+    return (await Promise.all(deleting)).length;
   }
 
   // Storage management

package/src/provider/memory.ts

@@ -272,7 +272,11 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
     const store = this.#getStore(cls);
     for (const id of [...store.keys()]) {
       if ((ModelExpiryUtil.getExpiryState(cls, await this.get(cls, id))).expired) {
-        deleting.push(this.delete(cls, id));
+        deleting.push(this.delete(cls, id).catch(err => {
+          if (!(err instanceof NotFoundError)) {
+            throw err;
+          }
+        }));
       }
     }
     return (await Promise.all(deleting)).length;