@travetto/model 4.1.3 → 4.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",

package/src/provider/file.ts

@@ -221,7 +221,17 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
   // Expiry
   async deleteExpired<T extends ModelType>(cls: Class<T>): Promise<number> {
-    return ModelExpiryUtil.naiveDeleteExpired(this, cls);
+    let deleted = 0;
+    for await (const [_id, file] of FileModelService.scanFolder(await this.#resolveName(cls, '.json'), '.json')) {
+      try {
+        const res = await ModelCrudUtil.load(cls, await fs.readFile(file));
+        if (ModelExpiryUtil.getExpiryState(cls, res).expired) {
+          await fs.rm(file, { force: true });
+          deleted += 1;
+        }
+      } catch { } // Don't let a single failure stop the process
+    }
+    return deleted;
   }
 
   // Storage management

package/src/provider/memory.ts

@@ -281,7 +281,18 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
 
   // 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