@travetto/model-indexed 8.0.0-alpha.16 → 8.0.0-alpha.19

package/README.md

@@ -136,7 +136,7 @@ export const specificOrders = keyedIndex(Order, {
 ```
 
 ## Using Indexes
-Model services that implement [ModelIndexedSupport](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L15) allow you to query using the indexes you've defined.
+Model services that implement [ModelIndexedSupport](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L16) allow you to query using the indexes you've defined.
 
 ### Service Interface
 
@@ -216,7 +216,7 @@ export interface ModelIndexedSupport extends ModelBasicSupport {
   pageByIndex<
     T extends ModelType,
     S extends SortedIndexSelection<T>,
-    K extends KeyedIndexSelection<T>
+    K extends KeyedIndexSelection<T>,
   >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, options?: ModelPageOptions): Promise<ModelPageResult<T>>;
 
   /**
@@ -232,8 +232,26 @@ export interface ModelIndexedSupport extends ModelBasicSupport {
   listByIndex<
     T extends ModelType,
     S extends SortedIndexSelection<T>,
-    K extends KeyedIndexSelection<T>
+    K extends KeyedIndexSelection<T>,
   >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, options?: ModelListOptions): AsyncIterable<T[]>;
+
+  /**
+   * Suggest entities by ranged index as defined by fields of idx and a prefix
+   *
+   * Note: Limit is generally honored, but can vary depending on the underlying storage implementation.
+   *
+   * @param cls The type to search by
+   * @param idx The index to search against
+   * @param body The payload of fields needed to search
+   * @param prefix The prefix to use for suggesting entities
+   * @param options The configuration for pagination
+   */
+  suggestByIndex<
+    T extends ModelType,
+    S extends SortedIndexSelection<T>,
+    K extends KeyedIndexSelection<T>,
+    B extends SortedIndexSelectionType<T, S> & string
+  >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, prefix: B, options?: ModelIndexedSearchOptions): Promise<T[]>;
 }
 ```
 
@@ -383,7 +401,7 @@ export async function listWithFilterExample(modelService: ModelIndexedSupport) {
 ```
 
 ## Integration
-Index registration happens automatically when models are decorated with [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L14). Model services like [Memory Model Support](https://github.com/travetto/travetto/tree/main/module/model-memory#readme "Memory backing for the travetto model module."), [MongoDB Model Support](https://github.com/travetto/travetto/tree/main/module/model-mongo#readme "Mongo backing for the travetto model module."), and [SQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-sql#readme "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.") implement the [ModelIndexedSupport](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L15) interface to provide indexed access.
+Index registration happens automatically when models are decorated with [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L14). Model services like [Memory Model Support](https://github.com/travetto/travetto/tree/main/module/model-memory#readme "Memory backing for the travetto model module."), [MongoDB Model Support](https://github.com/travetto/travetto/tree/main/module/model-mongo#readme "Mongo backing for the travetto model module."), and [SQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-sql#readme "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.") implement the [ModelIndexedSupport](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L16) interface to provide indexed access.
 
 ### Reading Registry Information
 You can access registered indexes via [ModelRegistryIndex](https://github.com/travetto/travetto/tree/main/module/model/src/registry/registry-index.ts#L12) at runtime:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-indexed",
-  "version": "8.0.0-alpha.16",
+  "version": "8.0.0-alpha.19",
   "type": "module",
   "description": "Basic indexing support for model sources that support it.",
   "keywords": [
@@ -26,13 +26,13 @@
     "directory": "module/model-indexed"
   },
   "dependencies": {
-    "@travetto/model": "^8.0.0-alpha.14",
-    "@travetto/registry": "^8.0.0-alpha.13",
-    "@travetto/schema": "^8.0.0-alpha.14"
+    "@travetto/model": "^8.0.0-alpha.17",
+    "@travetto/registry": "^8.0.0-alpha.16",
+    "@travetto/schema": "^8.0.0-alpha.17"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.19",
-    "@travetto/test": "^8.0.0-alpha.13"
+    "@travetto/cli": "^8.0.0-alpha.22",
+    "@travetto/test": "^8.0.0-alpha.16"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/computed.ts

@@ -2,8 +2,7 @@ import type { ModelType } from '@travetto/model';
 import { castTo, type Any } from '@travetto/runtime';
 
 import {
-  type KeyedIndexSelection, type SortedIndexSelection, type AllIndexes, type KeyedIndexBody,
-  type FullKeyedIndexBody, type TemplateValue, type TemplatePart
+  type AllIndexes, type KeyedIndexBody, type FullKeyedIndexBody, type TemplateValue, type TemplatePart
 } from './types/indexes.ts';
 import { IndexedFieldError } from './types/error.ts';
 
@@ -67,8 +66,8 @@ type Body<T extends ModelType> = KeyedIndexBody<T, Any> | FullKeyedIndexBody<T,
 type IndexProcessConfig<T = {}> = T & { keyed?: boolean, sort?: boolean };
 
 export class ModelIndexedComputedIndex<T extends ModelType> {
-  static get<T extends ModelType, K extends KeyedIndexSelection<T>, S extends SortedIndexSelection<T>>(
-    idx: AllIndexes<T, K, S>,
+  static get<T extends ModelType>(
+    idx: AllIndexes<T>,
     body: Body<T>,
   ): ModelIndexedComputedIndex<T> {
     return new ModelIndexedComputedIndex(idx, body);
@@ -85,7 +84,8 @@ export class ModelIndexedComputedIndex<T extends ModelType> {
   ) {
     this.idx = idx;
     this.keyedParts = buildIndexParts(idx.keyTemplate, castTo(body));
-    this.sortParts = buildIndexParts(idx.sortTemplate, castTo(body), value => typeof value === 'number' || value instanceof Date);
+    this.sortParts = buildIndexParts(idx.sortTemplate, castTo(body),
+      value => typeof value === 'number' || value instanceof Date || typeof value === 'string');
     if ('id' in body && typeof body.id === 'string') {
       this.idPart = { path: ['id'], value: body.id, state: body.id === null || body.id === undefined ? 'empty' : 'found', templateValue: true };
     }
@@ -112,13 +112,15 @@ export class ModelIndexedComputedIndex<T extends ModelType> {
     return parts.map(({ value }) => value).map(value => `${value}`).join(sep);
   }
 
-  getSort(): number {
+  getSort(): number | string {
     const { value } = this.sortParts[0] ?? {};
     const direction = (this.sortParts[0]?.templateValue ?? 1);
     if (value instanceof Date) {
       return value.getTime() * direction;
     } else if (typeof value === 'number') {
       return value * direction;
+    } else if (typeof value === 'string') {
+      return value;
     } else {
       return 0;
     }

package/src/types/indexes.ts

@@ -1,19 +1,30 @@
 import type { ModelType, IndexConfig } from '@travetto/model';
 import { type IntrinsicType, type Any, type DeepPartial } from '@travetto/runtime';
 
-type TypeProjection<T, V> = {
+type SortScalar = string | number | Date;
+
+type TypeProjection<T, V, B = IntrinsicType> = {
   [P in keyof T]?:
-  (T[P] extends (IntrinsicType | undefined) ? (V | undefined) :
+  (T[P] extends (B | undefined) ? (V | undefined) :
     (T[P] extends Any[] ?
-      (TypeProjection<T[P][number], V> | null | undefined)[] :
-      TypeProjection<T[P], V>)
+      (TypeProjection<T[P][number], V, B> | null | undefined)[] :
+      TypeProjection<T[P], V, B>)
   );
 };
 
+export type SortedIndexSelectionType<T, S> =
+  (T extends SortScalar ? T :
+    (T extends Any[] ? SortedIndexSelectionType<T[number], S> :
+      (S extends object ? (
+        (T extends object ?
+          { [K in keyof S]: K extends keyof T ? SortedIndexSelectionType<T[K], S[K]> : never }[keyof S] :
+          never
+        )) : never)));
+
 export type KeyedIndexSelection<T extends ModelType> = TypeProjection<T, true>;
 export type SortedIndexSelection<T extends ModelType> = TypeProjection<T, 1 | -1>;
 
-export type KeyedIndexBody<T, K> = {
+export type KeyedIndexBody<T, K = Any> = {
   [P in keyof K]: (P extends keyof T ?
     (K[P] extends true | 1 | -1 ? T[P] :
       (T[P] extends Any[] | null | undefined ? T[P] :
@@ -52,8 +63,8 @@ export type TemplatePart<T extends TemplateValue = TemplateValue> = { path: stri
 
 export interface KeyedIndex<
   T extends ModelType,
-  K extends KeyedIndexSelection<T>,
-  S extends SortedIndexSelection<T>
+  K extends KeyedIndexSelection<T> = Any,
+  S extends SortedIndexSelection<T> = Any,
 > extends IndexConfig<'indexed:keyed'> {
   key: K;
   sort: S;
@@ -64,8 +75,8 @@ export interface KeyedIndex<
 
 export interface SortedIndex<
   T extends ModelType,
-  K extends KeyedIndexSelection<T>,
-  S extends SortedIndexSelection<T>
+  K extends KeyedIndexSelection<T> = Any,
+  S extends SortedIndexSelection<T> = Any
 > extends IndexConfig<'indexed:sorted'> {
   key: K;
   sort: S;
@@ -76,12 +87,13 @@ export interface SortedIndex<
 export type SingleItemIndex<
   T extends ModelType,
   K extends KeyedIndexSelection<T> = Any,
-  S extends SortedIndexSelection<T> = Any
+  S extends SortedIndexSelection<T> = Any,
 > = KeyedIndex<T, K, S> | SortedIndex<T, K, S>;
 
 export type AllIndexes<
   T extends ModelType,
   K extends KeyedIndexSelection<T> = Any,
-  S extends SortedIndexSelection<T> = Any
+  S extends SortedIndexSelection<T> = Any,
 > = KeyedIndex<T, K, S> | SortedIndex<T, K, S>;
 
+

package/src/types/list.ts

@@ -1,8 +1,11 @@
 import type { ModelType } from '@travetto/model';
 
-export interface ModelPageOptions<O = string> {
+export interface ModelIndexedSearchOptions {
   batchSizeHint?: number;
   limit?: number;
+}
+
+export interface ModelPageOptions<O = string> extends ModelIndexedSearchOptions {
   offset?: O;
 }
 

package/src/types/service.ts

@@ -3,9 +3,10 @@ import type { Class } from '@travetto/runtime';
 
 import type {
   KeyedIndexSelection, KeyedIndexBody, SortedIndexSelection, SortedIndex,
-  SingleItemIndex, FullKeyedIndexBody, FullKeyedIndexWithPartialBody
+  SingleItemIndex, FullKeyedIndexBody, FullKeyedIndexWithPartialBody,
+  SortedIndexSelectionType
 } from './indexes.ts';
-import type { ModelPageOptions, ModelPageResult } from './list.ts';
+import type { ModelIndexedSearchOptions, ModelPageOptions, ModelPageResult } from './list.ts';
 
 /**
  * Support for simple indexed activity
@@ -86,7 +87,7 @@ export interface ModelIndexedSupport extends ModelBasicSupport {
   pageByIndex<
     T extends ModelType,
     S extends SortedIndexSelection<T>,
-    K extends KeyedIndexSelection<T>
+    K extends KeyedIndexSelection<T>,
   >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, options?: ModelPageOptions): Promise<ModelPageResult<T>>;
 
   /**
@@ -102,6 +103,24 @@ export interface ModelIndexedSupport extends ModelBasicSupport {
   listByIndex<
     T extends ModelType,
     S extends SortedIndexSelection<T>,
-    K extends KeyedIndexSelection<T>
+    K extends KeyedIndexSelection<T>,
   >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, options?: ModelListOptions): AsyncIterable<T[]>;
+
+  /**
+   * Suggest entities by ranged index as defined by fields of idx and a prefix
+   *
+   * Note: Limit is generally honored, but can vary depending on the underlying storage implementation.
+   *
+   * @param cls The type to search by
+   * @param idx The index to search against
+   * @param body The payload of fields needed to search
+   * @param prefix The prefix to use for suggesting entities
+   * @param options The configuration for pagination
+   */
+  suggestByIndex<
+    T extends ModelType,
+    S extends SortedIndexSelection<T>,
+    K extends KeyedIndexSelection<T>,
+    B extends SortedIndexSelectionType<T, S> & string
+  >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, prefix: B, options?: ModelIndexedSearchOptions): Promise<T[]>;
 }

package/src/util.ts

@@ -59,4 +59,11 @@ export class ModelIndexedUtil {
     body.id = id;
     return await service.update(cls, castTo(body));
   }
+
+  /**
+   * Build regex for suggesting
+   */
+  static getSuggestRegex(prefix?: string): RegExp {
+    return prefix ? new RegExp(`^${prefix}`, 'i') : /./;
+  }
 }

package/support/test/indexed.ts

@@ -2,91 +2,18 @@ import assert from 'node:assert';
 import timers from 'node:timers/promises';
 
 import { Suite, Test } from '@travetto/test';
-import { Schema } from '@travetto/schema';
 import { castTo, TimeUtil } from '@travetto/runtime';
-import { ExistsError, Model, NotFoundError } from '@travetto/model';
+import { ExistsError, ModelBulkUtil, NotFoundError } from '@travetto/model';
 import { BaseModelSuite } from '@travetto/model/support/test/base.ts';
 
 import type { ModelIndexedSupport } from '../../src/types/service.ts';
-import { keyedIndex, sortedIndex, uniqueIndex } from '../../src/indexes.ts';
 import { IndexedFieldError } from '../../src/types/error.ts';
 
-@Model('index_user')
-class User {
-  id: string;
-  name: string;
-}
-
-const userNameIndex = keyedIndex(User, {
-  name: 'userName',
-  key: { name: true }
-});
-
-@Model('index_unique_user')
-class UniqueUser {
-  id: string;
-  name: string;
-}
-
-const userUniqueNameIndex = uniqueIndex(UniqueUser, {
-  name: 'userUniqueName',
-  key: { name: true }
-});
-
-@Model('index_user_2')
-class User2 {
-  id: string;
-  name: string;
-}
-
-@Model()
-class User3 {
-  id: string;
-  name: string;
-  age: number;
-  color?: string;
-}
-
-const userAgeIndex = sortedIndex(User3, {
-  name: 'userAge',
-  key: { name: true },
-  sort: { age: 1 }
-});
-const userAgeReversedIndex = sortedIndex(User3, {
-  name: 'userAgeReverse',
-  key: { name: true },
-  sort: { age: -1 }
-});
-const userAgeNoKeyIndex = sortedIndex(User3, {
-  name: 'userAgeNoKey',
-  key: {},
-  sort: { age: 1 }
-});
-
-@Schema()
-class Child {
-  name: string;
-  age: number;
-}
-
-@Model()
-class User4 {
-  id: string;
-  createdDate?: Date = new Date();
-  color: string;
-  child: Child;
-}
-
-const childAgeIndex = sortedIndex(User4, {
-  name: 'childAge',
-  key: { child: { name: true } },
-  sort: { child: { age: 1 } }
-});
-const nameCreatedIndex = sortedIndex(User4, {
-  name: 'nameCreated',
-  key: { child: { name: true } },
-  sort: { createdDate: 1 }
-});
+import { SUGGEST_DATA, SuggestItem, suggestSort } from './models/suggest.ts';
+import {
+  childAgeIndex, nameCreatedIndex, UniqueUser, User, User2, User3, User4, userAgeIndex,
+  userAgeNoKeyIndex, userAgeReversedIndex, userNameIndex, userUniqueNameIndex
+} from './models/indexed.ts';
 
 @Suite()
 export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSupport> {
@@ -95,6 +22,17 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
   supportsDeepIndexes = true;
   supportsUniqueIndexes = true;
 
+  async #seed(names: string[]): Promise<void> {
+    const service = await this.service;
+    if (ModelBulkUtil.isSupported(service)) {
+      await service.processBulk(SuggestItem, names.map(name => ({ insert: { name } })));
+    } else {
+      for (const item of names) {
+        await service.create(SuggestItem, SuggestItem.from({ name: item }));
+      }
+    }
+  }
+
   @Test()
   async writeAndRead() {
     const service = await this.service;
@@ -424,4 +362,40 @@ export abstract class ModelIndexedSuite extends BaseModelSuite<ModelIndexedSuppo
       assert(found.length === 1);
     }
   }
+
+  @Test('suggestByIndex returns items matching prefix')
+  async testSuggestSearchBasic() {
+    const service = await this.service;
+
+    await this.#seed(SUGGEST_DATA);
+
+    const results = await service.suggestByIndex(SuggestItem, suggestSort, {}, 'ap', { limit: 10 });
+
+    assert(results.length === 10);
+    assert(results.every(r => r.name.startsWith('ap')));
+  }
+
+  @Test('suggestByIndex returns empty array when no items match prefix')
+  async testSuggestSearchNoMatch() {
+    const service = await this.service;
+
+    await this.#seed(SUGGEST_DATA);
+
+    const results = await service.suggestByIndex(SuggestItem, suggestSort, {}, 'zzz');
+
+    assert(results.length === 0);
+  }
+
+  @Test('suggestByIndex respects limit option')
+  async testSuggestSearchLimit() {
+    const service = await this.service;
+
+    await this.#seed(SUGGEST_DATA);
+
+    const results = await service.suggestByIndex(SuggestItem, suggestSort, {}, 'ba', { limit: 5 });
+
+    assert(results.length === 5);
+    assert(/^ba/.test(results[0].name));
+    assert(results.every(r => r.name.startsWith('ba')));
+  }
 }

package/support/test/models/indexed.ts

@@ -0,0 +1,82 @@
+import { Model } from '@travetto/model';
+import { Schema } from '@travetto/schema';
+
+import { keyedIndex, sortedIndex, uniqueIndex } from '../../../src/indexes.ts';
+
+@Model('index_user')
+export class User {
+  id: string;
+  name: string;
+}
+
+export const userNameIndex = keyedIndex(User, {
+  name: 'userName',
+  key: { name: true }
+});
+
+@Model('index_unique_user')
+export class UniqueUser {
+  id: string;
+  name: string;
+}
+
+export const userUniqueNameIndex = uniqueIndex(UniqueUser, {
+  name: 'userUniqueName',
+  key: { name: true }
+});
+
+@Model('index_user_2')
+export class User2 {
+  id: string;
+  name: string;
+}
+
+@Model()
+export class User3 {
+  id: string;
+  name: string;
+  age: number;
+  color?: string;
+}
+
+export const userAgeIndex = sortedIndex(User3, {
+  name: 'userAge',
+  key: { name: true },
+  sort: { age: 1 }
+});
+export const userAgeReversedIndex = sortedIndex(User3, {
+  name: 'userAgeReverse',
+  key: { name: true },
+  sort: { age: -1 }
+});
+export const userAgeNoKeyIndex = sortedIndex(User3, {
+  name: 'userAgeNoKey',
+  key: {},
+  sort: { age: 1 }
+});
+
+@Schema()
+export class Child {
+  name: string;
+  age: number;
+}
+
+@Model()
+export class User4 {
+  id: string;
+  createdDate?: Date = new Date();
+  color: string;
+  child: Child;
+}
+
+export const childAgeIndex = sortedIndex(User4, {
+  name: 'childAge',
+  key: { child: { name: true } },
+  sort: { child: { age: 1 } }
+});
+
+export const nameCreatedIndex = sortedIndex(User4, {
+  name: 'nameCreated',
+  key: { child: { name: true } },
+  sort: { createdDate: 1 }
+});

package/support/test/models/suggest.ts

@@ -0,0 +1,52 @@
+import { Model } from '@travetto/model';
+import { sortedIndex } from '../../../src/indexes.ts';
+
+// 60 'ap'-prefixed names, 60 'ba'-prefixed names, 20 'ch'-prefixed names = 140 total
+const AP_NAMES = [
+  'apple', 'apricot', 'apostle', 'apathy', 'apex', 'apiece', 'aplomb', 'apnea',
+  'apollo', 'apparel', 'appeal', 'appear', 'append', 'apple2', 'applet', 'apply',
+  'appoint', 'appraise', 'approve', 'aptitude', 'aptly', 'aport', 'apogee', 'apron',
+  'apse', 'apt', 'aped', 'aper', 'apes', 'aphis', 'apia', 'apian',
+  'apiary', 'apical', 'apices', 'apiece2', 'apish', 'apism', 'aply', 'apneal',
+  'apostate', 'apothegm', 'appease', 'appetize', 'applaud', 'applause', 'apple3', 'apple4',
+  'apple5', 'apple6', 'apple7', 'apple8', 'apple9', 'apple10', 'apple11', 'apple12',
+  'apple13', 'apple14', 'apple15', 'apple16',
+];
+
+const BA_NAMES = [
+  'banana', 'bamboo', 'banjo', 'bandit', 'banner', 'banyan', 'barley', 'barrel',
+  'basil', 'basket', 'bassoon', 'bathe', 'battle', 'bayou', 'bazaar', 'babble',
+  'badger', 'baffle', 'ballad', 'ballet', 'ballot', 'balm', 'bamboo2', 'bandage',
+  'bangle', 'banter', 'barb', 'bard', 'bargain', 'bark', 'barn', 'barrage',
+  'barrier', 'baste', 'batch', 'bathe2', 'baton', 'batter', 'beacon', 'beak',
+  'balance', 'bale', 'baleful', 'balk', 'ballast', 'bane', 'banish', 'bank',
+  'bankroll', 'bare', 'barely', 'barren', 'barricade', 'bay', 'baying', 'bayonet',
+  'bazooka', 'backpack', 'backstop', 'badminton',
+];
+
+const CH_NAMES = [
+  'cherry', 'citrus', 'charm', 'chair', 'chalk', 'chance', 'change', 'channel',
+  'chant', 'chapel', 'chapter', 'charge', 'chart', 'chase', 'chasm', 'cheap',
+  'cheer', 'chess', 'chest', 'chime',
+];
+
+export const SUGGEST_DATA = [
+  ...AP_NAMES,
+  ...BA_NAMES,
+  ...CH_NAMES,
+];
+
+@Model('suggestItem')
+export class SuggestItem {
+  id: string;
+  name: string;
+  age?: number;
+}
+
+export const suggestSort = sortedIndex(SuggestItem, {
+  name: 'sortByName',
+  key: {},
+  sort: {
+    name: 1
+  }
+});

package/support/test/polymorphism.ts

@@ -1,7 +1,6 @@
 import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
-import { castTo } from '@travetto/runtime';
 import { Discriminated } from '@travetto/schema';
 import { Model, NotFoundError, SubTypeNotSupportedError } from '@travetto/model';
 
@@ -45,7 +44,7 @@ export abstract class ModelIndexedPolymorphismSuite extends BaseModelSuite<Model
 
   @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(ModelIndexedUtil.isSupported) })
   async polymorphicIndexGet() {
-    const service: ModelIndexedSupport = castTo(await this.service);
+    const service = await this.service;
     const now = 30;
     const [doc, fire, eng] = [
       IndexedDoctor.from({ name: 'bob', specialty: 'feet', age: now }),
@@ -53,7 +52,7 @@ export abstract class ModelIndexedPolymorphismSuite extends BaseModelSuite<Model
       IndexedEngineer.from({ name: 'cob', major: 'oranges', age: now })
     ];
 
-    await this.saveAll(IndexedWorker, [doc, fire, eng]);
+    const updated = await this.saveAll(IndexedWorker, [doc, fire, eng]);
 
     const result = await service.getByIndex(IndexedWorker, workerNameIndex, {
       age: now,
@@ -75,7 +74,7 @@ export abstract class ModelIndexedPolymorphismSuite extends BaseModelSuite<Model
 
   @Test('Polymorphic index', { skip: BaseModelSuite.ifNot(ModelIndexedUtil.isSupported) })
   async polymorphicIndexDelete() {
-    const service: ModelIndexedSupport = castTo(await this.service);
+    const service = await this.service;
     const now = 30;
     const [doc, fire, eng] = [
       IndexedDoctor.from({ name: 'bob', specialty: 'feet', age: now }),