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

package/support/test/basic.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 
+import { Model, type ModelCrudSupport, ModelCrudUtil, NotFoundError, TransientField } from '@travetto/model';
 import { Suite, Test } from '@travetto/test';
-import { type ModelCrudSupport, Model, NotFoundError, ModelCrudUtil, TransientField } from '@travetto/model';
 
 import { BaseModelSuite } from './base.ts';
 
@@ -27,7 +27,6 @@ class Person {
 
 @Suite()
 export abstract class ModelBasicSuite extends BaseModelSuite<ModelCrudSupport> {
-
   @Test('create, read, delete')
   async create() {
     const service = await this.service;
@@ -76,11 +75,14 @@ export abstract class ModelBasicSuite extends BaseModelSuite<ModelCrudSupport> {
   async testComputed() {
     const service = await this.service;
     const id = service.idSource.create();
-    await service.create(ComputedPerson, ComputedPerson.from({
-      id,
-      name: 'Bob',
-      ignoredField: 'secret'
-    }));
+    await service.create(
+      ComputedPerson,
+      ComputedPerson.from({
+        id,
+        name: 'Bob',
+        ignoredField: 'secret'
+      })
+    );
 
     const retrieved = await service.get(ComputedPerson, id);
     assert(retrieved.nameUpper === 'BOB');
@@ -98,4 +100,4 @@ export abstract class ModelBasicSuite extends BaseModelSuite<ModelCrudSupport> {
     assert(prepared.nameUpper === undefined);
     assert(prepared.ignoredField === undefined);
   }
-}
+}

package/support/test/blob.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 
-import { Suite, Test, TestFixtures } from '@travetto/test';
 import { BinaryMetadataUtil, BinaryUtil, Util } from '@travetto/runtime';
+import { Suite, Test, TestFixtures } from '@travetto/test';
 
 import { BaseModelSuite } from '@travetto/model/support/test/base.ts';
 
@@ -10,7 +10,6 @@ import { ModelBlobUtil } from '../../src/util/blob.ts';
 
 @Suite()
 export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
-
   fixture = new TestFixtures(['@travetto/model']);
 
   @Test()
@@ -90,7 +89,7 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
     const partialMeta = BinaryMetadataUtil.read(partial)!;
     const subContent = await partial.text();
     const range = BinaryMetadataUtil.enforceRange({ start: 10, end: 20 }, partialMeta);
-    assert(subContent.length === (range.end - range.start) + 1);
+    assert(subContent.length === range.end - range.start + 1);
 
     const og = await this.fixture.readUTF8('/text.txt');
 
@@ -100,7 +99,7 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
     const partialUnboundedMeta = BinaryMetadataUtil.read(partialUnbounded)!;
     const subContent2 = await partialUnbounded.text();
     const range2 = BinaryMetadataUtil.enforceRange({ start: 10 }, partialUnboundedMeta);
-    assert(subContent2.length === (range2.end - range2.start) + 1);
+    assert(subContent2.length === range2.end - range2.start + 1);
     assert(subContent2.startsWith('klm'));
     assert(subContent2.endsWith('xyz'));
 
@@ -156,19 +155,19 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
     const service = await this.service;
 
     const bytes = BinaryUtil.binaryArrayToBuffer(BinaryUtil.makeBinaryArray(1.5 * 10000));
-    for (let i = 0; i < bytes.byteLength; i++) {
+    for (let i = 0; i < bytes.byteLength; i += 1) {
       bytes.writeUInt8(Math.trunc(Math.random() * 255), i);
     }
 
     const writable = await service.getBlobWriteUrl!('largeFile/one', {
-      contentType: 'image/jpeg',
+      contentType: 'image/jpeg'
     });
 
     assert(writable);
 
     const response = await fetch(writable, {
       method: 'PUT',
-      body: new File([bytes], 'gary', { type: 'image/jpeg' }),
+      body: new File([bytes], 'gary', { type: 'image/jpeg' })
     });
 
     console.error(await response.text());
@@ -179,7 +178,7 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
       contentType: 'image/jpeg',
       title: 'orange',
       filename: 'gary',
-      size: bytes.byteLength,
+      size: bytes.byteLength
     });
 
     const found = await service.getBlob('largeFile/one');
@@ -189,4 +188,4 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
     assert(foundMeta.title === 'orange');
     assert(foundMeta.filename === 'gary');
   }
-}
+}

package/support/test/bulk.ts

@@ -14,7 +14,6 @@ class User {
 
 @Suite()
 export abstract class ModelBulkSuite extends BaseModelSuite<ModelBulkSupport> {
-
   @Test()
   async bulkInsert() {
     const service = await this.service;
@@ -48,11 +47,17 @@ export abstract class ModelBulkSuite extends BaseModelSuite<ModelBulkSupport> {
     const service = await this.service;
     const users = [0, 1, 2, 4].map(x => User.from({ name: `name-${x}`, id: service.idSource.create() }));
 
-    const result = await service.processBulk(User, users.map(u => ({ insert: u })));
+    const result = await service.processBulk(
+      User,
+      users.map(u => ({ insert: u }))
+    );
     assert(result.counts.insert === 4);
     assert(result.insertedIds.size === 4);
 
-    const res2 = await service.processBulk(User, users.map(u => ({ update: u })));
+    const res2 = await service.processBulk(
+      User,
+      users.map(u => ({ update: u }))
+    );
     assert(res2.counts.update === 4);
     assert(res2.insertedIds.size === 0);
   }
@@ -62,11 +67,17 @@ export abstract class ModelBulkSuite extends BaseModelSuite<ModelBulkSupport> {
     const service = await this.service;
     const users = [0, 1, 2, 4].map(x => User.from({ name: `name-${x}`, id: service.idSource.create() }));
 
-    const result = await service.processBulk(User, users.map(u => ({ insert: u })));
+    const result = await service.processBulk(
+      User,
+      users.map(u => ({ insert: u }))
+    );
     assert(result.counts.insert === 4);
     assert(result.insertedIds.size === 4);
 
-    const res2 = await service.processBulk(User, users.map(u => ({ delete: u })));
+    const res2 = await service.processBulk(
+      User,
+      users.map(u => ({ delete: u }))
+    );
     assert(res2.counts.delete === 4);
   }
 }

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);
   }
-}
+}