@travetto/model 8.0.0-alpha.22 → 8.0.0-alpha.23

package/support/test/crud.ts

@@ -1,9 +1,9 @@
 import assert from 'node:assert';
 import timers from 'node:timers/promises';
 
+import { Model, type ModelCrudSupport, NotFoundError, PersistValue, PrePersist } from '@travetto/model';
+import { Precision, Required, Schema, Text } from '@travetto/schema';
 import { Suite, Test } from '@travetto/test';
-import { Schema, Text, Precision, Required, } from '@travetto/schema';
-import { type ModelCrudSupport, Model, NotFoundError, PersistValue, PrePersist } from '@travetto/model';
 
 import { BaseModelSuite } from './base.ts';
 
@@ -42,7 +42,7 @@ class SimpleList {
 }
 
 @Model()
-@PrePersist((item) => {
+@PrePersist(item => {
   item.name = `${item.name}-suffix`;
 })
 class User2 {
@@ -75,28 +75,27 @@ class BigIntModel {
 
 @Suite()
 export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
-
   indexLimitSkew = 0;
 
   @Test('save it')
   async save() {
     const service = await this.service;
 
-    const people = [1, 2, 3, 8].map(x => Person.from({
-      id: service.idSource.create(),
-      name: 'Bob',
-      age: 20 + x,
-      gender: 'm',
-      address: {
-        street1: 'a',
-        ...(x === 1 ? { street2: 'b' } : {})
-      }
-    }));
-
-    await Promise.all(
-      people.map(el => service.upsert(Person, el))
+    const people = [1, 2, 3, 8].map(x =>
+      Person.from({
+        id: service.idSource.create(),
+        name: 'Bob',
+        age: 20 + x,
+        gender: 'm',
+        address: {
+          street1: 'a',
+          ...(x === 1 ? { street2: 'b' } : {})
+        }
+      })
     );
 
+    await Promise.all(people.map(el => service.upsert(Person, el)));
+
     const single = await service.get(Person, people[2].id);
     assert(single !== undefined);
     assert(single.age === 23);
@@ -122,15 +121,18 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
   @Test('Verify partial update with field removal')
   async testPartialUpdate() {
     const service = await this.service;
-    const o = await service.create(Person, Person.from({
-      name: 'bob',
-      age: 20,
-      gender: 'm',
-      address: {
-        street1: 'road',
-        street2: 'roader'
-      }
-    }));
+    const o = await service.create(
+      Person,
+      Person.from({
+        name: 'bob',
+        age: 20,
+        gender: 'm',
+        address: {
+          street1: 'road',
+          street2: 'roader'
+        }
+      })
+    );
     assert(o.id);
     assert(o.name === 'bob');
 
@@ -147,7 +149,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
       id: o2.id,
       gender: 'f',
       address: {
-        street1: 'changed\n',
+        street1: 'changed\n'
       }
     });
 
@@ -169,20 +171,23 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
   @Test('Verify partial update with field removal and lists')
   async testPartialUpdateList() {
     const service = await this.service;
-    const o = await service.create(SimpleList, SimpleList.from({
-      names: ['a', 'b', 'c'],
-      simples: [
-        {
-          name: 'a',
-        },
-        {
-          name: 'b',
-        },
-        {
-          name: 'c',
-        }
-      ]
-    }));
+    const o = await service.create(
+      SimpleList,
+      SimpleList.from({
+        names: ['a', 'b', 'c'],
+        simples: [
+          {
+            name: 'a'
+          },
+          {
+            name: 'b'
+          },
+          {
+            name: 'c'
+          }
+        ]
+      })
+    );
 
     const o2 = await service.updatePartial(SimpleList, {
       id: o.id,
@@ -197,9 +202,12 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
   @Test('Verify partial update with field removal and lists')
   async testBlankPartialUpdate() {
     const service = await this.service;
-    const o = await service.create(User2, User2.from({
-      name: 'bob',
-    }));
+    const o = await service.create(
+      User2,
+      User2.from({
+        name: 'bob'
+      })
+    );
 
     assert(o.address === undefined);
     assert(o.name === 'bob-suffix');
@@ -247,21 +255,21 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
   async list() {
     const service = await this.service;
 
-    const people = [1, 2, 3].map(x => Person.from({
-      id: service.idSource.create(),
-      name: 'Bob',
-      age: 20 + x,
-      gender: 'm',
-      address: {
-        street1: 'a',
-        ...(x === 1 ? { street2: 'b' } : {})
-      }
-    }));
-
-    await Promise.all(
-      people.map(el => service.upsert(Person, el))
+    const people = [1, 2, 3].map(x =>
+      Person.from({
+        id: service.idSource.create(),
+        name: 'Bob',
+        age: 20 + x,
+        gender: 'm',
+        address: {
+          street1: 'a',
+          ...(x === 1 ? { street2: 'b' } : {})
+        }
+      })
     );
 
+    await Promise.all(people.map(el => service.upsert(Person, el)));
+
     const found = (await this.toArray(service.list(Person))).toSorted((a, b) => a.age - b.age);
 
     assert(found[0].age === people[0].age);
@@ -274,16 +282,21 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     const service = await this.service;
 
     await Promise.all(
-      [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => service.upsert(Person, Person.from({
-        id: service.idSource.create(),
-        name: 'Bob',
-        age: 20 + x,
-        gender: 'm',
-        address: {
-          street1: 'a',
-          ...(x === 1 ? { street2: 'b' } : {})
-        }
-      })))
+      [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x =>
+        service.upsert(
+          Person,
+          Person.from({
+            id: service.idSource.create(),
+            name: 'Bob',
+            age: 20 + x,
+            gender: 'm',
+            address: {
+              street1: 'a',
+              ...(x === 1 ? { street2: 'b' } : {})
+            }
+          })
+        )
+      )
     );
 
     const controller = new AbortController();
@@ -307,15 +320,17 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     const service = await this.service;
 
     const people = await Promise.all(
-      [1, 2, 3, 8].map((x, i) => service[i % 2 === 0 ? 'upsert' : 'create'](Person, {
-        name: 'Bob',
-        age: 20 + x,
-        gender: 'm',
-        address: {
-          street1: 'a',
-          ...(x === 1 ? { street2: 'b' } : {})
-        }
-      }))
+      [1, 2, 3, 8].map((x, i) =>
+        service[i % 2 === 0 ? 'upsert' : 'create'](Person, {
+          name: 'Bob',
+          age: 20 + x,
+          gender: 'm',
+          address: {
+            street1: 'a',
+            ...(x === 1 ? { street2: 'b' } : {})
+          }
+        })
+      )
     );
 
     const single = await service.get(Person, people[2].id);
@@ -365,10 +380,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     const service = await this.service;
     const o = await service.create(SimpleList, {
       names: ['rob', 'tom'],
-      simples: [
-        { name: 'roger' },
-        { name: 'dodger' }
-      ]
+      simples: [{ name: 'roger' }, { name: 'dodger' }]
     });
     assert(o.names.length === 2);
     assert(o.simples);
@@ -390,10 +402,13 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     const service = await this.service;
 
     // Create with bigint values
-    const created = await service.create(BigIntModel, BigIntModel.from({
-      largeNumber: 9007199254740991n, // Number.MAX_SAFE_INTEGER as bigint
-      optionalBigInt: 1234567890123456789n
-    }));
+    const created = await service.create(
+      BigIntModel,
+      BigIntModel.from({
+        largeNumber: 9007199254740991n, // Number.MAX_SAFE_INTEGER as bigint
+        optionalBigInt: 1234567890123456789n
+      })
+    );
 
     assert(created.id);
     assert.strictEqual(created.largeNumber, 9007199254740991n);
@@ -405,11 +420,14 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     assert.strictEqual(retrieved.optionalBigInt, 1234567890123456789n);
 
     // Update with new bigint value
-    const updated = await service.update(BigIntModel, BigIntModel.from({
-      id: created.id,
-      largeNumber: 18014398509481982n,
-      optionalBigInt: undefined
-    }));
+    const updated = await service.update(
+      BigIntModel,
+      BigIntModel.from({
+        id: created.id,
+        largeNumber: 18014398509481982n,
+        optionalBigInt: undefined
+      })
+    );
 
     assert.strictEqual(updated.largeNumber, 18014398509481982n);
     assert.strictEqual(updated.optionalBigInt, undefined);
@@ -419,4 +437,4 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     assert.strictEqual(final.largeNumber, 18014398509481982n);
     assert(!final.optionalBigInt);
   }
-}
+}

package/support/test/expiry.ts

@@ -1,13 +1,13 @@
 import assert from 'node:assert';
 import timers from 'node:timers/promises';
 
-import { Suite, Test } from '@travetto/test';
 import { type TimeSpan, TimeUtil } from '@travetto/runtime';
+import { Suite, Test } from '@travetto/test';
 
+import { NotFoundError } from '../../src/error/not-found.ts';
 import { ExpiresAt, Model } from '../../src/registry/decorator.ts';
 import type { ModelExpirySupport } from '../../src/types/expiry.ts';
 import { ModelExpiryUtil } from '../../src/util/expiry.ts';
-import { NotFoundError } from '../../src/error/not-found.ts';
 import { BaseModelSuite } from './base.ts';
 
 @Model('expiry-user')
@@ -20,7 +20,6 @@ export class ExpiryUser {
 
 @Suite()
 export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport> {
-
   delayFactor: number = 1;
 
   async wait(input: TimeSpan | number | string) {
@@ -34,9 +33,12 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   @Test()
   async basic() {
     const service = await this.service;
-    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
-      expiresAt: this.timeFromNow('2s')
-    }));
+    const result = await service.upsert(
+      ExpiryUser,
+      ExpiryUser.from({
+        expiresAt: this.timeFromNow('2s')
+      })
+    );
     assert(result instanceof ExpiryUser);
 
     const expiry = ModelExpiryUtil.getExpiryState(ExpiryUser, await service.get(ExpiryUser, result.id));
@@ -46,9 +48,12 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   @Test()
   async aging() {
     const service = await this.service;
-    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
-      expiresAt: this.timeFromNow(100)
-    }));
+    const result = await service.upsert(
+      ExpiryUser,
+      ExpiryUser.from({
+        expiresAt: this.timeFromNow(100)
+      })
+    );
 
     assert(result instanceof ExpiryUser);
 
@@ -60,9 +65,12 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   @Test()
   async updateExpired() {
     const service = await this.service;
-    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
-      expiresAt: this.timeFromNow(100)
-    }));
+    const result = await service.upsert(
+      ExpiryUser,
+      ExpiryUser.from({
+        expiresAt: this.timeFromNow(100)
+      })
+    );
 
     assert(result instanceof ExpiryUser);
 
@@ -74,14 +82,17 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   @Test()
   async ageWithExtension() {
     const service = await this.service;
-    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
-      expiresAt: this.timeFromNow('2s')
-    }));
+    const result = await service.upsert(
+      ExpiryUser,
+      ExpiryUser.from({
+        expiresAt: this.timeFromNow('2s')
+      })
+    );
     assert(result instanceof ExpiryUser);
 
     await this.wait(50);
 
-    assert(!ModelExpiryUtil.getExpiryState(ExpiryUser, (await service.get(ExpiryUser, result.id))).expired);
+    assert(!ModelExpiryUtil.getExpiryState(ExpiryUser, await service.get(ExpiryUser, result.id)).expired);
 
     await service.updatePartial(ExpiryUser, {
       id: result.id,
@@ -97,16 +108,23 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   async culling() {
     const service = await this.service;
 
-    let total;
+    let total: number;
 
     total = await this.getSize(ExpiryUser);
     assert(total === 0);
 
     // Create
     await Promise.all(
-      Array(10).fill(0).map((x, i) => service.upsert(ExpiryUser, ExpiryUser.from({
-        expiresAt: this.timeFromNow(300 + i * this.delayFactor)
-      })))
+      Array(10)
+        .fill(0)
+        .map((x, i) =>
+          service.upsert(
+            ExpiryUser,
+            ExpiryUser.from({
+              expiresAt: this.timeFromNow(300 + i * this.delayFactor)
+            })
+          )
+        )
     );
 
     // Let expire
@@ -124,4 +142,4 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
     total = await this.getSize(ExpiryUser);
     assert(total === 0);
   }
-}
+}

package/support/test/polymorphism.ts

@@ -1,16 +1,12 @@
 import assert from 'node:assert';
 import timers from 'node:timers/promises';
 
-import { Suite, Test } from '@travetto/test';
+import { Model, type ModelCrudSupport, NotFoundError, PersistValue, SubTypeNotSupportedError } from '@travetto/model';
 import { castTo } from '@travetto/runtime';
-import { Schema, DiscriminatorField, Text, TypeMismatchError } from '@travetto/schema';
-import {
-  type ModelCrudSupport, Model,
-  NotFoundError, SubTypeNotSupportedError, PersistValue
-} from '@travetto/model';
+import { DiscriminatorField, Schema, Text, TypeMismatchError } from '@travetto/schema';
+import { Suite, Test } from '@travetto/test';
 
 import { ExistsError } from '../../src/error/exists.ts';
-
 import { BaseModelSuite } from './base.ts';
 
 @Schema()
@@ -44,7 +40,6 @@ export class Engineer extends Worker {
 
 @Suite()
 export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSupport> {
-
   @Test('Polymorphic create and find')
   async polymorphicCreateAndFind() {
     const service = await this.service;
@@ -58,9 +53,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     assert(doc instanceof Doctor);
     assert(doc.updatedDate !== undefined);
 
-    await assert.rejects(
-      () => service.get(Engineer, doc.id),
-      NotFoundError);
+    await assert.rejects(() => service.get(Engineer, doc.id), NotFoundError);
 
     assert(doc instanceof Doctor);
     assert(fire instanceof Firefighter);
@@ -92,10 +85,13 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     const engineers = await this.toArray(service.list(Engineer));
     assert(engineers.length === 1);
 
-    await service.create(Engineer, Engineer.from({
-      major: 'foodService',
-      name: 'bob2'
-    }));
+    await service.create(
+      Engineer,
+      Engineer.from({
+        major: 'foodService',
+        name: 'bob2'
+      })
+    );
 
     const all2 = await this.toArray(service.list(Worker));
     assert(all2.length === 4);
@@ -115,16 +111,21 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
 
     await this.saveAll(Worker, [doc, fire, eng]);
 
-    assert(await service.get(Worker, doc.id) instanceof Doctor);
-    assert(await service.get(Worker, fire.id) instanceof Firefighter);
+    assert((await service.get(Worker, doc.id)) instanceof Doctor);
+    assert((await service.get(Worker, fire.id)) instanceof Firefighter);
 
     const update = new Date();
 
     await assert.rejects(
       () =>
-        service.upsert(Doctor, Doctor.from({
-          id: fire.id, name: 'gob', specialty: 'eyes'
-        })),
+        service.upsert(
+          Doctor,
+          Doctor.from({
+            id: fire.id,
+            name: 'gob',
+            specialty: 'eyes'
+          })
+        ),
       e => e instanceof SubTypeNotSupportedError || e instanceof ExistsError
     );
 
@@ -135,18 +136,28 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     await timers.setTimeout(15);
 
     try {
-      const result = await service.upsert(Doctor, Doctor.from({
-        id: doc.id, name: 'gob', specialty: 'eyes'
-      }));
+      const result = await service.upsert(
+        Doctor,
+        Doctor.from({
+          id: doc.id,
+          name: 'gob',
+          specialty: 'eyes'
+        })
+      );
 
       assert(result.updatedDate!.getTime() > update.getTime());
     } catch (err) {
       assert(err instanceof SubTypeNotSupportedError);
     }
 
-    const resAlt = await service.upsert(Worker, Doctor.from({
-      id: doc.id, name: 'gob', specialty: 'eyes'
-    }));
+    const resAlt = await service.upsert(
+      Worker,
+      Doctor.from({
+        id: doc.id,
+        name: 'gob',
+        specialty: 'eyes'
+      })
+    );
 
     assert(resAlt.updatedDate!.getTime() > update.getTime());
 
@@ -159,10 +170,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     // Delete by base class
     await service.delete(Worker, fire.id);
 
-    await assert.rejects(
-      () => service.delete(Worker, fire.id),
-      NotFoundError
-    );
+    await assert.rejects(() => service.delete(Worker, fire.id), NotFoundError);
 
     // Delete by any subtype when id is missing
     await assert.rejects(
@@ -170,4 +178,4 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
       e => e instanceof SubTypeNotSupportedError || e instanceof NotFoundError
     );
   }
-}
+}

package/support/test/suite.ts

@@ -1,16 +1,16 @@
-import { type Class } from '@travetto/runtime';
 import { DependencyRegistryIndex } from '@travetto/di';
 import { Registry } from '@travetto/registry';
-import { SuiteRegistryIndex, TestFixtures, type SuitePhaseHandler } from '@travetto/test';
+import type { Class } from '@travetto/runtime';
 import { SchemaRegistryIndex } from '@travetto/schema';
+import { type SuitePhaseHandler, SuiteRegistryIndex, TestFixtures } from '@travetto/test';
 
+import { ModelRegistryIndex } from '../../src/registry/registry-index.ts';
 import { ModelBlobUtil } from '../../src/util/blob.ts';
 import { ModelStorageUtil } from '../../src/util/storage.ts';
-import { ModelRegistryIndex } from '../../src/registry/registry-index.ts';
 
-type ConfigType = { autoCreate?: boolean, namespace?: string };
+type ConfigType = { autoCreate?: boolean; namespace?: string };
 
-class ModelSuiteHandler<T extends { configClass: Class<ConfigType>, serviceClass: Class }> implements SuitePhaseHandler<T> {
+class ModelSuiteHandler<T extends { configClass: Class<ConfigType>; serviceClass: Class }> implements SuitePhaseHandler<T> {
   qualifier?: symbol;
   target: Class<T>;
   constructor(target: Class<T>, qualifier?: symbol) {
@@ -35,9 +35,11 @@ class ModelSuiteHandler<T extends { configClass: Class<ConfigType>, serviceClass
     if (ModelStorageUtil.isSupported(service)) {
       await service.createStorage();
       if (service.upsertModel) {
-        await Promise.all(ModelRegistryIndex.getClasses()
-          .filter(cls => cls === SchemaRegistryIndex.getBaseClass(cls))
-          .map(modelCls => service.upsertModel!(modelCls)));
+        await Promise.all(
+          ModelRegistryIndex.getClasses()
+            .filter(cls => cls === SchemaRegistryIndex.getBaseClass(cls))
+            .map(modelCls => service.upsertModel!(modelCls))
+        );
       }
     }
   }
@@ -45,8 +47,7 @@ class ModelSuiteHandler<T extends { configClass: Class<ConfigType>, serviceClass
   async afterEach(instance: T) {
     const service = await DependencyRegistryIndex.getInstance<T>(instance.serviceClass, this.qualifier);
     if (ModelStorageUtil.isSupported(service)) {
-      const models = ModelRegistryIndex.getClasses()
-        .filter(model => model === SchemaRegistryIndex.getBaseClass(model));
+      const models = ModelRegistryIndex.getClasses().filter(model => model === SchemaRegistryIndex.getBaseClass(model));
 
       if (ModelBlobUtil.isSupported(service) && service.truncateBlob) {
         await service.truncateBlob();
@@ -83,7 +84,9 @@ class ModelSuiteHandler<T extends { configClass: Class<ConfigType>, serviceClass
  * @example opt-in
  * @kind decorator
  */
-export function ModelSuite<T extends { configClass: Class<{ autoCreate?: boolean, namespace?: string }>, serviceClass: Class }>(qualifier?: symbol) {
+export function ModelSuite<T extends { configClass: Class<{ autoCreate?: boolean; namespace?: string }>; serviceClass: Class }>(
+  qualifier?: symbol
+) {
   const fixtures = new TestFixtures(['@travetto/model']);
   return (target: Class<T>): void => {
     target.prototype.fixtures = fixtures;
@@ -91,4 +94,4 @@ export function ModelSuite<T extends { configClass: Class<{ autoCreate?: boolean
       phaseHandlers: [new ModelSuiteHandler(target, qualifier)]
     });
   };
-}
+}