@travetto/model 5.0.13 → 5.0.15

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,14 +26,14 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^5.0.12",
-    "@travetto/di": "^5.0.12",
-    "@travetto/registry": "^5.0.12",
-    "@travetto/schema": "^5.0.12"
+    "@travetto/config": "^5.0.14",
+    "@travetto/di": "^5.0.14",
+    "@travetto/registry": "^5.0.14",
+    "@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/error/not-found.ts

@@ -4,7 +4,7 @@ import { Class, AppError } from '@travetto/runtime';
  * Represents when a model of cls and id cannot be found
  */
 export class NotFoundError extends AppError {
-  constructor(cls: Class | string, id: string, details?: Record<string, unknown>) {
+  constructor(cls: Class | string, id: string, details: Record<string, unknown> = {}) {
     super(`${typeof cls === 'string' ? cls : cls.name} with id ${id} not found`, { category: 'notfound', details });
   }
 }

package/src/internal/service/expiry.ts

@@ -3,7 +3,6 @@ import { ShutdownManager, Class, TimeSpan, TimeUtil, Util, castTo } from '@trave
 import { ModelRegistry } from '../../registry/model';
 import { ModelExpirySupport } from '../../service/expiry';
 import { ModelType } from '../../types/model';
-import { NotFoundError } from '../../error/not-found';
 
 /**
  * Utils for model expiry
@@ -44,22 +43,4 @@ export class ModelExpiryUtil {
       })();
     }
   }
-
-  /**
-   * Simple cull operation for a given model type
-   * @param svc
-   */
-  static async naiveDeleteExpired<T extends ModelType>(svc: ModelExpirySupport, cls: Class<T>, suppressErrors = false): Promise<number> {
-    const deleting = [];
-    for await (const el of svc.list(cls)) {
-      if (this.getExpiryState(cls, el).expired) {
-        deleting.push(svc.delete(cls, el.id).catch(err => {
-          if (!suppressErrors && !(err instanceof NotFoundError)) {
-            throw err;
-          }
-        }));
-      }
-    }
-    return (await Promise.all(deleting)).length;
-  }
 }

package/support/test/expiry.ts

@@ -11,10 +11,11 @@ import { NotFoundError } from '../../src/error/not-found';
 import { BaseModelSuite } from './base';
 
 @Model('expiry-user')
-class User {
+export class ExpiryUser {
   id: string;
   @ExpiresAt()
   expiresAt?: Date;
+  payload?: string;
 }
 
 @Suite()
@@ -33,63 +34,63 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   @Test()
   async basic() {
     const service = await this.service;
-    const res = await service.upsert(User, User.from({
+    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow('2s')
     }));
-    assert(res instanceof User);
+    assert(res instanceof ExpiryUser);
 
-    const expiry = ModelExpiryUtil.getExpiryState(User, await service.get(User, res.id));
+    const expiry = ModelExpiryUtil.getExpiryState(ExpiryUser, await service.get(ExpiryUser, res.id));
     assert(!expiry.expired);
   }
 
   @Test()
   async aging() {
     const service = await this.service;
-    const res = await service.upsert(User, User.from({
+    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow(100)
     }));
 
-    assert(res instanceof User);
+    assert(res instanceof ExpiryUser);
 
     await this.wait(200);
 
-    await assert.rejects(() => service.get(User, res.id), NotFoundError);
+    await assert.rejects(() => service.get(ExpiryUser, res.id), NotFoundError);
   }
 
   @Test()
   async updateExpired() {
     const service = await this.service;
-    const res = await service.upsert(User, User.from({
+    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow(100)
     }));
 
-    assert(res instanceof User);
+    assert(res instanceof ExpiryUser);
 
     await this.wait(200);
 
-    await assert.rejects(() => service.update(User, User.from({ id: res.id })), NotFoundError);
+    await assert.rejects(() => service.update(ExpiryUser, ExpiryUser.from({ id: res.id })), NotFoundError);
   }
 
   @Test()
   async ageWithExtension() {
     const service = await this.service;
-    const res = await service.upsert(User, User.from({
+    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow('2s')
     }));
-    assert(res instanceof User);
+    assert(res instanceof ExpiryUser);
 
     await this.wait(50);
 
-    assert(!ModelExpiryUtil.getExpiryState(User, (await service.get(User, res.id))).expired);
+    assert(!ModelExpiryUtil.getExpiryState(ExpiryUser, (await service.get(ExpiryUser, res.id))).expired);
 
-    await service.updatePartial(User, {
+    await service.updatePartial(ExpiryUser, {
       id: res.id,
       expiresAt: this.timeFromNow(100)
     });
 
     await this.wait(200);
 
-    await assert.rejects(() => service.get(User, res.id), NotFoundError);
+    await assert.rejects(() => service.get(ExpiryUser, res.id), NotFoundError);
   }
 
   @Test()
@@ -98,12 +99,12 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
 
     let total;
 
-    total = await this.getSize(User);
+    total = await this.getSize(ExpiryUser);
     assert(total === 0);
 
     // Create
     await Promise.all(
-      Array(10).fill(0).map((x, i) => service.upsert(User, User.from({
+      Array(10).fill(0).map((x, i) => service.upsert(ExpiryUser, ExpiryUser.from({
         expiresAt: this.timeFromNow(1000 + i * this.delayFactor)
       })))
     );
@@ -111,16 +112,16 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
     // Let expire
     await this.wait(1);
 
-    total = await this.getSize(User);
+    total = await this.getSize(ExpiryUser);
     assert(total === 10);
 
     // Let expire
     await this.wait(1100);
 
-    total = await this.getSize(User);
+    total = await this.getSize(ExpiryUser);
     assert(total === 0);
 
-    total = await this.getSize(User);
+    total = await this.getSize(ExpiryUser);
     assert(total === 0);
   }
 }

package/support/test/polymorphism.ts

@@ -161,13 +161,13 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
         service.upsert(Doctor, Doctor.from({
           id: fire.id, name: 'gob', specialty: 'eyes'
         })),
-      e => (e instanceof SubTypeNotSupportedError || e instanceof ExistsError) ? undefined : e
+      e => e instanceof SubTypeNotSupportedError || e instanceof ExistsError
     );
 
     await assert.rejects(
       () => service.update(Engineer, castTo(Doctor.from({ ...doc }))),
-      (e: Error) => (e instanceof NotFoundError || e instanceof SubTypeNotSupportedError || e instanceof TypeMismatchError) ? undefined : e);
-
+      e => e instanceof NotFoundError || e instanceof SubTypeNotSupportedError || e instanceof TypeMismatchError
+    );
     await timers.setTimeout(15);
 
     try {
@@ -189,7 +189,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     // Delete by wrong class
     await assert.rejects(
       () => service.delete(Doctor, fire.id),
-      e => (e instanceof SubTypeNotSupportedError || e instanceof NotFoundError) ? undefined : e
+      e => e instanceof SubTypeNotSupportedError || e instanceof NotFoundError
     );
 
     // Delete by base class
@@ -203,7 +203,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     // Delete by any subtype when id is missing
     await assert.rejects(
       () => service.delete(Firefighter, doc.id),
-      e => (e instanceof SubTypeNotSupportedError || e instanceof NotFoundError) ? undefined : e
+      e => e instanceof SubTypeNotSupportedError || e instanceof NotFoundError
     );
   }