@travetto/model 2.2.1 → 2.2.4

package/bin/cli-model_export.ts

@@ -1,10 +1,10 @@
-import { BaseModelPlugin } from './lib/base-cli-plugin';
+import { BaseModelCommand } from './lib/base-command';
 import { ModelExportUtil } from './lib/export';
 
 /**
  * CLI Entry point for exporting model schemas
  */
-export class ModelExportPlugin extends BaseModelPlugin {
+export class ModelExportCommand extends BaseModelCommand {
   name = 'model:export';
   op = 'exportModel' as const;
 

package/bin/cli-model_install.ts

@@ -1,12 +1,12 @@
 import { color } from '@travetto/cli/src/color';
 
-import { BaseModelPlugin } from './lib/base-cli-plugin';
+import { BaseModelCommand } from './lib/base-command';
 import { ModelInstallUtil } from './lib/install';
 
 /**
  * CLI Entry point for installing models
  */
-export class ModelInstallPlugin extends BaseModelPlugin {
+export class ModelInstallCommand extends BaseModelCommand {
   name = 'model:install';
   op = 'createModel' as const;
 

package/bin/lib/{base-cli-plugin.ts → base-command.ts}

@@ -1,4 +1,4 @@
-import { BasePlugin, OptionConfig } from '@travetto/cli/src/plugin-base';
+import { CliCommand, OptionConfig } from '@travetto/cli/src/command';
 import { color } from '@travetto/cli/src/color';
 import { EnvInit } from '@travetto/base/bin/init';
 import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
@@ -12,7 +12,7 @@ type Options = {
 /**
  * CLI Entry point for exporting model schemas
  */
-export abstract class BaseModelPlugin extends BasePlugin<Options> {
+export abstract class BaseModelCommand extends CliCommand<Options> {
 
   restoreEnv?: (err: Error) => unknown;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/model",
   "displayName": "Data Modeling Support",
-  "version": "2.2.1",
+  "version": "2.2.4",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -28,13 +28,13 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/di": "^2.2.1",
-    "@travetto/config": "^2.2.1",
-    "@travetto/registry": "^2.2.1",
-    "@travetto/schema": "^2.2.1"
+    "@travetto/di": "^2.2.4",
+    "@travetto/config": "^2.2.4",
+    "@travetto/registry": "^2.2.4",
+    "@travetto/schema": "^2.2.4"
   },
   "optionalPeerDependencies": {
-    "@travetto/cli": "^2.2.1"
+    "@travetto/cli": "^2.2.4"
   },
   "publishConfig": {
     "access": "public"

package/test-support/base.ts

@@ -50,4 +50,12 @@ export abstract class BaseModelSuite<T> {
   get service(): Promise<T> {
     return DependencyRegistry.getInstance(this.serviceClass);
   }
+
+  async toArray<U>(src: AsyncIterable<U> | AsyncGenerator<U>): Promise<U[]> {
+    const out: U[] = [];
+    for await (const el of src) {
+      out.push(el);
+    }
+    return out;
+  }
 }

package/test-support/crud.ts

@@ -217,7 +217,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
       people.map(el => service.upsert(Person, el))
     );
 
-    const found = (await service.list(Person).toArray()).sort((a, b) => a.age - b.age);
+    const found = (await this.toArray(service.list(Person))).sort((a, b) => a.age - b.age);
 
     assert(found[0].age === people[0].age);
     assert(found[1].age === people[1].age);

package/test-support/indexed.ts

@@ -123,13 +123,13 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
     await service.create(User3, User3.from({ name: 'bob', age: 30, color: 'red' }));
     await service.create(User3, User3.from({ name: 'bob', age: 50, color: 'green' }));
 
-    const arr = await service.listByIndex(User3, 'userAge', { name: 'bob' }).toArray();
+    const arr = await this.toArray(service.listByIndex(User3, 'userAge', { name: 'bob' }));
 
     assert(arr[0].color === 'red' && arr[0].name === 'bob');
     assert(arr[1].color === 'blue' && arr[1].name === 'bob');
     assert(arr[2].color === 'green' && arr[2].name === 'bob');
 
-    await assert.rejects(() => service.listByIndex(User3, 'userAge', {}).toArray(), IndexNotSupported);
+    await assert.rejects(() => this.toArray(service.listByIndex(User3, 'userAge', {})), IndexNotSupported);
   }
 
   @Test()
@@ -140,12 +140,12 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
     await service.create(User4, User4.from({ child: { name: 'bob', age: 30 }, color: 'red' }));
     await service.create(User4, User4.from({ child: { name: 'bob', age: 50 }, color: 'green' }));
 
-    const arr = await service.listByIndex(User4, 'childAge', User4.from({ child: { name: 'bob' } })).toArray();
+    const arr = await this.toArray(service.listByIndex(User4, 'childAge', User4.from({ child: { name: 'bob' } })));
     assert(arr[0].color === 'red' && arr[0].child.name === 'bob' && arr[0].child.age === 30);
     assert(arr[1].color === 'blue' && arr[1].child.name === 'bob' && arr[1].child.age === 40);
     assert(arr[2].color === 'green' && arr[2].child.name === 'bob' && arr[2].child.age === 50);
 
-    await assert.rejects(() => service.listByIndex(User4, 'childAge', {}).toArray(), IndexNotSupported);
+    await assert.rejects(() => this.toArray(service.listByIndex(User4, 'childAge', {})), IndexNotSupported);
   }
 
   @Test()
@@ -156,13 +156,13 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
     await service.create(User4, User4.from({ child: { name: 'bob', age: 30 }, createdDate: Util.timeFromNow('2d'), color: 'red' }));
     await service.create(User4, User4.from({ child: { name: 'bob', age: 50 }, createdDate: Util.timeFromNow('-1d'), color: 'green' }));
 
-    const arr = await service.listByIndex(User4, 'nameCreated', User4.from({ child: { name: 'bob' } })).toArray();
+    const arr = await this.toArray(service.listByIndex(User4, 'nameCreated', User4.from({ child: { name: 'bob' } })));
 
     assert(arr[0].color === 'green' && arr[0].child.name === 'bob' && arr[0].child.age === 50);
     assert(arr[1].color === 'red' && arr[1].child.name === 'bob' && arr[1].child.age === 30);
     assert(arr[2].color === 'blue' && arr[2].child.name === 'bob' && arr[2].child.age === 40);
 
-    await assert.rejects(() => service.listByIndex(User4, 'nameCreated', {}).toArray(), IndexNotSupported);
+    await assert.rejects(() => this.toArray(service.listByIndex(User4, 'nameCreated', {})), IndexNotSupported);
   }
 
   @Test()
@@ -173,7 +173,7 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
     const user2 = await service.upsertByIndex(User4, 'childAge', { child: { name: 'bob', age: 40 }, color: 'green' });
     const user3 = await service.upsertByIndex(User4, 'childAge', { child: { name: 'bob', age: 40 }, color: 'red' });
 
-    const arr = await service.listByIndex(User4, 'childAge', { child: { name: 'bob' } }).toArray();
+    const arr = await this.toArray(service.listByIndex(User4, 'childAge', { child: { name: 'bob' } }));
     assert(arr.length === 1);
 
     assert(user1.id === user2.id);
@@ -182,12 +182,12 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
     assert(user3.color === 'red');
 
     const user4 = await service.upsertByIndex(User4, 'childAge', { child: { name: 'bob', age: 30 }, color: 'red' });
-    const arr2 = await service.listByIndex(User4, 'childAge', { child: { name: 'bob' } }).toArray();
+    const arr2 = await this.toArray(service.listByIndex(User4, 'childAge', { child: { name: 'bob' } }));
     assert(arr2.length === 2);
 
     await service.deleteByIndex(User4, 'childAge', user1);
 
-    const arr3 = await service.listByIndex(User4, 'childAge', { child: { name: 'bob' } }).toArray();
+    const arr3 = await this.toArray(service.listByIndex(User4, 'childAge', { child: { name: 'bob' } }));
     assert(arr3.length === 1);
     assert(arr3[0].id === user4.id);
   }