@travetto/model 6.0.0-rc.0 → 6.0.0-rc.2

package/README.md

@@ -16,14 +16,20 @@ yarn add @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.
 
 ## 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), [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/service/blob.ts#L8) and [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L19).
+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/types/basic.ts#L8), [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/types/crud.ts#L11), [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/types/indexed.ts#L11), [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/types/expiry.ts#L10), [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/types/blob.ts#L8) and [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/types/bulk.ts#L64).
 
 ### Basic
-All [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") implementations, must honor the [Basic](https://github.com/travetto/travetto/tree/main/module/model/src/service/basic.ts#L9) contract to be able to participate in the model ecosystem.  This contract represents the bare minimum for a model service.
+All [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") implementations, must honor the [Basic](https://github.com/travetto/travetto/tree/main/module/model/src/types/basic.ts#L8) contract to be able to participate in the model ecosystem.  This contract represents the bare minimum for a model service.
 
 **Code: Basic Contract**
 ```typescript
 export interface ModelBasicSupport<C = unknown> {
+
+  /**
+   * Id Source
+   */
+  idSource: ModelIdSource;
+
   /**
    * Get underlying client
    */
@@ -53,17 +59,12 @@ export interface ModelBasicSupport<C = unknown> {
 ```
 
 ### CRUD
-The [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts#L11) contract, builds upon the basic contract, and is built around the idea of simple data retrieval and storage, to create a foundation for other services that need only basic support.  The model extension in [Authentication](https://github.com/travetto/travetto/tree/main/module/auth#readme "Authentication scaffolding for the Travetto framework"), is an example of a module that only needs create, read and delete, and so any implementation of [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") that honors this contract, can be used with the [Authentication](https://github.com/travetto/travetto/tree/main/module/auth#readme "Authentication scaffolding for the Travetto framework") model extension.
+The [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/types/crud.ts#L11) contract, builds upon the basic contract, and is built around the idea of simple data retrieval and storage, to create a foundation for other services that need only basic support.  The model extension in [Authentication](https://github.com/travetto/travetto/tree/main/module/auth#readme "Authentication scaffolding for the Travetto framework"), is an example of a module that only needs create, read and delete, and so any implementation of [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") that honors this contract, can be used with the [Authentication](https://github.com/travetto/travetto/tree/main/module/auth#readme "Authentication scaffolding for the Travetto framework") model extension.
 
 **Code: Crud Contract**
 ```typescript
 export interface ModelCrudSupport extends ModelBasicSupport {
 
-  /**
-   * Id Source
-   */
-  idSource: ModelIdSource;
-
   /**
    * Update an item
    * @param item The document to update.
@@ -99,7 +100,7 @@ export interface ModelCrudSupport extends ModelBasicSupport {
 ```
 
 ### Indexed
-Additionally, an implementation may support the ability for basic [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/service/indexed.ts#L12) queries. This is not the full featured query support of [Data Model Querying](https://github.com/travetto/travetto/tree/main/module/model-query#readme "Datastore abstraction for advanced query support."), but allowing for indexed lookups.  This does not support listing by index, but may be added at a later date.
+Additionally, an implementation may support the ability for basic [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/types/indexed.ts#L11) queries. This is not the full featured query support of [Data Model Querying](https://github.com/travetto/travetto/tree/main/module/model-query#readme "Datastore abstraction for advanced query support."), but allowing for indexed lookups.  This does not support listing by index, but may be added at a later date.
 
 **Code: Indexed Contract**
 ```typescript
@@ -139,7 +140,7 @@ export interface ModelIndexedSupport extends ModelBasicSupport {
 ```
 
 ### Expiry
-Certain implementations will also provide support for automatic [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/service/expiry.ts#L11) of data at runtime.  This is extremely useful for temporary data as, and is used in the [Caching](https://github.com/travetto/travetto/tree/main/module/cache#readme "Caching functionality with decorators for declarative use.") module for expiring data accordingly.
+Certain implementations will also provide support for automatic [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/types/expiry.ts#L10) of data at runtime.  This is extremely useful for temporary data as, and is used in the [Caching](https://github.com/travetto/travetto/tree/main/module/cache#readme "Caching functionality with decorators for declarative use.") module for expiring data accordingly.
 
 **Code: Expiry Contract**
 ```typescript
@@ -154,7 +155,7 @@ export interface ModelExpirySupport extends ModelCrudSupport {
 ```
 
 ### Blob
-Some implementations also allow for the ability to read/write binary data as [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/service/blob.ts#L8).  Given that all implementations can store [Base64](https://en.wikipedia.org/wiki/Base64) encoded data, the key differentiator here, is native support for streaming data, as well as being able to store binary data of significant sizes.
+Some implementations also allow for the ability to read/write binary data as [Blob](https://github.com/travetto/travetto/tree/main/module/model/src/types/blob.ts#L8).  Given that all implementations can store [Base64](https://en.wikipedia.org/wiki/Base64) encoded data, the key differentiator here, is native support for streaming data, as well as being able to store binary data of significant sizes.
 
 **Code: Blob Contract**
 ```typescript
@@ -213,7 +214,7 @@ export interface ModelBlobSupport {
 ```
 
 ### Bulk
-Finally, there is support for [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/service/bulk.ts#L19) 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.
+Finally, there is support for [Bulk](https://github.com/travetto/travetto/tree/main/module/model/src/types/bulk.ts#L64) 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.
 
 **Code: Bulk Contract**
 ```typescript
@@ -223,7 +224,7 @@ export interface ModelBulkSupport extends ModelCrudSupport {
 ```
 
 ## Declaration
-Models are declared via the [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13) decorator, which allows the system to know that this is a class that is compatible with the module.  The only requirement for a model is the [ModelType](https://github.com/travetto/travetto/tree/main/module/model/src/types/model.ts#L9)
+Models are declared via the [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13) decorator, which allows the system to know that this is a class that is compatible with the module.  The only requirement for a model is the [ModelType](https://github.com/travetto/travetto/tree/main/module/model/src/types/model.ts#L10)
 
 **Code: ModelType**
 ```typescript
@@ -262,9 +263,10 @@ To enforce that these contracts are honored, the module provides shared test sui
 import { DependencyRegistry } from '@travetto/di';
 import { AppError, castTo, Class, classConstruct } from '@travetto/runtime';
 
-import { isBulkSupported, isCrudSupported } from '../../src/internal/service/common';
-import { ModelType } from '../../src/types/model';
-import { ModelSuite } from './suite';
+import { ModelBulkUtil } from '../../src/util/bulk.ts';
+import { ModelCrudUtil } from '../../src/util/crud.ts';
+import { ModelType } from '../../src/types/model.ts';
+import { ModelSuite } from './suite.ts';
 
 type ServiceClass = { serviceClass: { new(): unknown } };
 
@@ -280,7 +282,7 @@ export abstract class BaseModelSuite<T> {
 
   async getSize<U extends ModelType>(cls: Class<U>): Promise<number> {
     const svc = (await this.service);
-    if (isCrudSupported(svc)) {
+    if (ModelCrudUtil.isSupported(svc)) {
       let i = 0;
       for await (const __el of svc.list(cls)) {
         i += 1;
@@ -293,10 +295,10 @@ export abstract class BaseModelSuite<T> {
 
   async saveAll<M extends ModelType>(cls: Class<M>, items: M[]): Promise<number> {
     const svc = await this.service;
-    if (isBulkSupported(svc)) {
-      const res = await svc.processBulk(cls, items.map(x => ({ insert: x })));
-      return res.counts.insert;
-    } else if (isCrudSupported(svc)) {
+    if (ModelBulkUtil.isSupported(svc)) {
+      const result = await svc.processBulk(cls, items.map(x => ({ insert: x })));
+      return result.counts.insert;
+    } else if (ModelCrudUtil.isSupported(svc)) {
       const out: Promise<M>[] = [];
       for (const el of items) {
         out.push(svc.create(cls, el));

package/__index__.ts

@@ -1,16 +1,24 @@
-export * from './src/registry/decorator';
-export * from './src/registry/model';
-export * from './src/registry/types';
-export * from './src/types/model';
-export * from './src/service/basic';
-export * from './src/service/blob';
-export * from './src/service/bulk';
-export * from './src/service/crud';
-export * from './src/service/indexed';
-export * from './src/service/expiry';
-export * from './src/service/storage';
+export * from './src/registry/decorator.ts';
+export * from './src/registry/model.ts';
+export * from './src/registry/types.ts';
+export * from './src/types/model.ts';
 
-export * from './src/error/exists';
-export * from './src/error/not-found';
-export * from './src/error/invalid-index';
-export * from './src/error/invalid-sub-type';
+export * from './src/types/basic.ts';
+export * from './src/types/blob.ts';
+export * from './src/types/bulk.ts';
+export * from './src/types/crud.ts';
+export * from './src/types/indexed.ts';
+export * from './src/types/expiry.ts';
+export * from './src/types/storage.ts';
+
+export * from './src/util/blob.ts';
+export * from './src/util/bulk.ts';
+export * from './src/util/crud.ts';
+export * from './src/util/expiry.ts';
+export * from './src/util/indexed.ts';
+export * from './src/util/storage.ts';
+
+export * from './src/error/exists.ts';
+export * from './src/error/not-found.ts';
+export * from './src/error/invalid-index.ts';
+export * from './src/error/invalid-sub-type.ts';

package/package.json

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

package/src/error/invalid-index.ts

@@ -1,7 +1,7 @@
 import { Class, AppError } from '@travetto/runtime';
 
-import { IndexConfig } from '../registry/types';
-import { ModelType } from '../types/model';
+import { IndexConfig } from '../registry/types.ts';
+import { ModelType } from '../types/model.ts';
 
 /**
  * Represents when an index is invalid

package/src/registry/decorator.ts

@@ -1,9 +1,9 @@
 import { AppError, asConstructable, castTo, Class } from '@travetto/runtime';
 import { SchemaRegistry } from '@travetto/schema';
 
-import { ModelType } from '../types/model';
-import { ModelRegistry } from './model';
-import { DataHandler, IndexConfig, ModelOptions, PrePersistScope } from './types';
+import { ModelType } from '../types/model.ts';
+import { ModelRegistry } from './model.ts';
+import { DataHandler, IndexConfig, ModelOptions, PrePersistScope } from './types.ts';
 
 /**
  * Model decorator, extends `@Schema`

package/src/registry/model.ts

@@ -2,12 +2,11 @@ import { SchemaRegistry } from '@travetto/schema';
 import { MetadataRegistry } from '@travetto/registry';
 import { DependencyRegistry } from '@travetto/di';
 import { AppError, castTo, Class, describeFunction, asFull } from '@travetto/runtime';
-import { AllViewSymbol } from '@travetto/schema/src/internal/types';
 
-import { IndexConfig, IndexType, ModelOptions } from './types';
-import { NotFoundError } from '../error/not-found';
-import { ModelType } from '../types/model';
-import { IndexNotSupported } from '../error/invalid-index';
+import { IndexConfig, IndexType, ModelOptions } from './types.ts';
+import { NotFoundError } from '../error/not-found.ts';
+import { ModelType } from '../types/model.ts';
+import { IndexNotSupported } from '../error/invalid-index.ts';
 
 /**
  * Registry for all models, built on the Metadata registry
@@ -74,7 +73,7 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
     const config = asFull(this.pending.get(cls.Ⲑid)!);
 
     const schema = SchemaRegistry.get(cls);
-    const view = schema.views[AllViewSymbol].schema;
+    const view = schema.totalView.schema;
     delete view.id.required; // Allow ids to be optional
 
     if (schema.subTypeField in view && this.getBaseModel(cls) !== cls) {

package/src/registry/types.ts

@@ -1,6 +1,6 @@
 import type { Class, Primitive } from '@travetto/runtime';
 
-import { ModelType } from '../types/model';
+import { ModelType } from '../types/model.ts';
 
 type ValidFieldNames<T> = {
   [K in keyof T]:

package/src/{service → types}/basic.ts

@@ -1,12 +1,17 @@
 import { Class } from '@travetto/runtime';
-import { ModelType, OptionalId } from '../types/model';
+import { ModelIdSource, ModelType, OptionalId } from '../types/model.ts';
 
 /**
  * Interface for basic data interface
- *
- * @concrete ../internal/service/common#ModelBasicSupportTarget
+ * @concrete
  */
 export interface ModelBasicSupport<C = unknown> {
+
+  /**
+   * Id Source
+   */
+  idSource: ModelIdSource;
+
   /**
    * Get underlying client
    */

package/src/{service → types}/blob.ts

@@ -3,7 +3,7 @@ import { BinaryInput, BlobMeta, ByteRange, TimeSpan } from '@travetto/runtime';
 /**
  * Support for Blobs CRUD.
  *
- * @concrete ../internal/service/common#ModelBlobSupportTarget
+ * @concrete
  */
 export interface ModelBlobSupport {
 

package/src/{service → types}/bulk.ts

@@ -1,8 +1,8 @@
 import { Class, AppError } from '@travetto/runtime';
 import { ValidationError, ValidationResultError } from '@travetto/schema';
 
-import { ModelCrudSupport } from './crud';
-import { ModelType, OptionalId } from '../types/model';
+import { ModelCrudSupport } from './crud.ts';
+import { ModelType, OptionalId } from '../types/model.ts';
 
 /**
  * Bulk operation. Each operation has a single action and payload
@@ -59,7 +59,7 @@ export class BulkProcessError extends AppError<{ errors: BulkErrorItem[] }> {
 /**
  * Determines if model allows for bulk operations
  *
- * @concrete ../internal/service/common#ModelBulkSupportTarget
+ * @concrete
  */
 export interface ModelBulkSupport extends ModelCrudSupport {
   processBulk<T extends ModelType>(cls: Class<T>, operations: BulkOp<T>[]): Promise<BulkResponse>;

package/src/{service → types}/crud.ts

@@ -1,20 +1,15 @@
 import { Class } from '@travetto/runtime';
 
-import { ModelType, OptionalId, ModelIdSource } from '../types/model';
+import { ModelType, OptionalId } from '../types/model.ts';
 
-import { ModelBasicSupport } from './basic';
+import { ModelBasicSupport } from './basic.ts';
 
 /**
  * Interface for simple CRUD
- * @concrete ../internal/service/common#ModelCrudSupportTarget
+ * @concrete
  */
 export interface ModelCrudSupport extends ModelBasicSupport {
 
-  /**
-   * Id Source
-   */
-  idSource: ModelIdSource;
-
   /**
    * Update an item
    * @param item The document to update.

package/src/{service → types}/expiry.ts

@@ -1,12 +1,11 @@
 import { Class } from '@travetto/runtime';
 
-import { ModelType } from '../types/model';
-import { ModelCrudSupport } from './crud';
+import { ModelType } from '../types/model.ts';
+import { ModelCrudSupport } from './crud.ts';
 
 /**
  * Support for managing expiration of data
- *
- * @concrete ../internal/service/common#ModelExpirySupportTarget
+ * @concrete
  */
 export interface ModelExpirySupport extends ModelCrudSupport {
   /**

package/src/{service → types}/indexed.ts

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

package/src/types/model.ts

@@ -5,6 +5,7 @@ export type ModelIdSource = { create: () => string, valid: (id: string) => boole
 
 /**
  * Simple model interface
+ * @concrete
  */
 export interface ModelType {
   /**

package/src/{service → types}/storage.ts

@@ -1,7 +1,7 @@
 import { Class } from '@travetto/runtime';
 import { SchemaChange } from '@travetto/schema';
 
-import { ModelType } from '../types/model';
+import { ModelType } from '../types/model.ts';
 
 /**
  * This interface defines the behavior for dealing with the
@@ -10,7 +10,7 @@ import { ModelType } from '../types/model';
  *
  * This is intended to be used during development only for rapid prototyping.
  *
- * @concrete ../internal/service/common#ModelStorageSupportTarget
+ * @concrete
  */
 export interface ModelStorageSupport {
 
@@ -53,4 +53,8 @@ export interface ModelStorageSupport {
    * An event listener for whenever a model schema is changed
    */
   changeSchema?(cls: Class, changes: SchemaChange): Promise<void>;
+  /**
+   * Truncate blob storage data
+   */
+  truncateBlob?(): Promise<void>;
 }

package/src/{internal/service → util}/blob.ts

@@ -1,15 +1,17 @@
 import { Readable } from 'node:stream';
-import { Class, AppError, BinaryInput, BinaryUtil, BlobMeta, ByteRange } from '@travetto/runtime';
-import { ModelType } from '../../types/model';
-
-export const ModelBlobNamespace = '__blobs';
-export const MODEL_BLOB: Class<ModelType> = class { id: string; };
+import { AppError, BinaryInput, BinaryUtil, BlobMeta, ByteRange, hasFunction } from '@travetto/runtime';
+import { ModelBlobSupport } from '../types/blob.ts';
 
 /**
- * Utilities for processing assets
+ * Utilities for processing blobs
  */
 export class ModelBlobUtil {
 
+  /**
+   * Type guard for determining if service supports blob operations
+   */
+  static isSupported = hasFunction<ModelBlobSupport>('getBlob');
+
   /**
    * Convert input to a Readable, and get what metadata is available
    */

package/src/{internal/service → util}/bulk.ts

@@ -1,8 +1,8 @@
-import { Class } from '@travetto/runtime';
+import { Class, hasFunction } from '@travetto/runtime';
 
-import { BulkOp } from '../../service/bulk';
-import { ModelType } from '../../types/model';
-import { ModelCrudProvider, ModelCrudUtil } from './crud';
+import { BulkOp, ModelBulkSupport } from '../types/bulk.ts';
+import { ModelType } from '../types/model.ts';
+import { ModelCrudProvider, ModelCrudUtil } from './crud.ts';
 
 export type BulkPreStore<T extends ModelType> = {
   insertedIds: Map<number, string>;
@@ -13,6 +13,12 @@ export type BulkPreStore<T extends ModelType> = {
 };
 
 export class ModelBulkUtil {
+
+  /**
+   * Type guard for determining if service supports bulk operation
+   */
+  static isSupported = hasFunction<ModelBulkSupport>('processBulk');
+
   /**
    * Prepares bulk ops for storage
    * @param cls

package/src/{internal/service → util}/crud.ts

@@ -1,12 +1,13 @@
-import { castTo, Class, Util, asConstructable, AppError } from '@travetto/runtime';
+import { castTo, Class, Util, asConstructable, AppError, hasFunction } from '@travetto/runtime';
 import { DataUtil, SchemaRegistry, SchemaValidator, ValidationError, ValidationResultError } from '@travetto/schema';
 
-import { ModelRegistry } from '../../registry/model';
-import { ModelIdSource, ModelType, OptionalId } from '../../types/model';
-import { NotFoundError } from '../../error/not-found';
-import { ExistsError } from '../../error/exists';
-import { SubTypeNotSupportedError } from '../../error/invalid-sub-type';
-import { DataHandler, PrePersistScope } from '../../registry/types';
+import { ModelRegistry } from '../registry/model.ts';
+import { ModelIdSource, ModelType, OptionalId } from '../types/model.ts';
+import { NotFoundError } from '../error/not-found.ts';
+import { ExistsError } from '../error/exists.ts';
+import { SubTypeNotSupportedError } from '../error/invalid-sub-type.ts';
+import { DataHandler, PrePersistScope } from '../registry/types.ts';
+import { ModelCrudSupport } from '../types/crud.ts';
 
 export type ModelCrudProvider = {
   idSource: ModelIdSource;
@@ -17,6 +18,11 @@ export type ModelCrudProvider = {
  */
 export class ModelCrudUtil {
 
+  /**
+   * Type guard for determining if service supports crud operations
+   */
+  static isSupported = hasFunction<ModelCrudSupport>('upsert');
+
   /**
    * Build a uuid generator
    */

package/src/{internal/service → util}/expiry.ts

@@ -1,14 +1,19 @@
-import { ShutdownManager, Class, TimeSpan, TimeUtil, Util, castTo } from '@travetto/runtime';
+import { ShutdownManager, Class, TimeSpan, TimeUtil, Util, castTo, hasFunction } from '@travetto/runtime';
 
-import { ModelRegistry } from '../../registry/model';
-import { ModelExpirySupport } from '../../service/expiry';
-import { ModelType } from '../../types/model';
+import { ModelRegistry } from '../registry/model.ts';
+import { ModelExpirySupport } from '../types/expiry.ts';
+import { ModelType } from '../types/model.ts';
 
 /**
  * Utils for model expiry
  */
 export class ModelExpiryUtil {
 
+  /**
+   * Type guard for determining if model supports expiry
+   */
+  static isSupported = hasFunction<ModelExpirySupport>('deleteExpired');
+
   /**
    * Get expiry info for a given item
    */

package/src/{internal/service → util}/indexed.ts

@@ -1,12 +1,12 @@
-import { castTo, Class, DeepPartial, TypedObject } from '@travetto/runtime';
+import { castTo, Class, DeepPartial, hasFunction, TypedObject } from '@travetto/runtime';
 
-import { IndexNotSupported } from '../../error/invalid-index';
-import { NotFoundError } from '../../error/not-found';
-import { ModelRegistry } from '../../registry/model';
-import { IndexConfig } from '../../registry/types';
-import { ModelCrudSupport } from '../../service/crud';
-import { ModelIndexedSupport } from '../../service/indexed';
-import { ModelType, OptionalId } from '../../types/model';
+import { IndexNotSupported } from '../error/invalid-index.ts';
+import { NotFoundError } from '../error/not-found.ts';
+import { ModelRegistry } from '../registry/model.ts';
+import type { IndexConfig } from '../registry/types.ts';
+import type { ModelCrudSupport } from '../types/crud.ts';
+import type { ModelIndexedSupport } from '../types/indexed.ts';
+import type { ModelType, OptionalId } from '../types/model.ts';
 
 type ComputeConfig = {
   includeSortInFields?: boolean;
@@ -24,6 +24,11 @@ const DEFAULT_SEP = '\u8203';
  */
 export class ModelIndexedUtil {
 
+  /**
+   * Type guard for determining if service supports indexed operation
+   */
+  static isSupported = hasFunction<ModelIndexedSupport>('getByIndex');
+
   /**
    * Compute flattened field to value mappings
    * @param cls Class to get info for

package/src/{internal/service → util}/storage.ts

@@ -1,14 +1,20 @@
-import { Class, Runtime } from '@travetto/runtime';
+import { Class, hasFunction, Runtime } from '@travetto/runtime';
 import { SchemaChangeListener } from '@travetto/schema';
 
-import { ModelRegistry } from '../../registry/model';
-import { ModelStorageSupport } from '../../service/storage';
-import { ModelType } from '../../types/model';
+import { ModelRegistry } from '../registry/model.ts';
+import { ModelStorageSupport } from '../types/storage.ts';
+import { ModelType } from '../types/model.ts';
 
 /**
  * Model storage util
  */
 export class ModelStorageUtil {
+
+  /**
+   * Type guard for determining if service supports storage operation
+   */
+  static isSupported = hasFunction<ModelStorageSupport>('createStorage');
+
   /**
    * Register change listener on startup
    */

package/support/base-command.ts

@@ -2,9 +2,9 @@ import { Env } from '@travetto/runtime';
 import { CliValidationError, CliCommandShape, cliTpl } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 
-import type { ModelStorageSupport } from '../src/service/storage';
+import type { ModelStorageSupport } from '../src/service/storage.ts';
 
-import { ModelCandidateUtil } from './bin/candidate';
+import { ModelCandidateUtil } from './bin/candidate.ts';
 
 /**
  * CLI Entry point for exporting model schemas

package/support/bin/candidate.ts

@@ -1,10 +1,9 @@
-import { castTo, Class } from '@travetto/runtime';
-import { ModelRegistry } from '@travetto/model/src/registry/model';
+import { toConcrete, Class } from '@travetto/runtime';
 import { InjectableConfig, DependencyRegistry } 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';
+import { ModelRegistry } from '../../src/registry/model.ts';
+import type { ModelStorageSupport } from '../../src/types/storage.ts';
+import type { ModelType } from '../../src/types/model.ts';
 
 /**
  * Utilities for finding candidates for model operations
@@ -33,14 +32,14 @@ export class ModelCandidateUtil {
    * Get model names
    */
   static async getModelNames(): Promise<string[]> {
-    return (await this.#getModels()).map(x => ModelRegistry.getStore(x)).sort();
+    return (await this.#getModels()).map(x => ModelRegistry.getStore(x)).toSorted();
   }
 
   /**
    * Get all providers that are viable candidates
    */
   static async getProviders(op?: keyof ModelStorageSupport): Promise<InjectableConfig[]> {
-    const types = DependencyRegistry.getCandidateTypes<ModelStorageSupport>(castTo(ModelStorageSupportTarget));
+    const types = DependencyRegistry.getCandidateTypes(toConcrete<ModelStorageSupport>());
     return types.filter(x => !op || x.class.prototype?.[op]);
   }
 
@@ -50,7 +49,7 @@ export class ModelCandidateUtil {
   static async getProviderNames(op?: keyof ModelStorageSupport): Promise<string[]> {
     return (await this.getProviders(op))
       .map(x => x.class.name.replace(/ModelService/, ''))
-      .sort();
+      .toSorted();
   }
 
   /**

package/support/bin/export.ts

@@ -1,6 +1,5 @@
 import type { Class } from '@travetto/runtime';
-import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
-import type { ModelType } from '@travetto/model/src/types/model';
+import type { ModelStorageSupport, ModelType } from '@travetto/model';
 
 export class ModelExportUtil {
   static async run(provider: ModelStorageSupport, models: Class<ModelType>[]): Promise<void> {

package/support/bin/install.ts

@@ -1,6 +1,5 @@
 import type { Class } from '@travetto/runtime';
-import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
-import type { ModelType } from '@travetto/model/src/types/model';
+import type { ModelStorageSupport, ModelType } from '@travetto/model';
 
 export class ModelInstallUtil {
   static async run(provider: ModelStorageSupport, models: Class<ModelType>[]): Promise<void> {

package/support/cli.model_export.ts

@@ -1,8 +1,8 @@
 import { CliCommand } from '@travetto/cli';
 
-import { BaseModelCommand } from './base-command';
-import { ModelExportUtil } from './bin/export';
-import { ModelCandidateUtil } from './bin/candidate';
+import { BaseModelCommand } from './base-command.ts';
+import { ModelExportUtil } from './bin/export.ts';
+import { ModelCandidateUtil } from './bin/candidate.ts';
 
 /**
  * Exports model schemas

package/support/cli.model_install.ts

@@ -1,8 +1,8 @@
 import { CliCommand, cliTpl } from '@travetto/cli';
 
-import { BaseModelCommand } from './base-command';
-import { ModelInstallUtil } from './bin/install';
-import { ModelCandidateUtil } from './bin/candidate';
+import { BaseModelCommand } from './base-command.ts';
+import { ModelInstallUtil } from './bin/install.ts';
+import { ModelCandidateUtil } from './bin/candidate.ts';
 
 /**
  * Installing models

package/support/doc.support.tsx

@@ -1,25 +1,37 @@
 /** @jsxImportSource @travetto/doc */
 import { d, c, DocJSXElementByFn, DocJSXElement, DocFileUtil } from '@travetto/doc';
 import { Config } from '@travetto/config';
+import { Runtime, toConcrete } from '@travetto/runtime';
+
+import { ModelBasicSupport } from '../src/types/basic.ts';
+import { ModelBlobSupport } from '../src/types/blob.ts';
+import { ModelBulkSupport } from '../src/types/bulk.ts';
+import { ModelCrudSupport } from '../src/types/crud.ts';
+import { ModelExpirySupport } from '../src/types/expiry.ts';
+import { ModelIndexedSupport } from '../src/types/indexed.ts';
+
+const toLink = (title: string, target: Function): DocJSXElementByFn<'CodeLink'> =>
+  d.codeLink(title, Runtime.getSourceFile(target), new RegExp(`\\binterface\\s+${target.name}`));
 
 export const Links = {
-  Basic: d.codeLink('Basic', '@travetto/model/src/service/basic.ts', /export interface/),
-  Crud: d.codeLink('CRUD', '@travetto/model/src/service/crud.ts', /export interface/),
-  Expiry: d.codeLink('Expiry', '@travetto/model/src/service/expiry.ts', /export interface/),
-  Indexed: d.codeLink('Indexed', '@travetto/model/src/service/indexed.ts', /export interface/),
-  Bulk: d.codeLink('Bulk', '@travetto/model/src/service/bulk.ts', /export interface/),
-  Blob: d.codeLink('Blob', '@travetto/model/src/service/blob.ts', /export interface/),
+  Basic: toLink('Basic', toConcrete<ModelBasicSupport>()),
+  Crud: toLink('CRUD', toConcrete<ModelCrudSupport>()),
+  Expiry: toLink('Expiry', toConcrete<ModelExpirySupport>()),
+  Indexed: toLink('Indexed', toConcrete<ModelIndexedSupport>()),
+  Bulk: toLink('Bulk', toConcrete<ModelBulkSupport>()),
+  Blob: toLink('Blob', toConcrete<ModelBlobSupport>()),
 };
 
 export const ModelTypes = (fn: | Function): DocJSXElement[] => {
   const { content } = DocFileUtil.readSource(fn);
   const found: DocJSXElementByFn<'CodeLink'>[] = [];
-  const seen = new Set();
-  for (const [, key] of content.matchAll(/Model(Crud|Expiry|Indexed|Bulk|Blob)Support/g)) {
-    if (!seen.has(key)) {
+  const seen = new Set<string>();
+  for (const [, key] of content.matchAll(/Model([A-Za-z]+)Support/g)) {
+    if (!seen.has(key) && key in Links) {
       seen.add(key);
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      found.push(Links[key as keyof typeof Links]);
+      const link = Links[key as keyof typeof Links];
+      found.push(link);
     }
   }
   return found.map(v => <li>{v}</li>);
@@ -33,7 +45,7 @@ export const ModelCustomConfig = ({ cfg }: { cfg: Function }): DocJSXElement =>
 
   where the {cfg} is defined by:
 
-  <c.Code title={`Structure of ${cfg.name}`} src={cfg} />
+  <c.Code title={`Structure of ${cfg.name}`} src={cfg} startRe={/@Config/} />
 
   Additionally, you can see that the class is registered with the {Config} annotation, and so these values can be overridden using the
   standard {d.mod('Config')}resolution paths.

package/support/test/base.ts

@@ -1,9 +1,10 @@
 import { DependencyRegistry } from '@travetto/di';
 import { AppError, castTo, Class, classConstruct } from '@travetto/runtime';
 
-import { isBulkSupported, isCrudSupported } from '../../src/internal/service/common';
-import { ModelType } from '../../src/types/model';
-import { ModelSuite } from './suite';
+import { ModelBulkUtil } from '../../src/util/bulk.ts';
+import { ModelCrudUtil } from '../../src/util/crud.ts';
+import { ModelType } from '../../src/types/model.ts';
+import { ModelSuite } from './suite.ts';
 
 type ServiceClass = { serviceClass: { new(): unknown } };
 
@@ -19,7 +20,7 @@ export abstract class BaseModelSuite<T> {
 
   async getSize<U extends ModelType>(cls: Class<U>): Promise<number> {
     const svc = (await this.service);
-    if (isCrudSupported(svc)) {
+    if (ModelCrudUtil.isSupported(svc)) {
       let i = 0;
       for await (const __el of svc.list(cls)) {
         i += 1;
@@ -32,10 +33,10 @@ export abstract class BaseModelSuite<T> {
 
   async saveAll<M extends ModelType>(cls: Class<M>, items: M[]): Promise<number> {
     const svc = await this.service;
-    if (isBulkSupported(svc)) {
-      const res = await svc.processBulk(cls, items.map(x => ({ insert: x })));
-      return res.counts.insert;
-    } else if (isCrudSupported(svc)) {
+    if (ModelBulkUtil.isSupported(svc)) {
+      const result = await svc.processBulk(cls, items.map(x => ({ insert: x })));
+      return result.counts.insert;
+    } else if (ModelCrudUtil.isSupported(svc)) {
       const out: Promise<M>[] = [];
       for (const el of items) {
         out.push(svc.create(cls, el));

package/support/test/basic.ts

@@ -3,7 +3,7 @@ import assert from 'node:assert';
 import { Suite, Test } from '@travetto/test';
 import { ModelCrudSupport, Model, NotFoundError } from '@travetto/model';
 
-import { BaseModelSuite } from './base';
+import { BaseModelSuite } from './base.ts';
 
 @Model('basic_person')
 class Person {

package/support/test/blob.ts

@@ -1,11 +1,12 @@
 import assert from 'node:assert';
 
 import { Suite, Test, TestFixtures } from '@travetto/test';
-import { BaseModelSuite } from '@travetto/model/support/test/base';
 import { BinaryUtil, Util } from '@travetto/runtime';
 
-import { ModelBlobSupport } from '../../src/service/blob';
-import { ModelBlobUtil } from '../../src/internal/service/blob';
+import { BaseModelSuite } from '@travetto/model/support/test/base.ts';
+
+import { ModelBlobSupport } from '../../src/types/blob.ts';
+import { ModelBlobUtil } from '../../src/util/blob.ts';
 
 const meta = BinaryUtil.getBlobMeta;
 
@@ -168,14 +169,14 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
     console.log(writable);
     assert(writable);
 
-    const res = await fetch(writable, {
+    const response = await fetch(writable, {
       method: 'PUT',
       body: new File([buffer], 'gary', { type: 'image/jpeg' }),
     });
 
-    console.error(await res.text());
+    console.error(await response.text());
 
-    assert(res.ok);
+    assert(response.ok);
 
     await service.updateBlobMeta('largeFile/one', {
       contentType: 'image/jpeg',

package/support/test/bulk.ts

@@ -2,9 +2,9 @@ import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 
-import { Model } from '../../src/registry/decorator';
-import { ModelBulkSupport } from '../../src/service/bulk';
-import { BaseModelSuite } from './base';
+import { Model } from '../../src/registry/decorator.ts';
+import { ModelBulkSupport } from '../../src/types/bulk.ts';
+import { BaseModelSuite } from './base.ts';
 
 @Model('bulk-user')
 class User {
@@ -18,29 +18,29 @@ export abstract class ModelBulkSuite extends BaseModelSuite<ModelBulkSupport> {
   @Test()
   async bulkInsert() {
     const service = await this.service;
-    const res = await service.processBulk(User, [
+    const result = await service.processBulk(User, [
       { insert: User.from({}) },
       { insert: User.from({}) },
       { insert: User.from({}) },
       { insert: User.from({}) }
     ]);
 
-    assert(res.counts.insert === 4);
-    assert(res.insertedIds.size === 4);
+    assert(result.counts.insert === 4);
+    assert(result.insertedIds.size === 4);
   }
 
   @Test()
   async bulkUpsert() {
     const service = await this.service;
-    const res = await service.processBulk(User, [
+    const result = await service.processBulk(User, [
       { upsert: User.from({}) },
       { upsert: User.from({}) },
       { upsert: User.from({}) },
       { upsert: User.from({}) }
     ]);
 
-    assert(res.counts.upsert === 4);
-    assert(res.insertedIds.size === 4);
+    assert(result.counts.upsert === 4);
+    assert(result.insertedIds.size === 4);
   }
 
   @Test()
@@ -48,9 +48,9 @@ export abstract class ModelBulkSuite extends BaseModelSuite<ModelBulkSupport> {
     const service = await this.service;
     const users = [0, 1, 2, 4].map(x => User.from({ name: `name-${x}`, id: service.idSource.create() }));
 
-    const res = await service.processBulk(User, users.map(u => ({ insert: u })));
-    assert(res.counts.insert === 4);
-    assert(res.insertedIds.size === 4);
+    const result = await service.processBulk(User, users.map(u => ({ insert: u })));
+    assert(result.counts.insert === 4);
+    assert(result.insertedIds.size === 4);
 
     const res2 = await service.processBulk(User, users.map(u => ({ update: u })));
     assert(res2.counts.update === 4);
@@ -62,9 +62,9 @@ export abstract class ModelBulkSuite extends BaseModelSuite<ModelBulkSupport> {
     const service = await this.service;
     const users = [0, 1, 2, 4].map(x => User.from({ name: `name-${x}`, id: service.idSource.create() }));
 
-    const res = await service.processBulk(User, users.map(u => ({ insert: u })));
-    assert(res.counts.insert === 4);
-    assert(res.insertedIds.size === 4);
+    const result = await service.processBulk(User, users.map(u => ({ insert: u })));
+    assert(result.counts.insert === 4);
+    assert(result.insertedIds.size === 4);
 
     const res2 = await service.processBulk(User, users.map(u => ({ delete: u })));
     assert(res2.counts.delete === 4);

package/support/test/crud.ts

@@ -5,7 +5,7 @@ import { Suite, Test } from '@travetto/test';
 import { Schema, Text, Precision, Required, } from '@travetto/schema';
 import { ModelCrudSupport, Model, NotFoundError, PersistValue } from '@travetto/model';
 
-import { BaseModelSuite } from './base';
+import { BaseModelSuite } from './base.ts';
 
 @Schema()
 class Address {
@@ -213,22 +213,22 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
   @Test('verify dates')
   async testDates() {
     const service = await this.service;
-    const res = await service.create(Dated, Dated.from({ createdDate: new Date() }));
+    const result = await service.create(Dated, Dated.from({ createdDate: new Date() }));
 
-    assert(res.createdDate instanceof Date);
+    assert(result.createdDate instanceof Date);
   }
 
   @Test('verify pre-persist on create/update')
   async testPrePersist() {
     const service = await this.service;
-    const res = await service.create(Dated, Dated.from({}));
-    const created = res.createdDate;
-    assert(res.createdDate instanceof Date);
-    assert(res.updatedDate instanceof Date);
+    const result = await service.create(Dated, Dated.from({}));
+    const created = result.createdDate;
+    assert(result.createdDate instanceof Date);
+    assert(result.updatedDate instanceof Date);
 
     await timers.setTimeout(100);
 
-    const final = await service.updatePartial(Dated, { id: res.id, value: 'random' });
+    const final = await service.updatePartial(Dated, { id: result.id, value: 'random' });
     assert(final.createdDate instanceof Date);
     assert(final.createdDate.getTime() === created?.getTime());
     assert(final.updatedDate instanceof Date);
@@ -254,7 +254,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
       people.map(el => service.upsert(Person, el))
     );
 
-    const found = (await this.toArray(service.list(Person))).sort((a, b) => a.age - b.age);
+    const found = (await this.toArray(service.list(Person))).toSorted((a, b) => a.age - b.age);
 
     assert(found[0].age === people[0].age);
     assert(found[1].age === people[1].age);

package/support/test/expiry.ts

@@ -4,11 +4,11 @@ import timers from 'node:timers/promises';
 import { Suite, Test } from '@travetto/test';
 import { TimeSpan, TimeUnit, TimeUtil } from '@travetto/runtime';
 
-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';
+import { ExpiresAt, Model } from '../../src/registry/decorator.ts';
+import { ModelExpirySupport } from '../../src/types/expiry.ts';
+import { ModelExpiryUtil } from '../../src/util/expiry.ts';
+import { NotFoundError } from '../../src/error/not-found.ts';
+import { BaseModelSuite } from './base.ts';
 
 @Model('expiry-user')
 export class ExpiryUser {
@@ -34,63 +34,63 @@ export abstract class ModelExpirySuite extends BaseModelSuite<ModelExpirySupport
   @Test()
   async basic() {
     const service = await this.service;
-    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
+    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow('2s')
     }));
-    assert(res instanceof ExpiryUser);
+    assert(result instanceof ExpiryUser);
 
-    const expiry = ModelExpiryUtil.getExpiryState(ExpiryUser, await service.get(ExpiryUser, res.id));
+    const expiry = ModelExpiryUtil.getExpiryState(ExpiryUser, await service.get(ExpiryUser, result.id));
     assert(!expiry.expired);
   }
 
   @Test()
   async aging() {
     const service = await this.service;
-    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
+    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow(100)
     }));
 
-    assert(res instanceof ExpiryUser);
+    assert(result instanceof ExpiryUser);
 
     await this.wait(200);
 
-    await assert.rejects(() => service.get(ExpiryUser, res.id), NotFoundError);
+    await assert.rejects(() => service.get(ExpiryUser, result.id), NotFoundError);
   }
 
   @Test()
   async updateExpired() {
     const service = await this.service;
-    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
+    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow(100)
     }));
 
-    assert(res instanceof ExpiryUser);
+    assert(result instanceof ExpiryUser);
 
     await this.wait(200);
 
-    await assert.rejects(() => service.update(ExpiryUser, ExpiryUser.from({ id: res.id })), NotFoundError);
+    await assert.rejects(() => service.update(ExpiryUser, ExpiryUser.from({ id: result.id })), NotFoundError);
   }
 
   @Test()
   async ageWithExtension() {
     const service = await this.service;
-    const res = await service.upsert(ExpiryUser, ExpiryUser.from({
+    const result = await service.upsert(ExpiryUser, ExpiryUser.from({
       expiresAt: this.timeFromNow('2s')
     }));
-    assert(res instanceof ExpiryUser);
+    assert(result instanceof ExpiryUser);
 
     await this.wait(50);
 
-    assert(!ModelExpiryUtil.getExpiryState(ExpiryUser, (await service.get(ExpiryUser, res.id))).expired);
+    assert(!ModelExpiryUtil.getExpiryState(ExpiryUser, (await service.get(ExpiryUser, result.id))).expired);
 
     await service.updatePartial(ExpiryUser, {
-      id: res.id,
+      id: result.id,
       expiresAt: this.timeFromNow(100)
     });
 
     await this.wait(200);
 
-    await assert.rejects(() => service.get(ExpiryUser, res.id), NotFoundError);
+    await assert.rejects(() => service.get(ExpiryUser, result.id), NotFoundError);
   }
 
   @Test()

package/support/test/indexed.ts

@@ -4,12 +4,12 @@ import { Suite, Test } from '@travetto/test';
 import { Schema } from '@travetto/schema';
 import { TimeUtil } from '@travetto/runtime';
 
-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.ts';
+import { ModelIndexedSupport } from '../../src/types/indexed.ts';
+import { NotFoundError } from '../../src/error/not-found.ts';
+import { IndexNotSupported } from '../../src/error/invalid-index.ts';
 
-import { BaseModelSuite } from './base';
+import { BaseModelSuite } from './base.ts';
 
 @Model('index_user')
 @Index({

package/support/test/polymorphism.ts

@@ -9,10 +9,10 @@ import {
   NotFoundError, SubTypeNotSupportedError, PersistValue
 } from '@travetto/model';
 
-import { isIndexedSupported } from '../../src/internal/service/common';
-import { ExistsError } from '../../src/error/exists';
+import { ModelIndexedUtil } from '../../src/util/indexed.ts';
+import { ExistsError } from '../../src/error/exists.ts';
 
-import { BaseModelSuite } from './base';
+import { BaseModelSuite } from './base.ts';
 
 @Model({ baseType: true })
 export class Worker {
@@ -171,11 +171,11 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     await timers.setTimeout(15);
 
     try {
-      const res = await service.upsert(Doctor, Doctor.from({
+      const result = await service.upsert(Doctor, Doctor.from({
         id: doc.id, name: 'gob', specialty: 'eyes'
       }));
 
-      assert(res.updatedDate!.getTime() > update.getTime());
+      assert(result.updatedDate!.getTime() > update.getTime());
     } catch (err) {
       assert(err instanceof SubTypeNotSupportedError);
     }
@@ -207,7 +207,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     );
   }
 
-  @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(isIndexedSupported) })
+  @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(ModelIndexedUtil.isSupported) })
   async polymorphicIndexGet() {
     const service: ModelIndexedSupport = castTo(await this.service);
     const now = 30;
@@ -219,12 +219,12 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
 
     await this.saveAll(IndexedWorker, [doc, fire, eng]);
 
-    const res = await service.getByIndex(IndexedWorker, 'worker-name', {
+    const result = await service.getByIndex(IndexedWorker, 'worker-name', {
       age: now,
       name: 'rob'
     });
 
-    assert(res instanceof IndexedFirefighter);
+    assert(result instanceof IndexedFirefighter);
 
     try {
       const res2 = await service.getByIndex(IndexedFirefighter, 'worker-name', {
@@ -237,7 +237,7 @@ export abstract class ModelPolymorphismSuite extends BaseModelSuite<ModelCrudSup
     }
   }
 
-  @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(isIndexedSupported) })
+  @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(ModelIndexedUtil.isSupported) })
   async polymorphicIndexDelete() {
     const service: ModelIndexedSupport = castTo(await this.service);
     const now = 30;

package/support/test/suite.ts

@@ -3,9 +3,9 @@ import { DependencyRegistry } from '@travetto/di';
 import { RootRegistry } from '@travetto/registry';
 import { SuiteRegistry, TestFixtures } from '@travetto/test';
 
-import { isBlobSupported, isStorageSupported } from '../../src/internal/service/common';
-import { MODEL_BLOB } from '../../src/internal/service/blob';
-import { ModelRegistry } from '../../src/registry/model';
+import { ModelBlobUtil } from '../../src/util/blob.ts';
+import { ModelStorageUtil } from '../../src/util/storage.ts';
+import { ModelRegistry } from '../../src/registry/model.ts';
 
 const Loaded = Symbol();
 
@@ -35,7 +35,7 @@ export function ModelSuite<T extends { configClass: Class<{ autoCreate?: boolean
       target,
       async function (this: T) {
         const service = await DependencyRegistry.getInstance(this.serviceClass, qualifier);
-        if (isStorageSupported(service)) {
+        if (ModelStorageUtil.isSupported(service)) {
           await service.createStorage();
           if (service.createModel) {
             await Promise.all(ModelRegistry.getClasses()
@@ -50,10 +50,11 @@ export function ModelSuite<T extends { configClass: Class<{ autoCreate?: boolean
       target,
       async function (this: T) {
         const service = await DependencyRegistry.getInstance(this.serviceClass, qualifier);
-        if (isStorageSupported(service)) {
+        if (ModelStorageUtil.isSupported(service)) {
           const models = ModelRegistry.getClasses().filter(m => m === ModelRegistry.getBaseModel(m));
-          if (isBlobSupported(service)) {
-            models.push(MODEL_BLOB);
+
+          if (ModelBlobUtil.isSupported(service) && service.truncateBlob) {
+            await service.truncateBlob();
           }
 
           if (service.truncateModel) {
@@ -71,7 +72,7 @@ export function ModelSuite<T extends { configClass: Class<{ autoCreate?: boolean
       target,
       async function (this: T) {
         const service = await DependencyRegistry.getInstance(this.serviceClass, qualifier);
-        if (isStorageSupported(service)) {
+        if (ModelStorageUtil.isSupported(service)) {
           if (service.deleteModel) {
             for (const m of ModelRegistry.getClasses()) {
               if (m === ModelRegistry.getBaseModel(m)) {

package/src/internal/service/common.ts

@@ -1,51 +0,0 @@
-import { hasFunction } from '@travetto/runtime';
-
-import type { ModelBulkSupport } from '../../service/bulk';
-import type { ModelCrudSupport } from '../../service/crud';
-import type { ModelExpirySupport } from '../../service/expiry';
-import type { ModelIndexedSupport } from '../../service/indexed';
-import type { ModelStorageSupport } from '../../service/storage';
-import type { ModelBlobSupport } from '../../service/blob';
-
-export class ModelBasicSupportTarget { }
-export class ModelCrudSupportTarget { }
-export class ModelBulkSupportTarget { }
-export class ModelStorageSupportTarget { }
-export class ModelBlobSupportTarget { }
-export class ModelExpirySupportTarget { }
-export class ModelIndexedSupportTarget { }
-
-/**
- * Type guard for determining if service supports basic operations
- */
-export const isBasicSupported = hasFunction<ModelBulkSupport>('create');
-
-/**
- * Type guard for determining if service supports crud operations
- */
-export const isCrudSupported = hasFunction<ModelCrudSupport>('upsert');
-
-/**
- * Type guard for determining if model supports expiry
- */
-export const isExpirySupported = hasFunction<ModelExpirySupport>('deleteExpired');
-
-/**
- * Type guard for determining if service supports blob operations
- */
-export const isBlobSupported = hasFunction<ModelBlobSupport>('getBlob');
-
-/**
- * Type guard for determining if service supports storage operation
- */
-export const isStorageSupported = hasFunction<ModelStorageSupport>('createStorage');
-
-/**
- * Type guard for determining if service supports bulk operation
- */
-export const isBulkSupported = hasFunction<ModelBulkSupport>('processBulk');
-
-/**
- * Type guard for determining if service supports indexed operation
- */
-export const isIndexedSupported = hasFunction<ModelIndexedSupport>('getByIndex');