@travetto/model 3.0.0-rc.2 → 3.0.0-rc.21

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model/DOC.ts and execute "npx trv doc" to rebuild -->
 # Data Modeling Support
 ## Datastore abstraction for core operations.
 
@@ -8,11 +8,11 @@
 npm install @travetto/model
 ```
 
-This module provides a set of contracts/interfaces to data model persistence, modification and retrieval.  This module builds heavily upon the [Schema](https://github.com/travetto/travetto/tree/main/module/schema#readme "Data type registry for runtime validation, reflection and binding. "), which is used for data model validation.
+This module provides a set of contracts/interfaces to data model persistence, modification and retrieval.  This module builds heavily upon the [Schema](https://github.com/travetto/travetto/tree/main/module/schema#readme "Data type registry for runtime validation, reflection and binding."), which is used for data model validation.
 
 ## Contracts
 
-The module is mainly composed of contracts.  The contracts define the expected interface for various model patterns. The primary contracts are [Basic](https://github.com/travetto/travetto/tree/main/module/model/src/service/basic.ts#L9), [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts#L11), [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/service/indexed.ts#L12), [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/service/expiry.ts#L11), [Streaming](https://github.com/travetto/travetto/tree/main/module/model/src/service/stream.ts#L3) and [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L23).
+The module is mainly composed of contracts.  The contracts define the expected interface for various model patterns. The primary contracts are [Basic](https://github.com/travetto/travetto/tree/main/module/model/src/service/basic.ts#L9), [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts#L11), [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/service/indexed.ts#L12), [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/service/expiry.ts#L11), [Streaming](https://github.com/travetto/travetto/tree/main/module/model/src/service/stream.ts#L3) and [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L19).
 
 ### [Basic](https://github.com/travetto/travetto/tree/main/module/model/src/service/basic.ts#L9)
 All [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") implementations, must honor the BasicCrud contract to be able to participate in the model ecosystem.  This contract represents the bare minimum for a model service.
@@ -184,7 +184,7 @@ export interface ModelStreamSupport {
 }
 ```
 
-### [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L23)
+### [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L19)
 
 Finally, there is support for bulk operations.  This is not to simply imply issuing many commands at in parallel, but implementation support for an atomic/bulk operation.  This should allow for higher throughput on data ingest, and potentially for atomic support on transactions.  
 
@@ -222,7 +222,7 @@ export interface ModelType {
 }
 ```
 
-All fields are optional, but the `id` and `type` are important as those field types are unable to be changed.  This may make using existing data models impossible if types other than strings are required.  Additionally, the type field, is intended to record the base model type and cannot be remapped. This is important to support polymorphism, not only in [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations."), but also in [Schema](https://github.com/travetto/travetto/tree/main/module/schema#readme "Data type registry for runtime validation, reflection and binding. ").
+All fields are optional, but the `id` and `type` are important as those field types are unable to be changed.  This may make using existing data models impossible if types other than strings are required.  Additionally, the type field, is intended to record the base model type and cannot be remapped. This is important to support polymorphism, not only in [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations."), but also in [Schema](https://github.com/travetto/travetto/tree/main/module/schema#readme "Data type registry for runtime validation, reflection and binding.").
 
 ## Implementations
 
@@ -236,7 +236,7 @@ All fields are optional, but the `id` and `type` are important as those field ty
 |[S3 Model Support](https://github.com/travetto/travetto/tree/main/module/model-s3#readme "S3 backing for the travetto model module.")|X|X| |X|X| |
 |[SQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-sql#readme "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.")|X|X|X|X| |X|
 |[MemoryModelService](https://github.com/travetto/travetto/tree/main/module/model/src/provider/memory.ts#L54)|X|X|X|X|X|X|
-|[FileModelService](https://github.com/travetto/travetto/tree/main/module/model/src/provider/file.ts#L49)|X|X| |X|X|X|
+|[FileModelService](https://github.com/travetto/travetto/tree/main/module/model/src/provider/file.ts#L51)|X|X| |X|X|X|
 
 ## Custom Model Service
 In addition to the provided contracts, the module also provides common utilities and shared test suites.  The common utilities are useful for
@@ -245,8 +245,7 @@ repetitive functionality, that is unable to be shared due to not relying upon in
 **Code: Memory Service**
 ```typescript
 import { Readable } from 'stream';
-import { StreamUtil } from '@travetto/boot';
-import { Util, Class, TimeSpan } from '@travetto/base';
+import { StreamUtil, Class, TimeSpan } from '@travetto/base';
 import { DeepPartial } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
@@ -265,6 +264,7 @@ import { ModelIndexedUtil } from '../internal/service/indexed';
 import { ModelStorageUtil } from '../internal/service/storage';
 import { StreamModel, STREAMS } from '../internal/service/stream';
 import { IndexConfig } from '../registry/types';
+import { ModelUtil } from '../internal/util';
 const STREAM_META = `${STREAMS}_meta`;
 type StoreType = Map<string, Buffer>;
 @Config('model.memory')
@@ -274,7 +274,7 @@ export class MemoryModelConfig {
   cullRate?: number | TimeSpan;
 }
 function indexName<T extends ModelType>(cls: Class<T>, idx: IndexConfig<T> | string, suffix?: string): string {
-  return [cls.ᚕid, typeof idx === 'string' ? idx : idx.name, suffix].filter(x => !!x).join(':');
+  return [cls.Ⲑid, typeof idx === 'string' ? idx : idx.name, suffix].filter(x => !!x).join(':');
 }
 function getFirstId(data: Map<string, unknown> | Set<string>, value?: string | number): string | undefined {
   let id: string | undefined;
@@ -331,12 +331,12 @@ To enforce that these contracts are honored, the module provides shared test sui
 import { Suite } from '@travetto/test';
 
 import { MemoryModelConfig, MemoryModelService } from '../src/provider/memory';
-import { ModelCrudSuite } from '../test-support/crud';
-import { ModelExpirySuite } from '../test-support/expiry';
-import { ModelStreamSuite } from '../test-support/stream';
-import { ModelIndexedSuite } from '../test-support/indexed';
-import { ModelBasicSuite } from '../test-support/basic';
-import { ModelPolymorphismSuite } from '../test-support/polymorphism';
+import { ModelCrudSuite } from '../support/test/crud';
+import { ModelExpirySuite } from '../support/test/expiry';
+import { ModelStreamSuite } from '../support/test/stream';
+import { ModelIndexedSuite } from '../support/test/indexed';
+import { ModelBasicSuite } from '../support/test/basic';
+import { ModelPolymorphismSuite } from '../support/test/polymorphism';
 
 @Suite()
 export class MemoryBasicSuite extends ModelBasicSuite {

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@travetto/model",
-  "displayName": "Data Modeling Support",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.21",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -17,30 +16,36 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
-    "bin",
+    "__index__.ts",
     "src",
-    "test-support"
+    "support"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/di": "^3.0.0-rc.2",
-    "@travetto/config": "^3.0.0-rc.2",
-    "@travetto/registry": "^3.0.0-rc.2",
-    "@travetto/schema": "^3.0.0-rc.2"
+    "@travetto/config": "^3.0.0-rc.21",
+    "@travetto/di": "^3.0.0-rc.20",
+    "@travetto/registry": "^3.0.0-rc.20",
+    "@travetto/schema": "^3.0.0-rc.21"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.0.0-rc.0"
+    "@travetto/cli": "^3.0.0-rc.20",
+    "@travetto/test": "^3.0.0-rc.23"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {
       "optional": true
+    },
+    "@travetto/test": {
+      "optional": true
     }
   },
+  "travetto": {
+    "displayName": "Data Modeling Support"
+  },
   "publishConfig": {
     "access": "public"
   }

package/src/internal/service/crud.ts

@@ -1,6 +1,6 @@
-import * as crypto from 'crypto';
+import crypto from 'crypto';
 
-import { Class, Util } from '@travetto/base';
+import { Class, ObjectUtil } from '@travetto/base';
 import { SchemaRegistry, SchemaValidator } from '@travetto/schema';
 
 import { ModelRegistry } from '../../registry/model';
@@ -41,7 +41,7 @@ export class ModelCrudUtil {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const result = ModelRegistry.getBaseModel(cls).from(input as object) as T;
 
-    if (!(result instanceof cls || result.constructor.ᚕid === cls.ᚕid)) {
+    if (!(result instanceof cls || result.constructor.Ⲑid === cls.Ⲑid)) {
       if (onTypeMismatch === 'notfound') {
         throw new NotFoundError(cls, result.id);
       } else {
@@ -66,7 +66,7 @@ export class ModelCrudUtil {
       item.id = idSource.uuid();
     }
 
-    if (Util.isPlainObject(item)) {
+    if (ObjectUtil.isPlainObject(item)) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       item = cls.from(item as object);
     }
@@ -95,7 +95,7 @@ export class ModelCrudUtil {
    * @param getExisting How to fetch an existing item
    */
   static async naivePartialUpdate<T extends ModelType>(cls: Class<T>, item: Partial<T>, view: undefined | string, getExisting: () => Promise<T>): Promise<T> {
-    if (Util.isPlainObject(item)) {
+    if (ObjectUtil.isPlainObject(item)) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       item = cls.from(item as object);
     }

package/src/internal/service/expiry.ts

@@ -1,4 +1,4 @@
-import { Class, ShutdownManager, Util, TimeSpan } from '@travetto/base';
+import { ShutdownManager, Class, TimeSpan, TimeUtil } from '@travetto/base';
 
 import { ModelRegistry } from '../../registry/model';
 import { ModelExpirySupport } from '../../service/expiry';
@@ -33,19 +33,18 @@ export class ModelExpiryUtil {
     const cullable = ModelRegistry.getClasses().filter(cls => !!ModelRegistry.get(cls).expiresAt);
     if (svc.deleteExpired && cullable.length) {
       let running = true;
-      const cullInterval = Util.timeToMs(svc.config?.cullRate ?? '10m');
+      const cullInterval = TimeUtil.timeToMs(svc.config?.cullRate ?? '10m');
 
-      ShutdownManager.onShutdown({
+      ShutdownManager.onShutdown(this, {
         close(cb) {
           running = false;
           cb?.();
-        },
-        name: 'expiry-culling'
+        }
       });
       (async (): Promise<void> => {
-        await Util.wait('1s');  // Wait a second to start culling
+        await TimeUtil.wait('1s');  // Wait a second to start culling
         while (running) {
-          await Util.wait(cullInterval);
+          await TimeUtil.wait(cullInterval);
           await Promise.all(cullable.map(cls => svc.deleteExpired(cls)));
         }
       })();

package/src/internal/service/indexed.ts

@@ -118,7 +118,7 @@ export class ModelIndexedUtil {
     opts?: ComputeConfig & { sep?: string }
   ): { type: string, key: string, sort?: number | Date } {
     const { fields, sorted } = this.computeIndexParts(cls, idx, item, { ...(opts ?? {}), includeSortInFields: false });
-    const key = fields.map(({ value }) => value).map(x => `${x}`).join(opts?.sep ?? 'ᚕ');
+    const key = fields.map(({ value }) => value).map(x => `${x}`).join(opts?.sep ?? 'Ⲑ');
     const cfg = typeof idx === 'string' ? ModelRegistry.getIndex(cls, idx) : idx;
     return !sorted ? { type: cfg.type, key } : { type: cfg.type, key, sort: sorted.value };
   }

package/src/internal/service/storage.ts

@@ -1,5 +1,4 @@
-import { EnvUtil } from '@travetto/boot';
-import { AppManifest, Class } from '@travetto/base';
+import { Class, GlobalEnv } from '@travetto/base';
 import { SchemaChangeListener } from '@travetto/schema';
 
 import { ModelRegistry } from '../../registry/model';
@@ -14,7 +13,7 @@ export class ModelStorageUtil {
    * Register change listener on startup
    */
   static async registerModelChangeListener(storage: ModelStorageSupport, target?: Class): Promise<void> {
-    if (!EnvUtil.isDynamic() || !(storage?.config?.autoCreate ?? !AppManifest.prod)) {
+    if (!GlobalEnv.dynamic || !(storage?.config?.autoCreate ?? !GlobalEnv.prod)) {
       return;
     }
 

package/src/internal/util.ts

@@ -0,0 +1,7 @@
+import { Util } from '@travetto/base';
+
+export class ModelUtil {
+  static uuid(len: number = 32): string {
+    return Util.uuid(len);
+  }
+}

package/src/provider/file.ts

@@ -1,11 +1,12 @@
-import * as fs from 'fs/promises';
+import fs from 'fs/promises';
 import { createReadStream } from 'fs';
-import * as os from 'os';
-import * as path from 'path';
+
+import os from 'os';
+
 import { Readable } from 'stream';
 
-import { FsUtil, PathUtil, StreamUtil } from '@travetto/boot';
-import { Class, Util, TimeSpan } from '@travetto/base';
+import { path, RootIndex } from '@travetto/manifest';
+import { StreamUtil, Class, TimeSpan } from '@travetto/base';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { Required } from '@travetto/schema';
@@ -21,6 +22,7 @@ import { ModelExpiryUtil } from '../internal/service/expiry';
 import { NotFoundError } from '../error/not-found';
 import { ExistsError } from '../error/exists';
 import { StreamModel, STREAMS } from '../internal/service/stream';
+import { ModelUtil } from '../internal/util';
 
 type Suffix = '.bin' | '.meta' | '.json' | '.expires';
 
@@ -36,12 +38,12 @@ export class FileModelConfig {
   cullRate?: number | TimeSpan;
 
   async postConstruct(): Promise<void> {
-    if (!this.folder) {
-      this.folder = PathUtil.resolveUnix(os.tmpdir(), Util.uuid().substring(0, 10));
-    }
+    this.folder ??= path.resolve(os.tmpdir(), `trv_file_${RootIndex.mainModule.name.replace(/[^a-z]/ig, '_')}`);
   }
 }
 
+const exists = (f: string): Promise<boolean> => fs.stat(f).then(() => true, () => false);
+
 /**
  * Standard file support
  */
@@ -50,9 +52,9 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
   private static async * scanFolder(folder: string, suffix: string): AsyncGenerator<[id: string, field: string]> {
     for (const sub of await fs.readdir(folder)) {
-      for (const file of await fs.readdir(PathUtil.resolveUnix(folder, sub))) {
+      for (const file of await fs.readdir(path.resolve(folder, sub))) {
         if (file.endsWith(suffix)) {
-          yield [file.replace(suffix, ''), PathUtil.resolveUnix(folder, sub, file)];
+          yield [file.replace(suffix, ''), path.resolve(folder, sub, file)];
         }
       }
     }
@@ -64,31 +66,28 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
   /**
    * The root location for all activity
-   *
-   * @param folder
    */
   constructor(public readonly config: FileModelConfig) { }
 
   async #resolveName<T extends ModelType>(cls: Class<T> | string, suffix?: Suffix, id?: string): Promise<string> {
     const name = typeof cls === 'string' ? cls : ModelRegistry.getStore(cls);
-    let resolved = PathUtil.resolveUnix(this.config.folder, this.config.namespace, name);
+    let resolved = path.resolve(this.config.folder, this.config.namespace, name);
     if (id) {
-      resolved = PathUtil.resolveUnix(resolved, id.replace(/^[/]/, '').substring(0, 3));
+      resolved = path.resolve(resolved, id.replace(/^[/]/, '').substring(0, 3));
     }
     let dir = resolved;
     if (id) {
-      resolved = PathUtil.resolveUnix(resolved, `${id}${suffix}`);
+      resolved = path.resolve(resolved, `${id}${suffix}`);
       dir = path.dirname(resolved);
     }
-    if (!await FsUtil.exists(dir)) {
-      await fs.mkdir(dir, { recursive: true });
-    }
+
+    await fs.mkdir(dir, { recursive: true });
     return resolved;
   }
 
   async #find<T extends ModelType>(cls: Class<T> | string, suffix: Suffix, id?: string): Promise<string> {
     const file = await this.#resolveName(cls, suffix, id);
-    if (id && !(await FsUtil.exists(file))) {
+    if (id && !(await exists(file))) {
       throw new NotFoundError(cls, id);
     }
     return file;
@@ -107,7 +106,7 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
   }
 
   uuid(): string {
-    return Util.uuid(32);
+    return ModelUtil.uuid(32);
   }
 
   async get<T extends ModelType>(cls: Class<T>, id: string): Promise<T> {
@@ -115,7 +114,7 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
     const file = await this.#resolveName(cls, '.json', id);
 
-    if (await FsUtil.exists(file)) {
+    if (await exists(file)) {
       const content = await StreamUtil.streamToBuffer(createReadStream(file));
       return this.checkExpiry(cls, await ModelCrudUtil.load(cls, content));
     }
@@ -130,7 +129,7 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
     const file = await this.#resolveName(cls, '.json', item.id);
 
-    if (await FsUtil.exists(file)) {
+    if (await exists(file)) {
       throw new ExistsError(cls, item.id!);
     }
 
@@ -203,7 +202,7 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
   async deleteStream(location: string): Promise<void> {
     const file = await this.#resolveName(STREAMS, BIN, location);
-    if (await FsUtil.exists(file)) {
+    if (await exists(file)) {
       await Promise.all([
         fs.unlink(file),
         fs.unlink(file.replace('.bin', META))
@@ -226,15 +225,15 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
 
   // Storage management
   async createStorage(): Promise<void> {
-    const dir = PathUtil.resolveUnix(this.config.folder, this.config.namespace);
+    const dir = path.resolve(this.config.folder, this.config.namespace);
     await fs.mkdir(dir, { recursive: true });
   }
 
   async deleteStorage(): Promise<void> {
-    await FsUtil.unlinkRecursive(PathUtil.resolveUnix(this.config.folder, this.config.namespace));
+    await fs.rm(path.resolve(this.config.folder, this.config.namespace), { recursive: true, force: true });
   }
 
   async truncateModel(cls: Class<ModelType>): Promise<void> {
-    await FsUtil.unlinkRecursive(await this.#resolveName(cls === StreamModel ? STREAMS : cls));
+    await fs.rm(await this.#resolveName(cls === StreamModel ? STREAMS : cls), { recursive: true, force: true });
   }
 }

package/src/provider/memory.ts

@@ -1,7 +1,6 @@
 import { Readable } from 'stream';
 
-import { StreamUtil } from '@travetto/boot';
-import { Util, Class, TimeSpan } from '@travetto/base';
+import { StreamUtil, Class, TimeSpan } from '@travetto/base';
 import { DeepPartial } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
@@ -21,6 +20,7 @@ import { ModelIndexedUtil } from '../internal/service/indexed';
 import { ModelStorageUtil } from '../internal/service/storage';
 import { StreamModel, STREAMS } from '../internal/service/stream';
 import { IndexConfig } from '../registry/types';
+import { ModelUtil } from '../internal/util';
 
 const STREAM_META = `${STREAMS}_meta`;
 
@@ -34,7 +34,7 @@ export class MemoryModelConfig {
 }
 
 function indexName<T extends ModelType>(cls: Class<T>, idx: IndexConfig<T> | string, suffix?: string): string {
-  return [cls.ᚕid, typeof idx === 'string' ? idx : idx.name, suffix].filter(x => !!x).join(':');
+  return [cls.Ⲑid, typeof idx === 'string' ? idx : idx.name, suffix].filter(x => !!x).join(':');
 }
 
 function getFirstId(data: Map<string, unknown> | Set<string>, value?: string | number): string | undefined {
@@ -119,9 +119,9 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
     }
   }
 
-  async #write<T extends ModelType>(cls: Class<T>, item: T, action: 'remove'): Promise<void>;
-  async #write<T extends ModelType>(cls: Class<T>, item: T, action: 'write'): Promise<T>;
-  async #write<T extends ModelType>(cls: Class<T>, item: T, action: 'write' | 'remove'): Promise<T | void> {
+  async #persist<T extends ModelType>(cls: Class<T>, item: T, action: 'remove'): Promise<void>;
+  async #persist<T extends ModelType>(cls: Class<T>, item: T, action: 'write'): Promise<T>;
+  async #persist<T extends ModelType>(cls: Class<T>, item: T, action: 'write' | 'remove'): Promise<T | void> {
     const store = this.#getStore(cls);
     await this.#removeIndices(cls, item.id);
     if (action === 'write') {
@@ -159,7 +159,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
       for (const idx of ModelRegistry.get(el).indices ?? []) {
         switch (idx.type) {
           case 'unique': {
-            console.error('Unique indices are not supported for', { cls: el.ᚕid, idx: idx.name });
+            console.error('Unique indices are not supported for', { cls: el.Ⲑid, idx: idx.name });
             break;
           }
         }
@@ -169,7 +169,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
 
   // CRUD Support
   uuid(): string {
-    return Util.uuid(32);
+    return ModelUtil.uuid(32);
   }
 
   async get<T extends ModelType>(cls: Class<T>, id: string): Promise<T> {
@@ -208,13 +208,13 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
       await ModelCrudUtil.load(cls, store.get(item.id)!, 'exists');
     }
     const prepped = await ModelCrudUtil.preStore(cls, item, this);
-    return await this.#write(cls, prepped, 'write');
+    return await this.#persist(cls, prepped, 'write');
   }
 
   async updatePartial<T extends ModelType>(cls: Class<T>, item: Partial<T> & { id: string }, view?: string): Promise<T> {
     const id = item.id;
     const clean = await ModelCrudUtil.naivePartialUpdate(cls, item, view, () => this.get(cls, id));
-    return await this.#write(cls, clean, 'write');
+    return await this.#persist(cls, clean, 'write');
   }
 
   async delete<T extends ModelType>(cls: Class<T>, id: string): Promise<void> {
@@ -224,7 +224,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
     }
     await ModelCrudUtil.load(cls, store.get(id)!);
     const where: ModelType = { id };
-    await this.#write(cls, where, 'remove');
+    await this.#persist(cls, where, 'remove');
   }
 
   async * list<T extends ModelType>(cls: Class<T>): AsyncIterable<T> {

package/src/registry/decorator.ts

@@ -7,7 +7,7 @@ import { IndexConfig, ModelOptions } from './types';
 /**
  * Model decorator, extends `@Schema`
  *
- * @augments `@trv:schema/Schema`
+ * @augments `@travetto/schema:Schema`
  */
 export function Model(conf: Partial<ModelOptions<ModelType>> | string = {}) {
   return function <T extends ModelType, U extends Class<T>>(target: U): U {
@@ -31,7 +31,7 @@ export function Index<T>(...indices: IndexConfig<any>[]) {
 
 /**
  * Model field decorator for denoting expiry date/time
- * @augments `@trv:schema/Field`
+ * @augments `@travetto/schema:Field`
  */
 export function ExpiresAt() {
   return <K extends string, T extends Partial<Record<K, Date>>>(tgt: T, prop: K): void => {

package/src/registry/model.ts

@@ -1,3 +1,4 @@
+import { RootIndex } from '@travetto/manifest';
 import { SchemaRegistry } from '@travetto/schema';
 import { MetadataRegistry } from '@travetto/registry';
 import { DependencyRegistry } from '@travetto/di';
@@ -51,12 +52,12 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
   }
 
   createPending(cls: Class): Partial<ModelOptions<ModelType>> {
-    return { class: cls, indices: [], autoCreate: true, baseType: cls.ᚕabstract };
+    return { class: cls, indices: [], autoCreate: true, baseType: RootIndex.getFunctionMetadata(cls)?.abstract };
   }
 
   onInstallFinalize(cls: Class): ModelOptions<ModelType> {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const config = this.pending.get(cls.ᚕid)! as ModelOptions<ModelType>;
+    const config = this.pending.get(cls.Ⲑid)! as ModelOptions<ModelType>;
 
     const schema = SchemaRegistry.get(cls);
     const view = schema.views[AllViewⲐ].schema;
@@ -145,11 +146,11 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
       if (candidates.length > 1) {
         if (config.store) {
           throw new AppError('Duplicate models with same store name', 'general', {
-            classes: candidates.map(x => x.ᚕid)
+            classes: candidates.map(x => x.Ⲑid)
           });
         } else {
           throw new AppError('Duplicate models with same class name, but no store name provided', 'general', {
-            classes: candidates.map(x => x.ᚕid)
+            classes: candidates.map(x => x.Ⲑid)
           });
         }
       }

package/src/registry/types.ts

@@ -1,5 +1,4 @@
-import { Class } from '@travetto/base';
-import { Primitive } from '@travetto/base/src/internal/global-types';
+import { Primitive, Class } from '@travetto/base';
 
 import { ModelType } from '../types/model';
 

package/src/service/bulk.ts

@@ -4,10 +4,6 @@ import { ValidationResultError } from '@travetto/schema';
 import { ModelCrudSupport } from './crud';
 import { ModelType, OptionalId } from '../types/model';
 
-declare global {
-  interface Error { toJSON(sub?: unknown): unknown }
-}
-
 /**
  * Bulk operation. Each operation has a single action and payload
  */
@@ -52,9 +48,8 @@ export class BulkProcessError extends AppError {
   /**
    * Provide full results back, with validation errors
    */
-  override toJSON(extra: Record<string, unknown> = {}): unknown {
+  override toJSON(): unknown {
     return {
-      ...extra,
       at: new Date(),
       message: this.message,
       category: this.category,

package/{bin/lib → support/bin}/candidate.ts

@@ -1,8 +1,11 @@
-import { CliUtil } from '@travetto/cli/src/util';
-import { ExecUtil } from '@travetto/boot';
+import { RootIndex } from '@travetto/manifest';
+import { Class, ExecUtil } from '@travetto/base';
+import { GlobalTerminal } from '@travetto/terminal';
+import { ModelRegistry } from '@travetto/model';
+import { InjectableConfig, DependencyRegistry } from '@travetto/di';
+import { RootRegistry } from '@travetto/registry';
 
-import type { Class } from '@travetto/base';
-import type { InjectableConfig } from '@travetto/di';
+import { ModelStorageSupportTarget } from '@travetto/model/src/internal/service/common';
 
 import type { ModelStorageSupport } from '../../src/service/storage';
 import type { ModelType } from '../../src/types/model';
@@ -14,13 +17,16 @@ type CandidateNames = { providers: string[], models: string[] };
  */
 export class ModelCandidateUtil {
 
+  static async export(op: keyof ModelStorageSupport): Promise<{ models: string[], providers: string[] }> {
+    return { models: await this.getModelNames(), providers: await this.getProviderNames(op) };
+  }
+
   /**
    * Get all models
    */
   static async #getModels(models?: string[]): Promise<Class<ModelType>[]> {
     const names = new Set(models ?? []);
     const all = names.has('*');
-    const { ModelRegistry } = await import('@travetto/model');
     return ModelRegistry.getClasses()
       .map(x => ModelRegistry.getBaseModel(x))
       .filter(x => !models || all || names.has(ModelRegistry.getStore(x)));
@@ -30,7 +36,6 @@ export class ModelCandidateUtil {
    * Get model names
    */
   static async getModelNames(): Promise<string[]> {
-    const { ModelRegistry } = await import('@travetto/model');
     return (await this.#getModels()).map(x => ModelRegistry.getStore(x)).sort();
   }
 
@@ -38,8 +43,6 @@ export class ModelCandidateUtil {
    * Get all providers that are viable candidates
    */
   static async getProviders(op?: keyof ModelStorageSupport): Promise<InjectableConfig[]> {
-    const { DependencyRegistry } = await import('@travetto/di');
-    const { ModelStorageSupportTarget } = await import('@travetto/model/src/internal/service/common');
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const types = DependencyRegistry.getCandidateTypes<ModelStorageSupport>(ModelStorageSupportTarget as unknown as Class<ModelStorageSupport>);
     return types.filter(x => !op || x.class.prototype[op]);
@@ -58,7 +61,6 @@ export class ModelCandidateUtil {
    * Get a single provider
    */
   static async getProvider(provider: string): Promise<ModelStorageSupport> {
-    const { DependencyRegistry } = await import('@travetto/di');
     const config = (await this.getProviders()).find(x => x.class.name === `${provider}ModelService`)!;
     return DependencyRegistry.getInstance<ModelStorageSupport>(config.class, config.qualifier);
   }
@@ -68,9 +70,10 @@ export class ModelCandidateUtil {
    * @returns
    */
   static async getCandidates(op: keyof ModelStorageSupport): Promise<CandidateNames> {
-    return CliUtil.waiting('Resolving', () =>
-      ExecUtil.workerMain<CandidateNames>(require.resolve('../candidate'), [op]).message
-    );
+    return GlobalTerminal.withWaiting('Resolving', ExecUtil.worker<CandidateNames>(
+      RootIndex.resolveFileImport('@travetto/cli/support/cli.ts'),
+      ['main', '@travetto/model/support/bin/candidate.ts', op]
+    ).message);
   }
 
   /**
@@ -85,4 +88,12 @@ export class ModelCandidateUtil {
       models: await this.#getModels(models)
     };
   }
+}
+
+/**
+ * Handles direct invocation
+ */
+export async function main(op: keyof ModelStorageSupport): Promise<{ models: string[], providers: string[] }> {
+  await RootRegistry.init();
+  return await ModelCandidateUtil.export(op);
 }

package/{bin/lib → support/bin}/install.ts

@@ -1,4 +1,4 @@
-import type { Class } from '@travetto/base';
+import { ShutdownManager, type Class } from '@travetto/base';
 import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
 import type { ModelType } from '@travetto/model/src/types/model';
 
@@ -8,9 +8,9 @@ export class ModelInstallUtil {
       throw new Error(`${provider} does not support model installation`);
     }
     for (const m of models) {
-      console.log('Installing', { name: m.ᚕid });
+      console.log('Installing', { name: m.Ⲑid });
       await provider.createModel(m);
     }
-    (await import('@travetto/base')).ShutdownManager.execute(-1); // Release database
+    ShutdownManager.execute(-1); // Release database
   }
 }

package/support/cli.base-command.ts

@@ -0,0 +1,54 @@
+import { CliCommand, cliTpl, OptionConfig } from '@travetto/cli';
+import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
+
+import { ModelCandidateUtil } from './bin/candidate';
+
+type Options = {
+  env: OptionConfig<string>;
+};
+
+/**
+ * CLI Entry point for exporting model schemas
+ */
+export abstract class BaseModelCommand extends CliCommand<Options> {
+
+  restoreEnv?: (err: Error) => unknown;
+
+  op: keyof ModelStorageSupport;
+
+  resolve = ModelCandidateUtil.resolve.bind(ModelCandidateUtil);
+
+  getArgs(): string {
+    return '[provider] [models...]';
+  }
+
+  getOptions(): Options {
+    return { env: this.option({ desc: 'Application environment' }) };
+  }
+
+  usage({ providers, models }: { providers: string[], models: string[] }, err = ''): Promise<void> {
+    return this.showHelp(err, cliTpl`   
+${{ title: 'Providers' }}:
+${providers.map(p => cliTpl`  * ${{ type: p }}`).join('\n')}
+
+${{ title: 'Models' }}:
+${models.map(p => cliTpl`  * ${{ param: p }}`).join('\n')}
+`, false);
+  }
+
+  async validate(provider: string, models: string[]): Promise<true | void> {
+    const candidates = await ModelCandidateUtil.getCandidates(this.op);
+    if (!provider) {
+      return this.usage(candidates);
+    } else {
+      if (!candidates.providers.includes(provider)) {
+        return this.usage(candidates, cliTpl`${{ param: provider }} is not a valid provider`);
+      }
+      const badModel = models.find(x => x !== '*' && !candidates.models.includes(x));
+      if (badModel) {
+        return this.usage(candidates, cliTpl`${{ param: badModel }} is not a valid model`);
+      }
+    }
+    return true;
+  }
+}

package/{bin/cli-model_export.ts → support/cli.model_export.ts}

@@ -1,5 +1,8 @@
-import { BaseModelCommand } from './lib/base-command';
-import { ModelExportUtil } from './lib/export';
+import { ConsoleManager } from '@travetto/base';
+import { RootRegistry } from '@travetto/registry';
+
+import { BaseModelCommand } from './cli.base-command';
+import { ModelExportUtil } from './bin/export';
 
 /**
  * CLI Entry point for exporting model schemas
@@ -10,7 +13,13 @@ export class ModelExportCommand extends BaseModelCommand {
 
   async action(provider: string, models: string[]): Promise<void> {
     try {
-      await this.validate(provider, models);
+      ConsoleManager.setDebug(false);
+      await RootRegistry.init();
+
+      if (!await this.validate(provider, models)) {
+        return this.exit(1);
+      }
+
       const resolved = await this.resolve(provider, models);
       await ModelExportUtil.run(resolved.provider, resolved.models);
     } catch (err) {

package/support/cli.model_install.ts

@@ -0,0 +1,31 @@
+import { cliTpl } from '@travetto/cli';
+import { ConsoleManager } from '@travetto/base';
+import { RootRegistry } from '@travetto/registry';
+
+import { BaseModelCommand } from './cli.base-command';
+import { ModelInstallUtil } from './bin/install';
+
+/**
+ * CLI Entry point for installing models
+ */
+export class ModelInstallCommand extends BaseModelCommand {
+  name = 'model:install';
+  op = 'createModel' as const;
+
+  async action(provider: string, models: string[]): Promise<void> {
+    try {
+      ConsoleManager.setDebug(false);
+      await RootRegistry.init();
+
+      if (!await this.validate(provider, models)) {
+        return this.exit(1);
+      }
+
+      const resolved = await this.resolve(provider, models);
+      await ModelInstallUtil.run(resolved.provider, resolved.models);
+      console.log(cliTpl`${{ success: 'Successfully' }} installed ${{ param: models.length.toString() }} model(s)`);
+    } catch (err) {
+      console.error((err && err instanceof Error) ? err.message : err);
+    }
+  }
+}

package/support/doc.support.ts

@@ -0,0 +1,46 @@
+import { readFileSync } from 'fs';
+
+import { RootIndex } from '@travetto/manifest';
+import { d, mod } from '@travetto/doc';
+import { Config } from '@travetto/config';
+import { AllType, AllTypeMap } from '@travetto/doc/src/nodes';
+
+export const Links = {
+  Basic: d.SnippetLink('Basic', '@travetto/model/src/service/basic.ts', /export interface/),
+  Crud: d.SnippetLink('CRUD', '@travetto/model/src/service/crud.ts', /export interface/),
+  Expiry: d.SnippetLink('Expiry', '@travetto/model/src/service/expiry.ts', /export interface/),
+  Indexed: d.SnippetLink('Indexed', '@travetto/model/src/service/indexed.ts', /export interface/),
+  Bulk: d.SnippetLink('Bulk', '@travetto/model/src/service/bulk.ts', /export interface/),
+  Stream: d.SnippetLink('Streaming', '@travetto/model/src/service/stream.ts', /export interface/),
+};
+
+export const ModelTypes = (file: string | Function): AllTypeMap['SnippetLink'][] => {
+  if (typeof file !== 'string') {
+    file = RootIndex.getFunctionMetadata(file)!.source;
+  }
+  const contents = readFileSync(file, 'utf8');
+  const found: AllTypeMap['SnippetLink'][] = [];
+  const seen = new Set();
+  for (const [, key] of contents.matchAll(/Model(Crud|Expiry|Indexed|Bulk|Stream)Support/g)) {
+    if (!seen.has(key)) {
+      seen.add(key);
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      found.push(Links[key as keyof typeof Links]);
+    }
+  }
+  return found;
+};
+
+export const ModelCustomConfig = (cfg: Function): AllType => d`
+    Out of the box, by installing the module, everything should be wired up by default.If you need to customize any aspect of the source 
+    or config, you can override and register it with the ${mod.Di} module.
+
+    ${d.Code('Wiring up a custom Model Source', 'doc/custom-service.ts')}
+
+  where the ${cfg} is defined by:
+
+  ${d.Code(`Structure of ${cfg.name}`, cfg)}
+
+  Additionally, you can see that the class is registered with the ${Config} annotation, and so these values can be overridden using the 
+  standard ${mod.Config}resolution paths. 
+  `;

package/{test-support → support/test}/base.ts

@@ -1,8 +1,8 @@
 import { DependencyRegistry } from '@travetto/di';
 import { AppError, Class } from '@travetto/base';
 
-import { isBulkSupported, isCrudSupported } from '../src/internal/service/common';
-import { ModelType } from '../src/types/model';
+import { isBulkSupported, isCrudSupported } from '../../src/internal/service/common';
+import { ModelType } from '../../src/types/model';
 import { ModelSuite } from './suite';
 
 type ServiceClass = { serviceClass: { new(): unknown } };

package/{test-support → support/test}/basic.ts

@@ -1,9 +1,9 @@
-import * as assert from 'assert';
+import assert from 'assert';
 
 import { Suite, Test } from '@travetto/test';
+import { ModelCrudSupport, Model, NotFoundError } from '@travetto/model';
 
 import { BaseModelSuite } from './base';
-import { ModelCrudSupport, Model, NotFoundError } from '..';
 
 @Model('basic_person')
 class Person {

package/{test-support → support/test}/bulk.ts

@@ -1,9 +1,9 @@
-import * as assert from 'assert';
+import assert from 'assert';
 
 import { Suite, Test } from '@travetto/test';
 
-import { Model } from '../src/registry/decorator';
-import { ModelBulkSupport } from '../src/service/bulk';
+import { Model } from '../../src/registry/decorator';
+import { ModelBulkSupport } from '../../src/service/bulk';
 import { BaseModelSuite } from './base';
 
 @Model('bulk-user')

package/{test-support → support/test}/crud.ts

@@ -1,10 +1,10 @@
-import * as assert from 'assert';
+import assert from 'assert';
 
 import { Suite, Test } from '@travetto/test';
 import { Schema, Text, Precision, } from '@travetto/schema';
+import { ModelCrudSupport, Model, NotFoundError } from '@travetto/model';
 
 import { BaseModelSuite } from './base';
-import { ModelCrudSupport, Model, NotFoundError } from '..';
 
 @Schema()
 class Address {

package/{test-support → support/test}/expiry.ts

@@ -1,12 +1,12 @@
-import * as assert from 'assert';
+import assert from 'assert';
 
 import { Suite, Test } from '@travetto/test';
-import { Util, TimeSpan, TimeUnit } from '@travetto/base';
+import { TimeSpan, TimeUnit, TimeUtil } from '@travetto/base';
 
-import { ExpiresAt, Model } from '../src/registry/decorator';
-import { ModelExpirySupport } from '../src/service/expiry';
-import { ModelExpiryUtil } from '../src/internal/service/expiry';
-import { NotFoundError } from '../src/error/not-found';
+import { ExpiresAt, Model } from '../../src/registry/decorator';
+import { ModelExpirySupport } from '../../src/service/expiry';
+import { ModelExpiryUtil } from '../../src/internal/service/expiry';
+import { NotFoundError } from '../../src/error/not-found';
 import { BaseModelSuite } from './base';
 
 @Model('expiry-user')
@@ -22,11 +22,11 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   delayFactor: number = 1;
 
   async wait(n: number | TimeSpan) {
-    await Util.wait(Util.timeToMs(n) * this.delayFactor);
+    await TimeUtil.wait(TimeUtil.timeToMs(n) * this.delayFactor);
   }
 
   timeFromNow(v: number | TimeSpan, unit?: TimeUnit) {
-    return new Date(Date.now() + Util.timeToMs(v, unit) * this.delayFactor);
+    return new Date(Date.now() + TimeUtil.timeToMs(v, unit) * this.delayFactor);
   }
 
   @Test()

package/{test-support → support/test}/indexed.ts

@@ -1,14 +1,15 @@
-import * as assert from 'assert';
+import assert from 'assert';
 
 import { Suite, Test } from '@travetto/test';
 import { Schema } from '@travetto/schema';
-import { Util } from '@travetto/base';
+import { TimeUtil } from '@travetto/base';
+
+import { Index, Model } from '../../src/registry/decorator';
+import { ModelIndexedSupport } from '../../src/service/indexed';
+import { NotFoundError } from '../../src/error/not-found';
+import { IndexNotSupported } from '../../src/error/invalid-index';
 
-import { Index, Model } from '../src/registry/decorator';
-import { ModelIndexedSupport } from '../src/service/indexed';
 import { BaseModelSuite } from './base';
-import { NotFoundError } from '../src/error/not-found';
-import { IndexNotSupported } from '../src/error/invalid-index';
 
 @Model('index_user')
 @Index({
@@ -152,9 +153,9 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
   async queryComplexDateList() {
     const service = await this.service;
 
-    await service.create(User4, User4.from({ child: { name: 'bob', age: 40 }, createdDate: Util.timeFromNow('3d'), color: 'blue' }));
-    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' }));
+    await service.create(User4, User4.from({ child: { name: 'bob', age: 40 }, createdDate: TimeUtil.timeFromNow('3d'), color: 'blue' }));
+    await service.create(User4, User4.from({ child: { name: 'bob', age: 30 }, createdDate: TimeUtil.timeFromNow('2d'), color: 'red' }));
+    await service.create(User4, User4.from({ child: { name: 'bob', age: 50 }, createdDate: TimeUtil.timeFromNow('-1d'), color: 'green' }));
 
     const arr = await this.toArray(service.listByIndex(User4, 'nameCreated', User4.from({ child: { name: 'bob' } })));
 

package/{test-support → support/test}/polymorphism.ts

@@ -1,15 +1,17 @@
-import * as assert from 'assert';
+import assert from 'assert';
+import timers from 'timers/promises';
 
 import { Suite, Test } from '@travetto/test';
 import { Text, TypeMismatchError } from '@travetto/schema';
-
-import { BaseModelSuite } from './base';
 import {
   ModelIndexedSupport, Index, ModelCrudSupport, Model,
   NotFoundError, SubTypeNotSupportedError
-} from '..';
-import { isIndexedSupported } from '../src/internal/service/common';
-import { ExistsError } from '../src/error/exists';
+} from '@travetto/model';
+
+import { isIndexedSupported } from '../../src/internal/service/common';
+import { ExistsError } from '../../src/error/exists';
+
+import { BaseModelSuite } from './base';
 
 @Model({ baseType: true })
 export class Worker {
@@ -162,6 +164,8 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
       () => service.update(Engineer, Doctor.from({ ...doc }) as unknown as Engineer),
       (e: Error) => (e instanceof NotFoundError || e instanceof SubTypeNotSupportedError || e instanceof TypeMismatchError) ? undefined : e);
 
+    await timers.setTimeout(15);
+
     try {
       const res = await service.upsert(Doctor, Doctor.from({
         id: doc.id, name: 'gob', specialty: 'eyes'

package/{test-support → support/test}/stream.ts

@@ -1,20 +1,18 @@
-import * as assert from 'assert';
-import * as fs from 'fs/promises';
-import { createReadStream } from 'fs';
-import * as crypto from 'crypto';
+import assert from 'assert';
+import crypto from 'crypto';
 import { Readable } from 'stream';
 
-import { PathUtil } from '@travetto/boot';
-import { BeforeAll, Suite, Test } from '@travetto/test';
-import { ResourceManager } from '@travetto/base';
+import { Suite, Test, TestFixtures } from '@travetto/test';
 
 import { BaseModelSuite } from './base';
-import { ModelStreamSupport } from '../src/service/stream';
+import { ModelStreamSupport } from '../../src/service/stream';
 
 @Suite()
 export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport> {
 
-  async getHash(stream: Readable) {
+  fixture = new TestFixtures(['@travetto/model#support/fixtures']);
+
+  async getHash(stream: Readable): Promise<string> {
     const hash = crypto.createHash('sha1');
     hash.setEncoding('hex');
     await new Promise((res, rej) => {
@@ -25,24 +23,18 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
     return hash.read() as string;
   }
 
-  async getStream(resource: string) {
-    const file = await ResourceManager.findAbsolute(resource);
-    const stat = await fs.stat(file);
-    const hash = await this.getHash(createReadStream(file));
+  async getStream(resource: string): Promise<readonly [{ size: number, contentType: string, hash: string, filename: string }, Readable]> {
+    const { size } = await this.fixture.describe(resource);
+    const hash = await this.getHash(await this.fixture.readStream(resource));
 
     return [
-      { size: stat.size, contentType: '', hash, filename: resource },
-      createReadStream(file)
+      { size, contentType: '', hash, filename: resource },
+      await this.fixture.readStream(resource)
     ] as const;
   }
 
-  @BeforeAll()
-  async beforeAll() {
-    ResourceManager.addPath(PathUtil.resolveUnix(__dirname, '..', 'resources'));
-  }
-
   @Test()
-  async writeBasic() {
+  async writeBasic(): Promise<void> {
     const service = await this.service;
     const [meta, stream] = await this.getStream('/asset.yml');
 
@@ -53,7 +45,7 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
   }
 
   @Test()
-  async writeStream() {
+  async writeStream(): Promise<void> {
     const service = await this.service;
     const [meta, stream] = await this.getStream('/asset.yml');
 
@@ -64,7 +56,7 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
   }
 
   @Test()
-  async writeAndDelete() {
+  async writeAndDelete(): Promise<void> {
     const service = await this.service;
     const [meta, stream] = await this.getStream('/asset.yml');
 

package/{test-support → support/test}/suite.ts

@@ -1,23 +1,22 @@
-import { Class, ResourceManager } from '@travetto/base';
-import { PathUtil } from '@travetto/boot';
+import { Class } from '@travetto/base';
 import { DependencyRegistry } from '@travetto/di';
 import { RootRegistry } from '@travetto/registry';
-import { SuiteRegistry } from '@travetto/test';
+import { SuiteRegistry, TestFixtures } from '@travetto/test';
 
-import { isStorageSupported, isStreamSupported } from '../src/internal/service/common';
-import { StreamModel } from '../src/internal/service/stream';
-import { ModelRegistry } from '../src/registry/model';
+import { isStorageSupported, isStreamSupported } from '../../src/internal/service/common';
+import { StreamModel } from '../../src/internal/service/stream';
+import { ModelRegistry } from '../../src/registry/model';
 
 const Loaded = 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;
+
     SuiteRegistry.registerPendingListener(
       target,
       async function (this: T & { [Loaded]?: boolean }) {
-        // Track self
-        ResourceManager.addPath(PathUtil.resolveUnix(__dirname, 'resources'));
-
         await RootRegistry.init();
 
         if (!this[Loaded]) {

package/bin/candidate.ts

@@ -1,23 +0,0 @@
-import { EnvInit } from '@travetto/base/bin/init';
-import { ExecUtil } from '@travetto/boot';
-
-import type { ModelStorageSupport } from '../src/service/storage';
-import { ModelCandidateUtil } from './lib/candidate';
-
-/**
- * Handles direct invocation
- */
-export async function main(op: keyof ModelStorageSupport): Promise<void> {
-  try {
-    EnvInit.init();
-    const { PhaseManager } = await import('@travetto/base');
-    await PhaseManager.run('init');
-
-    ExecUtil.mainResponse({
-      models: await ModelCandidateUtil.getModelNames(),
-      providers: await ModelCandidateUtil.getProviderNames(op)
-    });
-  } catch (err) {
-    ExecUtil.mainResponse(err);
-  }
-}

package/bin/cli-model_install.ts

@@ -1,23 +0,0 @@
-import { color } from '@travetto/cli/src/color';
-
-import { BaseModelCommand } from './lib/base-command';
-import { ModelInstallUtil } from './lib/install';
-
-/**
- * CLI Entry point for installing models
- */
-export class ModelInstallCommand extends BaseModelCommand {
-  name = 'model:install';
-  op = 'createModel' as const;
-
-  async action(provider: string, models: string[]): Promise<void> {
-    try {
-      await this.validate(provider, models);
-      const resolved = await this.resolve(provider, models);
-      await ModelInstallUtil.run(resolved.provider, resolved.models);
-      console.log(color`${{ success: 'Successfully' }} installed ${{ param: models.length.toString() }} model(s)`);
-    } catch (err) {
-      console.error((err && err instanceof Error) ? err.message : err);
-    }
-  }
-}

package/bin/lib/base-command.ts

@@ -1,67 +0,0 @@
-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';
-
-import { ModelCandidateUtil } from './candidate';
-
-type Options = {
-  env: OptionConfig<string>;
-};
-
-/**
- * CLI Entry point for exporting model schemas
- */
-export abstract class BaseModelCommand extends CliCommand<Options> {
-
-  restoreEnv?: (err: Error) => unknown;
-
-  op: keyof ModelStorageSupport;
-
-  resolve = ModelCandidateUtil.resolve.bind(ModelCandidateUtil);
-
-  envInit(): void {
-    EnvInit.init();
-  }
-
-  override async build(): Promise<void> {
-    await super.build();
-    const { ConsoleManager, PhaseManager } = await import('@travetto/base');
-    ConsoleManager.exclude('debug');
-    // Init
-    await PhaseManager.run('init');
-  }
-
-  getArgs(): string {
-    return '[provider] [models...]';
-  }
-
-  getOptions(): Options {
-    return { env: this.option({ desc: 'Application environment' }) };
-  }
-
-  async usage({ providers, models }: { providers: string[], models: string[] }, err = ''): Promise<void> {
-    await this.showHelp(err, color`   
-${{ title: 'Providers' }}:
-${providers.map(p => color`  * ${{ type: p }}`).join('\n')}
-
-${{ title: 'Models' }}:
-${models.map(p => color`  * ${{ param: p }}`).join('\n')}
-`);
-  }
-
-  async validate(provider: string, models: string[]): Promise<void> {
-    const candidates = await ModelCandidateUtil.getCandidates(this.op);
-    if (!provider) {
-      return await this.usage(candidates);
-    } else {
-      if (!candidates.providers.includes(provider)) {
-        await this.usage(candidates, color`${{ param: provider }} is not a valid provider`);
-      }
-      const badModel = models.find(x => x !== '*' && !candidates.models.includes(x));
-      if (badModel) {
-        await this.usage(candidates, color`${{ param: badModel }} is not a valid model`);
-      }
-    }
-  }
-}