@travetto/model 5.0.0-rc.1 → 5.0.0-rc.10

package/README.md

@@ -235,8 +235,7 @@ In addition to the provided contracts, the module also provides common utilities
 ```typescript
 import { Readable } from 'node:stream';
 import { buffer as toBuffer } from 'node:stream/consumers';
-import { Class, TimeSpan } from '@travetto/base';
-import { DeepPartial } from '@travetto/schema';
+import { Class, TimeSpan, DeepPartial, castTo } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { ModelCrudSupport } from '../service/crud';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.10",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,14 +26,14 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^5.0.0-rc.1",
-    "@travetto/di": "^5.0.0-rc.0",
-    "@travetto/registry": "^5.0.0-rc.1",
-    "@travetto/schema": "^5.0.0-rc.0"
+    "@travetto/config": "^5.0.0-rc.10",
+    "@travetto/di": "^5.0.0-rc.9",
+    "@travetto/registry": "^5.0.0-rc.9",
+    "@travetto/schema": "^5.0.0-rc.10"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1",
-    "@travetto/test": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.10",
+    "@travetto/test": "^5.0.0-rc.9"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/error/exists.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 /**
  * Represents when a data item already exists

package/src/error/invalid-index.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 import { IndexConfig } from '../registry/types';
 import { ModelType } from '../types/model';

package/src/error/invalid-sub-type.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 /**
  * Represents when a model subtype class is unable to be used directly

package/src/error/not-found.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 /**
  * Represents when a model of cls and id cannot be found

package/src/internal/service/bulk.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { BulkOp } from '../../service/bulk';
 import { ModelType } from '../../types/model';

package/src/internal/service/common.ts

@@ -1,3 +1,4 @@
+import { ClassInstance } from '@travetto/runtime';
 import type { ModelBulkSupport } from '../../service/bulk';
 import { ModelCrudSupport } from '../../service/crud';
 import type { ModelExpirySupport } from '../../service/expiry';
@@ -17,62 +18,55 @@ export class ModelIndexedSupportTarget { }
  * Type guard for determining if service supports basic operations
  * @param o
  */
-export function isBasicSupported(o: unknown): o is ModelBulkSupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['create'];
+export function isBasicSupported(o: ClassInstance): o is ModelBulkSupport {
+  return !!o && 'create' in o;
 }
 
 /**
  * Type guard for determining if service supports crud operations
  * @param o
  */
-export function isCrudSupported(o: unknown): o is ModelCrudSupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['upsert'];
+export function isCrudSupported(o: ClassInstance): o is ModelCrudSupport {
+  return !!o && 'upsert' in o;
 }
 
 /**
- * Type guard for determining if model is expirable
+ * Type guard for determining if model supports expiry
  * @param o
  */
-export function isExpirySupported(o: unknown): o is ModelExpirySupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['deleteExpired'];
+export function isExpirySupported(o: ClassInstance): o is ModelExpirySupport {
+  return !!o && 'deleteExpired' in o;
 }
 
 /**
  * Type guard for determining if service supports storage operation
  * @param o
  */
-export function isStorageSupported(o: unknown): o is ModelStorageSupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['createStorage'];
+export function isStorageSupported(o: ClassInstance): o is ModelStorageSupport {
+  return !!o && 'createStorage' in o;
 }
 
 /**
  * Type guard for determining if service supports streaming operation
  * @param o
  */
-export function isStreamSupported(o: unknown): o is ModelStreamSupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['getStream'];
+export function isStreamSupported(o: ClassInstance): o is ModelStreamSupport {
+  return !!o && 'getStream' in o;
 }
 
 /**
  * Type guard for determining if service supports streaming operation
  * @param o
  */
-export function isBulkSupported(o: unknown): o is ModelBulkSupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['processBulk'];
+export function isBulkSupported(o: ClassInstance): o is ModelBulkSupport {
+  return !!o && 'processBulk' in o;
 }
 
 /**
  * Type guard for determining if service supports indexed operation
  * @param o
  */
-export function isIndexedSupported(o: unknown): o is ModelIndexedSupport {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return !!o && !!(o as Record<string, unknown>)['getByIndex'];
+export function isIndexedSupported(o: ClassInstance): o is ModelIndexedSupport {
+  return !!o && 'getByIndex' in o;
 }
 

package/src/internal/service/crud.ts

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 
-import { Class, Util } from '@travetto/base';
+import { castTo, Class, asFull, Util, asConstructable } from '@travetto/runtime';
 import { DataUtil, SchemaRegistry, SchemaValidator, ValidationError, ValidationResultError } from '@travetto/schema';
 
 import { ModelRegistry } from '../../registry/model';
@@ -46,14 +46,16 @@ export class ModelCrudUtil {
    * @param input Input as string or plain object
    */
   static async load<T extends ModelType>(cls: Class<T>, input: Buffer | string | object, onTypeMismatch: 'notfound' | 'exists' = 'notfound'): Promise<T> {
+    let resolvedInput: object;
     if (typeof input === 'string') {
-      input = JSON.parse(input);
+      resolvedInput = JSON.parse(input);
     } else if (input instanceof Buffer) {
-      input = JSON.parse(input.toString('utf8'));
+      resolvedInput = JSON.parse(input.toString('utf8'));
+    } else {
+      resolvedInput = input;
     }
 
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const result = ModelRegistry.getBaseModel(cls).from(input as object) as T;
+    const result = ModelRegistry.getBaseModel(cls).from(resolvedInput);
 
     if (!(result instanceof cls || result.constructor.Ⲑid === cls.Ⲑid)) {
       if (onTypeMismatch === 'notfound') {
@@ -78,12 +80,10 @@ export class ModelCrudUtil {
     }
 
     if (DataUtil.isPlainObject(item)) {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      item = cls.from(item as object);
+      item = cls.from(castTo(item));
     }
 
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const config = ModelRegistry.get(item.constructor as Class<T>);
+    const config = ModelRegistry.get(asConstructable(item).constructor);
     if (config.subType) { // Sub-typing, assign type
       SchemaRegistry.ensureInstanceTypeField(cls, item);
     }
@@ -106,8 +106,7 @@ export class ModelCrudUtil {
     if (errors.length) {
       throw new ValidationResultError(errors);
     }
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return item as T;
+    return castTo(item);
   }
 
   /**
@@ -119,12 +118,10 @@ export class ModelCrudUtil {
    */
   static async naivePartialUpdate<T extends ModelType>(cls: Class<T>, item: Partial<T>, view: undefined | string, getExisting: () => Promise<T>): Promise<T> {
     if (DataUtil.isPlainObject(item)) {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      item = cls.from(item as object);
+      item = cls.from(castTo(item));
     }
 
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const config = ModelRegistry.get(item.constructor as Class<T>);
+    const config = ModelRegistry.get(asConstructable(item).constructor);
     if (config.subType) { // Sub-typing, assign type
       SchemaRegistry.ensureInstanceTypeField(cls, item);
     }
@@ -139,8 +136,7 @@ export class ModelCrudUtil {
 
     item = await this.prePersist(cls, item, 'partial');
 
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return item as T;
+    return asFull(item);
   }
 
   /**
@@ -159,8 +155,7 @@ export class ModelCrudUtil {
     const config = ModelRegistry.get(cls);
     for (const state of (config.prePersist ?? [])) {
       if (state.scope === scope || scope === 'all' || state.scope === 'all') {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const handler = state.handler as unknown as DataHandler<T>;
+        const handler: DataHandler<T> = castTo(state.handler);
         item = await handler(item) ?? item;
       }
     }
@@ -175,8 +170,7 @@ export class ModelCrudUtil {
    */
   static async postLoad<T>(cls: Class<T>, item: T): Promise<T> {
     const config = ModelRegistry.get(cls);
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    for (const handler of (config.postLoad ?? []) as unknown as DataHandler<T>[]) {
+    for (const handler of castTo<DataHandler<T>[]>(config.postLoad ?? [])) {
       item = await handler(item) ?? item;
     }
     if (typeof item === 'object' && item && 'postLoad' in item && typeof item['postLoad'] === 'function') {

package/src/internal/service/expiry.ts

@@ -1,4 +1,4 @@
-import { ShutdownManager, Class, TimeSpan, TimeUtil, Util } from '@travetto/base';
+import { ShutdownManager, Class, TimeSpan, TimeUtil, Util, castTo } from '@travetto/runtime';
 
 import { ModelRegistry } from '../../registry/model';
 import { ModelExpirySupport } from '../../service/expiry';
@@ -15,10 +15,7 @@ export class ModelExpiryUtil {
    */
   static getExpiryState<T extends ModelType>(cls: Class<T>, item: T): { expiresAt?: Date, expired?: boolean } {
     const expKey = ModelRegistry.getExpiry(cls);
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const keyAsT = expKey as keyof T;
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const expiresAt = item[keyAsT] ? item[keyAsT] as unknown as Date : undefined;
+    const expiresAt: Date = castTo(item[expKey]);
 
     return {
       expiresAt,

package/src/internal/service/indexed.ts

@@ -1,5 +1,4 @@
-import { Class } from '@travetto/base';
-import { DeepPartial } from '@travetto/schema';
+import { castTo, Class, DeepPartial, TypedObject } from '@travetto/runtime';
 
 import { IndexNotSupported } from '../../error/invalid-index';
 import { NotFoundError } from '../../error/not-found';
@@ -45,38 +44,30 @@ export class ModelIndexedUtil {
       const parts = [];
 
       while (o !== undefined && o !== null) {
-        const k = Object.keys(f)[0];
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        o = (o[k] as Record<string, unknown>);
+        const k = TypedObject.keys(f)[0];
+        o = castTo(o[k]);
         parts.push(k);
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const fk = k as (keyof typeof f);
-        if (typeof f[fk] === 'boolean' || typeof f[fk] === 'number') {
+        if (typeof f[k] === 'boolean' || typeof f[k] === 'number') {
           if (cfg.type === 'sorted') {
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            sortDir = f[fk] === true ? 1 : f[fk] as number;
+            sortDir = f[k] === true ? 1 : f[k] === false ? 0 : f[k];
           }
           break; // At the bottom
         } else {
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          f = f[fk] as Record<string, unknown>;
+          f = castTo(f[k]);
         }
       }
       if (field === sortField) {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        sorted = { path: parts, dir: sortDir, value: o as unknown as number | Date };
+        sorted = { path: parts, dir: sortDir, value: castTo(o) };
       }
       if (o === undefined || o === null) {
         const empty = field === sortField ? opts.emptySortValue : opts.emptyValue;
         if (empty === undefined || empty === Error) {
           throw new IndexNotSupported(cls, cfg, `Missing field value for ${parts.join('.')}`);
         }
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        o = empty as Record<string, unknown>;
+        o = castTo(empty!);
       } else {
         if (field !== sortField || (opts.includeSortInFields ?? true)) {
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          fields.push({ path: parts, value: o as unknown as string | boolean | Date | number });
+          fields.push({ path: parts, value: castTo(o) });
         }
       }
     }
@@ -93,12 +84,11 @@ export class ModelIndexedUtil {
   static projectIndex<T extends ModelType>(cls: Class<T>, idx: IndexConfig<T> | string, item?: DeepPartial<T>, cfg?: ComputeConfig): Record<string, unknown> {
     const res: Record<string, unknown> = {};
     for (const { path, value } of this.computeIndexParts(cls, idx, item ?? {}, cfg).fields) {
-      let sub = res;
+      let sub: Record<string, unknown> = res;
       const all = path.slice(0);
       const last = all.pop()!;
       for (const k of all) {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        sub = (sub[k] ??= {}) as typeof res;
+        sub = castTo(sub[k] ??= {});
       }
       sub[last] = value;
     }
@@ -135,11 +125,9 @@ export class ModelIndexedUtil {
     cls: Class<T>, idx: string, body: OptionalId<T>
   ): Promise<T> {
     try {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const { id } = await service.getByIndex(cls, idx, body as DeepPartial<T>);
+      const { id } = await service.getByIndex(cls, idx, castTo(body));
       body.id = id;
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      return await service.update(cls, body as T);
+      return await service.update(cls, castTo(body));
     } catch (err) {
       if (err instanceof NotFoundError) {
         return await service.create(cls, body);

package/src/internal/service/storage.ts

@@ -1,4 +1,4 @@
-import { Class, Env } from '@travetto/base';
+import { Class, Runtime } from '@travetto/runtime';
 import { SchemaChangeListener } from '@travetto/schema';
 
 import { ModelRegistry } from '../../registry/model';
@@ -12,15 +12,11 @@ export class ModelStorageUtil {
   /**
    * Register change listener on startup
    */
-  static async registerModelChangeListener(storage: ModelStorageSupport, target?: Class): Promise<void> {
-    if (!Env.dynamic || !(storage?.config?.autoCreate ?? !Env.production)) {
+  static async registerModelChangeListener(storage: ModelStorageSupport): Promise<void> {
+    if (!Runtime.dynamic || !(storage?.config?.autoCreate ?? !Runtime.production)) {
       return;
     }
 
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    target = target ?? storage.constructor as Class<ModelStorageSupport>;
-
-
     const checkType = (cls: Class, enforceBase = true): boolean => {
       if (enforceBase && ModelRegistry.getBaseModel(cls) !== cls) {
         return false;

package/src/internal/service/stream.ts

@@ -1,4 +1,4 @@
-import { AppError, Class } from '@travetto/base';
+import { AppError, Class } from '@travetto/runtime';
 
 import { ModelType } from '../../types/model';
 import { StreamRange } from '../../service/stream';

package/src/provider/file.ts

@@ -5,7 +5,7 @@ import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import path from 'node:path';
 
-import { Class, TimeSpan, RuntimeContext } from '@travetto/base';
+import { Class, TimeSpan, Runtime, asFull } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { Required } from '@travetto/schema';
@@ -36,7 +36,7 @@ export class FileModelConfig {
   cullRate?: number | TimeSpan;
 
   async postConstruct(): Promise<void> {
-    this.folder ??= path.resolve(os.tmpdir(), `trv_file_${RuntimeContext.main.name.replace(/[^a-z]/ig, '_')}`);
+    this.folder ??= path.resolve(os.tmpdir(), `trv_file_${Runtime.main.name.replace(/[^a-z]/ig, '_')}`);
   }
 }
 
@@ -153,9 +153,7 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
     item = await ModelCrudUtil.naivePartialUpdate(cls, item, view, () => this.get(cls, id));
     const file = await this.#resolveName(cls, '.json', item.id);
     await fs.writeFile(file, JSON.stringify(item), { encoding: 'utf8' });
-
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return item as T;
+    return asFull<T>(item);
   }
 
   async delete<T extends ModelType>(cls: Class<T>, id: string): Promise<void> {

package/src/provider/memory.ts

@@ -1,8 +1,7 @@
 import { Readable } from 'node:stream';
 import { buffer as toBuffer } from 'node:stream/consumers';
 
-import { Class, TimeSpan } from '@travetto/base';
-import { DeepPartial } from '@travetto/schema';
+import { Class, TimeSpan, DeepPartial, castTo } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 
@@ -26,6 +25,7 @@ const STREAM_META = `${STREAMS}_meta`;
 
 type StoreType = Map<string, Buffer>;
 
+
 @Config('model.memory')
 export class MemoryModelConfig {
   autoCreate?: boolean = true;
@@ -87,8 +87,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
       const item = await this.get(cls, id);
       for (const idx of ModelRegistry.getIndices(cls, ['sorted', 'unsorted'])) {
         const idxName = indexName(cls, idx);
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const { key } = ModelIndexedUtil.computeIndexKey(cls, idx, item as DeepPartial<T>);
+        const { key } = ModelIndexedUtil.computeIndexKey(cls, idx, castTo(item));
         this.#indices[idx.type].get(idxName)?.get(key)?.delete(id);
       }
     } catch (err) {
@@ -101,8 +100,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
   async #writeIndices<T extends ModelType>(cls: Class<T>, item: T): Promise<void> {
     for (const idx of ModelRegistry.getIndices(cls, ['sorted', 'unsorted'])) {
       const idxName = indexName(cls, idx);
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idx, item as DeepPartial<T>);
+      const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idx, castTo(item));
       let index = this.#indices[idx.type].get(idxName)?.get(key);
 
       if (!index) {

package/src/registry/decorator.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { asConstructable, castTo, Class } from '@travetto/runtime';
 import { SchemaRegistry } from '@travetto/schema';
 
 import { ModelType } from '../types/model';
@@ -24,8 +24,7 @@ export function Model(conf: Partial<ModelOptions<ModelType>> | string = {}) {
 /**
  * Defines an index on a model
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function Index<T>(...indices: IndexConfig<any>[]) {
+export function Index<T extends ModelType>(...indices: IndexConfig<T>[]) {
   return function (target: Class<T>): void {
     ModelRegistry.getOrCreatePending(target).indices!.push(...indices);
   };
@@ -37,8 +36,7 @@ export function Index<T>(...indices: IndexConfig<any>[]) {
  */
 export function ExpiresAt() {
   return <K extends string, T extends Partial<Record<K, Date>>>(tgt: T, prop: K): void => {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    ModelRegistry.register(tgt.constructor as Class<T>, { expiresAt: prop });
+    ModelRegistry.register(asConstructable(tgt).constructor, { expiresAt: prop });
   };
 }
 
@@ -50,8 +48,7 @@ export function PrePersist<T>(handler: DataHandler<T>, scope: PrePersistScope =
     ModelRegistry.registerDataHandlers(tgt, {
       prePersist: [{
         scope,
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        handler: handler as DataHandler
+        handler: castTo(handler)
       }]
     });
   };
@@ -62,13 +59,11 @@ export function PrePersist<T>(handler: DataHandler<T>, scope: PrePersistScope =
  */
 export function PersistValue<T>(handler: (curr: T | undefined) => T, scope: PrePersistScope = 'all') {
   return function <K extends string, C extends Partial<Record<K, T>>>(tgt: C, prop: K): void {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    ModelRegistry.registerDataHandlers(tgt.constructor as Class<C>, {
+    ModelRegistry.registerDataHandlers(asConstructable(tgt).constructor, {
       prePersist: [{
         scope,
         handler: (inst): void => {
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          const cInst = (inst as unknown as Record<K, T>);
+          const cInst: Record<K, T> = castTo(inst);
           cInst[prop] = handler(cInst[prop]);
         }
       }]
@@ -82,7 +77,6 @@ export function PersistValue<T>(handler: (curr: T | undefined) => T, scope: PreP
  */
 export function PostLoad<T>(handler: DataHandler<T>) {
   return function (tgt: Class<T>): void {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    ModelRegistry.registerDataHandlers(tgt, { postLoad: [handler as DataHandler] });
+    ModelRegistry.registerDataHandlers(tgt, { postLoad: [castTo(handler)] });
   };
 }

package/src/registry/model.ts

@@ -1,8 +1,7 @@
-import { RuntimeIndex } from '@travetto/manifest';
 import { SchemaRegistry } from '@travetto/schema';
 import { MetadataRegistry } from '@travetto/registry';
 import { DependencyRegistry } from '@travetto/di';
-import { AppError, Class } from '@travetto/base';
+import { AppError, castTo, Class, describeFunction, asFull } from '@travetto/runtime';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 
 import { IndexConfig, IndexType, ModelOptions } from './types';
@@ -52,7 +51,14 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
   }
 
   createPending(cls: Class): Partial<ModelOptions<ModelType>> {
-    return { class: cls, indices: [], autoCreate: true, baseType: RuntimeIndex.getFunctionMetadata(cls)?.abstract, postLoad: [], prePersist: [] };
+    return {
+      class: cls,
+      indices: [],
+      autoCreate: true,
+      baseType: describeFunction(cls).abstract,
+      postLoad: [],
+      prePersist: []
+    };
   }
 
   registerDataHandlers(cls: Class, pConfig?: Partial<ModelOptions<ModelType>>): void {
@@ -65,8 +71,7 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
   }
 
   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 = asFull(this.pending.get(cls.Ⲑid)!);
 
     const schema = SchemaRegistry.get(cls);
     const view = schema.views[AllViewⲐ].schema;
@@ -97,7 +102,7 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
   /**
    * Find base class for a given model
    */
-  getBaseModel(cls: Class): Class<ModelType> {
+  getBaseModel<T extends ModelType>(cls: Class<T>): Class<T> {
     if (!this.baseModels.has(cls)) {
       let conf = this.get(cls) ?? this.getOrCreatePending(cls);
       let parent = cls;
@@ -202,12 +207,12 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
    * Get expiry field
    * @param cls
    */
-  getExpiry(cls: Class): string {
+  getExpiry<T extends ModelType>(cls: Class<T>): keyof T {
     const expiry = this.get(cls).expiresAt;
     if (!expiry) {
       throw new AppError(`${cls.name} is not configured with expiry support, please use @ExpiresAt to declare expiration behavior`, 'general');
     }
-    return expiry;
+    return castTo(expiry);
   }
 }
 

package/src/registry/types.ts

@@ -1,5 +1,4 @@
-import { Class } from '@travetto/base';
-import { Primitive } from '@travetto/schema';
+import type { Class, Primitive } from '@travetto/runtime';
 
 import { ModelType } from '../types/model';
 

package/src/service/basic.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { ModelType, OptionalId } from '../types/model';
 
 /**

package/src/service/bulk.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 import { ValidationResultError } from '@travetto/schema';
 
 import { ModelCrudSupport } from './crud';

package/src/service/crud.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { ModelType, OptionalId, ModelIdSource } from '../types/model';
 

package/src/service/expiry.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { ModelType } from '../types/model';
 import { ModelCrudSupport } from './crud';

package/src/service/indexed.ts

@@ -1,5 +1,4 @@
-import { Class } from '@travetto/base';
-import { DeepPartial } from '@travetto/schema';
+import { Class, DeepPartial } from '@travetto/runtime';
 
 import { ModelType, OptionalId } from '../types/model';
 import { ModelBasicSupport } from './basic';
@@ -7,6 +6,7 @@ import { ModelBasicSupport } from './basic';
 /**
  * Support for simple indexed activity
  *
+ *
  * @concrete ../internal/service/common#ModelIndexedSupportTarget
  */
 export interface ModelIndexedSupport extends ModelBasicSupport {

package/src/service/storage.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { SchemaChange } from '@travetto/schema';
 
 import { ModelType } from '../types/model';

package/src/service/stream.ts

@@ -12,11 +12,11 @@ export interface StreamMeta {
   /**
    * Hash of the file contents.  Different files with the same name, will have the same hash
    */
-  hash: string;
+  hash?: string;
   /**
    * The original base filename of the file
    */
-  filename: string;
+  filename?: string;
   /**
    * Filenames title, optional for elements like images, audio, videos
    */

package/support/base-command.ts

@@ -1,4 +1,4 @@
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliValidationError, CliCommandShape, cliTpl } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 

package/support/bin/candidate.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { castTo, Class } from '@travetto/runtime';
 import { ModelRegistry } from '@travetto/model/src/registry/model';
 import { InjectableConfig, DependencyRegistry } from '@travetto/di';
 import { ModelStorageSupportTarget } from '@travetto/model/src/internal/service/common';
@@ -40,8 +40,7 @@ export class ModelCandidateUtil {
    * Get all providers that are viable candidates
    */
   static async getProviders(op?: keyof ModelStorageSupport): Promise<InjectableConfig[]> {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const types = DependencyRegistry.getCandidateTypes<ModelStorageSupport>(ModelStorageSupportTarget as unknown as Class<ModelStorageSupport>);
+    const types = DependencyRegistry.getCandidateTypes<ModelStorageSupport>(castTo(ModelStorageSupportTarget));
     return types.filter(x => !op || x.class.prototype?.[op]);
   }
 

package/support/bin/export.ts

@@ -1,4 +1,4 @@
-import type { Class } from '@travetto/base';
+import type { Class } from '@travetto/runtime';
 import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
 import type { ModelType } from '@travetto/model/src/types/model';
 

package/support/bin/install.ts

@@ -1,4 +1,4 @@
-import type { Class } from '@travetto/base';
+import type { Class } from '@travetto/runtime';
 import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
 import type { ModelType } from '@travetto/model/src/types/model';
 

package/support/cli.model_export.ts

@@ -7,7 +7,7 @@ import { ModelCandidateUtil } from './bin/candidate';
 /**
  * Exports model schemas
  */
-@CliCommand({ addEnv: true, addModule: true })
+@CliCommand({ with: { env: true, module: true } })
 export class ModelExportCommand extends BaseModelCommand {
 
   getOp(): 'exportModel' { return 'exportModel'; }

package/support/cli.model_install.ts

@@ -7,7 +7,7 @@ import { ModelCandidateUtil } from './bin/candidate';
 /**
  * Installing models
  */
-@CliCommand({ addEnv: true, addModule: true })
+@CliCommand({ with: { env: true, module: true } })
 export class ModelInstallCommand extends BaseModelCommand {
 
   getOp(): 'createModel' { return 'createModel'; }

package/support/doc.support.tsx

@@ -1,8 +1,5 @@
 /** @jsxImportSource @travetto/doc */
-import { readFileSync } from 'node:fs';
-
-import { RuntimeIndex } from '@travetto/manifest';
-import { d, c, DocJSXElementByFn, DocJSXElement } from '@travetto/doc';
+import { d, c, DocJSXElementByFn, DocJSXElement, DocFileUtil } from '@travetto/doc';
 import { Config } from '@travetto/config';
 
 export const Links = {
@@ -14,14 +11,11 @@ export const Links = {
   Stream: d.codeLink('Streaming', '@travetto/model/src/service/stream.ts', /export interface/),
 };
 
-export const ModelTypes = (file: string | Function): DocJSXElement[] => {
-  if (typeof file !== 'string') {
-    file = RuntimeIndex.getFunctionMetadata(file)!.source;
-  }
-  const contents = readFileSync(file, 'utf8');
+export const ModelTypes = (fn: | Function): DocJSXElement[] => {
+  const { content } = DocFileUtil.readSource(fn);
   const found: DocJSXElementByFn<'CodeLink'>[] = [];
   const seen = new Set();
-  for (const [, key] of contents.matchAll(/Model(Crud|Expiry|Indexed|Bulk|Stream)Support/g)) {
+  for (const [, key] of content.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

package/support/test/base.ts

@@ -1,5 +1,5 @@
 import { DependencyRegistry } from '@travetto/di';
-import { AppError, Class } from '@travetto/base';
+import { AppError, castTo, Class, classConstruct } from '@travetto/runtime';
 
 import { isBulkSupported, isCrudSupported } from '../../src/internal/service/common';
 import { ModelType } from '../../src/types/model';
@@ -11,7 +11,7 @@ type ServiceClass = { serviceClass: { new(): unknown } };
 export abstract class BaseModelSuite<T> {
 
   static ifNot(pred: (svc: unknown) => boolean): (x: unknown) => Promise<boolean> {
-    return async (x: unknown) => !pred(new (x as ServiceClass).serviceClass());
+    return async (x: unknown) => !pred(classConstruct(castTo<ServiceClass>(x).serviceClass));
   }
 
   serviceClass: Class<T>;
@@ -36,7 +36,7 @@ export abstract class BaseModelSuite<T> {
       const res = await svc.processBulk(cls, items.map(x => ({ insert: x })));
       return res.counts.insert;
     } else if (isCrudSupported(svc)) {
-      const out = [] as Promise<M>[];
+      const out: Promise<M>[] = [];
       for (const el of items) {
         out.push(svc.create(cls, el));
       }

package/support/test/crud.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert';
+import timers from 'node:timers/promises';
 
 import { Suite, Test } from '@travetto/test';
 import { Schema, Text, Precision, Required, } from '@travetto/schema';
@@ -48,7 +49,7 @@ class User2 {
   name: string;
 
   prePersist() {
-    this.name = `${this.name}-suff`;
+    this.name = `${this.name}-suffix`;
   }
 }
 
@@ -192,7 +193,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     }));
 
     assert(o.address === undefined);
-    assert(o.name === 'bob-suff');
+    assert(o.name === 'bob-suffix');
 
     await service.updatePartial(User2, User2.from({
       id: o.id,
@@ -216,7 +217,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     assert(res.createdDate instanceof Date);
   }
 
-  @Test('verify prepersist on create/update')
+  @Test('verify pre-persist on create/update')
   async testPrePersist() {
     const service = await this.service;
     const res = await service.create(Dated, Dated.from({}));
@@ -224,7 +225,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     assert(res.createdDate instanceof Date);
     assert(res.updatedDate instanceof Date);
 
-    await new Promise(r => setTimeout(r, 100));
+    await timers.setTimeout(100);
 
     const final = await service.updatePartial(Dated, { id: res.id });
     assert(final.createdDate instanceof Date);

package/support/test/expiry.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert';
 import timers from 'node:timers/promises';
 
 import { Suite, Test } from '@travetto/test';
-import { TimeSpan, TimeUnit, TimeUtil } from '@travetto/base';
+import { TimeSpan, TimeUnit, TimeUtil } from '@travetto/runtime';
 
 import { ExpiresAt, Model } from '../../src/registry/decorator';
 import { ModelExpirySupport } from '../../src/service/expiry';

package/support/test/indexed.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 import { Schema } from '@travetto/schema';
-import { TimeUtil } from '@travetto/base';
+import { TimeUtil } from '@travetto/runtime';
 
 import { Index, Model } from '../../src/registry/decorator';
 import { ModelIndexedSupport } from '../../src/service/indexed';

package/support/test/polymorphism.ts

@@ -12,6 +12,7 @@ import { isIndexedSupported } from '../../src/internal/service/common';
 import { ExistsError } from '../../src/error/exists';
 
 import { BaseModelSuite } from './base';
+import { castTo } from '@travetto/runtime';
 
 @Model({ baseType: true })
 export class Worker {
@@ -70,7 +71,7 @@ export class IndexedEngineer extends IndexedWorker {
 }
 
 async function collect<T>(iterable: AsyncIterable<T>): Promise<T[]> {
-  const out = [] as T[];
+  const out: T[] = [];
   for await (const el of iterable) {
     out.push(el);
   }
@@ -116,12 +117,12 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
 
     const fire3 = all.find(x => x instanceof Firefighter);
     assert(fire3 instanceof Firefighter);
-    assert((fire3 as Firefighter).firehouse === 20);
+    assert(fire3.firehouse === 20);
     assert(fire3.name === 'rob');
 
     const eng3 = all.find(x => x instanceof Engineer);
     assert(eng3 instanceof Engineer);
-    assert((eng3 as Engineer).major === 'oranges');
+    assert(eng3.major === 'oranges');
     assert(eng3.name === 'cob');
 
     const engineers = await collect(service.list(Engineer));
@@ -161,7 +162,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     );
 
     await assert.rejects(
-      () => service.update(Engineer, Doctor.from({ ...doc }) as unknown as Engineer),
+      () => service.update(Engineer, castTo(Doctor.from({ ...doc }))),
       (e: Error) => (e instanceof NotFoundError || e instanceof SubTypeNotSupportedError || e instanceof TypeMismatchError) ? undefined : e);
 
     await timers.setTimeout(15);
@@ -205,7 +206,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
 
   @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(isIndexedSupported) })
   async polymorphicIndexGet() {
-    const service = (await this.service) as unknown as ModelIndexedSupport;
+    const service: ModelIndexedSupport = castTo(await this.service);
     const now = 30;
     const [doc, fire, eng] = [
       IndexedDoctor.from({ name: 'bob', specialty: 'feet', age: now }),
@@ -235,7 +236,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
 
   @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(isIndexedSupported) })
   async polymorphicIndexDelete() {
-    const service = (await this.service) as unknown as ModelIndexedSupport;
+    const service: ModelIndexedSupport = castTo(await this.service);
     const now = 30;
     const [doc, fire, eng] = [
       IndexedDoctor.from({ name: 'bob', specialty: 'feet', age: now }),

package/support/test/stream.ts

@@ -3,7 +3,7 @@ import assert from 'node:assert';
 import crypto from 'node:crypto';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { buffer as toBuffer } from 'node:stream/consumers';
+import { text as toText } from 'node:stream/consumers';
 
 import { Suite, Test, TestFixtures } from '@travetto/test';
 
@@ -17,9 +17,9 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
   fixture = new TestFixtures(['@travetto/model']);
 
   async getHash(stream: Readable): Promise<string> {
-    const hasher = crypto.createHash('sha1').setEncoding('hex');
-    await pipeline(stream, hasher);
-    return hasher.read().toString();
+    const hash = crypto.createHash('sha1').setEncoding('hex');
+    await pipeline(stream, hash);
+    return hash.read().toString();
   }
 
   async getStream(resource: string): Promise<readonly [{ size: number, contentType: string, hash: string, filename: string }, Readable]> {
@@ -77,30 +77,33 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
     await service.upsertStream(meta.hash, stream, meta);
 
     const retrieved = await service.getStream(meta.hash);
-    const content = (await toBuffer(retrieved)).toString('utf8');
+    const content = await toText(retrieved);
     assert(content.startsWith('abc'));
     assert(content.endsWith('xyz'));
 
     const partial = await service.getStream(meta.hash, { start: 10, end: 20 });
-    const subContent = (await toBuffer(partial)).toString('utf8');
+    const subContent = await toText(partial);
     const range = await enforceRange({ start: 10, end: 20 }, meta.size);
     assert(subContent.length === (range.end - range.start) + 1);
-    assert(subContent === 'klmnopqrstu');
+
+    const og = await this.fixture.read('/text.txt');
+
+    assert(subContent === og.substring(10, 21));
 
     const partialUnbounded = await service.getStream(meta.hash, { start: 10 });
-    const subContent2 = (await toBuffer(partialUnbounded)).toString('utf8');
+    const subContent2 = await toText(partialUnbounded);
     const range2 = await enforceRange({ start: 10 }, meta.size);
     assert(subContent2.length === (range2.end - range2.start) + 1);
     assert(subContent2.startsWith('klm'));
     assert(subContent2.endsWith('xyz'));
 
     const partialSingle = await service.getStream(meta.hash, { start: 10, end: 10 });
-    const subContent3 = (await toBuffer(partialSingle)).toString('utf8');
+    const subContent3 = await toText(partialSingle);
     assert(subContent3.length === 1);
     assert(subContent3 === 'k');
 
-    const partialOverbounded = await service.getStream(meta.hash, { start: 20, end: 40 });
-    const subContent4 = (await toBuffer(partialOverbounded)).toString('utf8');
+    const partialOverBounded = await service.getStream(meta.hash, { start: 20, end: 40 });
+    const subContent4 = await toText(partialOverBounded);
     assert(subContent4.length === 6);
     assert(subContent4.endsWith('xyz'));
 

package/support/test/suite.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { DependencyRegistry } from '@travetto/di';
 import { RootRegistry } from '@travetto/registry';
 import { SuiteRegistry, TestFixtures } from '@travetto/test';