@travetto/model-mongo 5.0.17 → 5.0.19

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -107,6 +107,11 @@ export class MongoModelConfig {
    */
   connectionString?: string;
 
+  /**
+   * Should we store the _id as a string in the id field
+   */
+  storeId?: boolean;
+
   /**
    * Load all the ssl certs as needed
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "5.0.17",
+  "version": "5.0.19",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "mongo",
@@ -25,11 +25,11 @@
     "directory": "module/model-mongo"
   },
   "dependencies": {
-    "@travetto/cli": "^5.0.16",
-    "@travetto/config": "^5.0.13",
-    "@travetto/model": "^5.0.14",
-    "@travetto/model-query": "^5.0.14",
-    "mongodb": "^6.10.0"
+    "@travetto/cli": "^5.0.18",
+    "@travetto/config": "^5.0.15",
+    "@travetto/model": "^5.0.16",
+    "@travetto/model-query": "^5.0.16",
+    "mongodb": "^6.12.0"
   },
   "travetto": {
     "displayName": "MongoDB Model Support"

package/src/config.ts

@@ -59,6 +59,11 @@ export class MongoModelConfig {
    */
   connectionString?: string;
 
+  /**
+   * Should we store the _id as a string in the id field
+   */
+  storeId?: boolean;
+
   /**
    * Load all the ssl certs as needed
    */

package/src/internal/util.ts

@@ -1,11 +1,14 @@
-import { Binary, CreateIndexesOptions, FindCursor, IndexDirection, ObjectId } from 'mongodb';
+import {
+  Binary, type CreateIndexesOptions, type Filter, type FindCursor, type IndexDirection, ObjectId, type WithId as MongoWithId
+} from 'mongodb';
 
-import { castTo, Class, TypedObject } from '@travetto/runtime';
-import { DistanceUnit, PageableModelQuery, WhereClause } from '@travetto/model-query';
+import { AppError, castTo, Class, TypedObject } from '@travetto/runtime';
+import type { DistanceUnit, PageableModelQuery, WhereClause } from '@travetto/model-query';
 import type { ModelType, IndexField, IndexConfig } from '@travetto/model';
 import { DataUtil, SchemaRegistry } from '@travetto/schema';
+
 import { ModelQueryUtil } from '@travetto/model-query/src/internal/service/query';
-import { AllViewⲐ } from '@travetto/schema/src/internal/types';
+import { AllViewSymbol } from '@travetto/schema/src/internal/types';
 import { PointImpl } from '@travetto/model-query/src/internal/model/point';
 
 type IdxCfg = CreateIndexesOptions;
@@ -22,8 +25,6 @@ const RADIANS_TO: Record<DistanceUnit, number> = {
 };
 
 export type WithId<T, I = unknown> = T & { _id?: I };
-const isWithId = <T extends ModelType, I = unknown>(o: T): o is WithId<T, I> => o && '_id' in o;
-
 export type BasicIdx = Record<string, IndexDirection>;
 export type PlainIdx = Record<string, -1 | 0 | 1>;
 
@@ -59,24 +60,9 @@ export class MongoUtil {
     }
   }
 
-  static async postLoadId<T extends ModelType>(item: T): Promise<T> {
-    if (isWithId(item)) {
-      delete item._id;
-    }
-    return item;
-  }
-
-  static preInsertId<T extends ModelType>(item: T): T {
-    if (item && item.id) {
-      const itemWithId: WithId<T> = castTo(item);
-      itemWithId._id = this.uuid(item.id);
-    }
-    return item;
-  }
-
-  static extractWhereFilter<T extends ModelType, U extends WhereClause<T>>(cls: Class<T>, where?: U, checkExpiry = true): Record<string, unknown> {
+  static extractWhereFilter<T extends ModelType, U extends WhereClause<T>>(cls: Class<T>, where?: U, checkExpiry = true): Filter<T> {
     where = castTo(ModelQueryUtil.getWhereClause(cls, where, checkExpiry));
-    return where ? this.extractWhereClause(cls, where) : {};
+    return castTo(where ? this.extractWhereClause(cls, where) : {});
   }
 
   /**
@@ -103,58 +89,63 @@ export class MongoUtil {
     for (const key of keys) {
       const subpath = `${path}${key}`;
       const v: Record<string, unknown> = castTo(sub[key]);
-      const subField = schema?.views[AllViewⲐ].schema[key];
+      const subField = schema?.views[AllViewSymbol].schema[key];
 
-      if (subpath === 'id') { // Handle ids directly
-        out._id = typeof v === 'string' ? this.uuid(v) : v;
-      } else {
-        const isPlain = v && DataUtil.isPlainObject(v);
-        const firstKey = isPlain ? Object.keys(v)[0] : '';
+      const isPlain = v && DataUtil.isPlainObject(v);
+      const firstKey = isPlain ? Object.keys(v)[0] : '';
 
-        if ((isPlain && !firstKey.startsWith('$')) || v?.constructor?.Ⲑid) {
-          if (recursive) {
-            Object.assign(out, this.extractSimple(subField?.type, v, `${subpath}.`, recursive));
+      if (subpath === 'id') {
+        if (!firstKey) {
+          out._id = Array.isArray(v) ? v.map(x => this.uuid(x)) : this.uuid(`${v}`);
+        } else if (firstKey === '$in' || firstKey === '$nin' || firstKey === '$eq' || firstKey === '$ne') {
+          const temp = v[firstKey];
+          out._id = { [firstKey]: Array.isArray(temp) ? temp.map(x => this.uuid(x)) : this.uuid(`${temp}`) };
+        } else {
+          throw new AppError('Invalid id query');
+        }
+      } else if ((isPlain && !firstKey.startsWith('$')) || v?.constructor?.Ⲑid) {
+        if (recursive) {
+          Object.assign(out, this.extractSimple(subField?.type, v, `${subpath}.`, recursive));
+        } else {
+          out[subpath] = v;
+        }
+      } else {
+        if (firstKey === '$gt' || firstKey === '$lt' || firstKey === '$gte' || firstKey === '$lte') {
+          for (const [sk, sv] of Object.entries(v)) {
+            v[sk] = ModelQueryUtil.resolveComparator(sv);
+          }
+        } else if (firstKey === '$exists' && subField?.array) {
+          const exists = v.$exists;
+          if (!exists) {
+            delete v.$exists;
+            v.$in = [null, []];
           } else {
-            out[subpath] = v;
+            v.$exists = true;
+            v.$nin = [null, []];
           }
-        } else {
-          if (firstKey === '$gt' || firstKey === '$lt' || firstKey === '$gte' || firstKey === '$lte') {
-            for (const [sk, sv] of Object.entries(v)) {
-              v[sk] = ModelQueryUtil.resolveComparator(sv);
-            }
-          } else if (firstKey === '$exists' && subField?.array) {
-            const exists = v.$exists;
-            if (!exists) {
-              delete v.$exists;
-              v.$in = [null, []];
-            } else {
-              v.$exists = true;
-              v.$nin = [null, []];
-            }
-          } else if (firstKey === '$regex') {
-            v.$regex = DataUtil.toRegex(castTo(v.$regex));
-          } else if (firstKey && '$near' in v) {
-            const dist: number = castTo(v.$maxDistance);
-            const distance = dist / RADIANS_TO[(castTo<DistanceUnit>(v.$unit) ?? 'km')];
-            v.$maxDistance = distance;
-            delete v.$unit;
-          } else if (firstKey && '$geoWithin' in v) {
-            const coords: [number, number][] = castTo(v.$geoWithin);
-            const first = coords[0];
-            const last = coords[coords.length - 1];
-            // Connect if not
-            if (first[0] !== last[0] || first[1] !== last[1]) {
-              coords.push(first);
-            }
-            v.$geoWithin = {
-              $geometry: {
-                type: 'Polygon',
-                coordinates: [coords]
-              }
-            };
+        } else if (firstKey === '$regex') {
+          v.$regex = DataUtil.toRegex(castTo(v.$regex));
+        } else if (firstKey && '$near' in v) {
+          const dist: number = castTo(v.$maxDistance);
+          const distance = dist / RADIANS_TO[(castTo<DistanceUnit>(v.$unit) ?? 'km')];
+          v.$maxDistance = distance;
+          delete v.$unit;
+        } else if (firstKey && '$geoWithin' in v) {
+          const coords: [number, number][] = castTo(v.$geoWithin);
+          const first = coords[0];
+          const last = coords[coords.length - 1];
+          // Connect if not
+          if (first[0] !== last[0] || first[1] !== last[1]) {
+            coords.push(first);
           }
-          out[subpath] = v;
+          v.$geoWithin = {
+            $geometry: {
+              type: 'Polygon',
+              coordinates: [coords]
+            }
+          };
         }
+        out[subpath === 'id' ? '_id' : subpath] = v;
       }
     }
     return out;
@@ -197,7 +188,7 @@ export class MongoUtil {
     ].map(x => [...x]);
   }
 
-  static prepareCursor<T extends ModelType>(cls: Class<T>, cursor: FindCursor<T>, query: PageableModelQuery<T>): FindCursor<T> {
+  static prepareCursor<T extends ModelType>(cls: Class<T>, cursor: FindCursor<T | MongoWithId<T>>, query: PageableModelQuery<T>): FindCursor<T> {
     if (query.select) {
       const selectKey = Object.keys(query.select)[0];
       const select = typeof selectKey === 'string' && selectKey.startsWith('$') ? query.select : this.extractSimple(cls, query.select);
@@ -221,6 +212,6 @@ export class MongoUtil {
       cursor = cursor.skip(Math.trunc(query.offset ?? 0));
     }
 
-    return cursor;
+    return castTo(cursor);
   }
 }

package/src/service.ts

@@ -1,6 +1,10 @@
 import { pipeline } from 'node:stream/promises';
 
-import { type Db, GridFSBucket, MongoClient, type GridFSFile, type Collection, type ObjectId, type Binary, type RootFilterOperators } from 'mongodb';
+import {
+  type Db, GridFSBucket, MongoClient, type GridFSFile, type Collection,
+  type ObjectId, type Binary, type RootFilterOperators, type Filter,
+  type WithId as MongoWithId
+} from 'mongodb';
 
 import {
   ModelRegistry, ModelType, OptionalId, ModelCrudSupport, ModelStorageSupport,
@@ -32,7 +36,7 @@ import { MODEL_BLOB, ModelBlobNamespace, ModelBlobUtil } from '@travetto/model/s
 import { MongoUtil, PlainIdx, WithId } from './internal/util';
 import { MongoModelConfig } from './config';
 
-const ListIndexⲐ = Symbol.for('@travetto/mongo-model:list-index');
+const ListIndexSymbol = Symbol.for('@travetto/mongo-model:list-index');
 
 type BlobRaw = GridFSFile & { metadata?: BlobMeta };
 
@@ -56,6 +60,40 @@ export class MongoModelService implements
 
   constructor(public readonly config: MongoModelConfig) { }
 
+  restoreId(item: { id?: string, _id?: unknown }): void {
+    if (item._id) {
+      item.id ??= MongoUtil.idToString(castTo(item._id));
+      delete item._id;
+    }
+  }
+
+  async postLoad<T extends ModelType>(cls: Class<T>, item: T | MongoWithId<T>): Promise<T> {
+    this.restoreId(item);
+    return await ModelCrudUtil.load(cls, item);
+  }
+
+  postUpdate<T extends ModelType>(item: T, id?: string): T {
+    if (id) {
+      item.id ??= id;
+    }
+    this.restoreId(item);
+    return item;
+  }
+
+  preUpdate<T extends OptionalId<ModelType>>(item: T & { _id?: Binary, id: string }): string;
+  preUpdate<T extends OptionalId<ModelType>>(item: Omit<T, 'id'> & { _id?: Binary }): undefined;
+  preUpdate<T extends OptionalId<ModelType>>(item: T & { _id?: Binary, id: undefined }): undefined;
+  preUpdate<T extends OptionalId<ModelType>>(item: T & { _id?: Binary, id?: string }): string | undefined {
+    if (item && item.id) {
+      const id = item.id;
+      item._id = MongoUtil.uuid(id);
+      if (!this.config.storeId) {
+        delete item.id;
+      }
+      return id;
+    }
+  }
+
   async #describeBlobRaw(location: string): Promise<BlobRaw> {
     const files: BlobRaw[] = await this.#bucket.find({ filename: location }, { limit: 1 }).toArray();
 
@@ -78,8 +116,12 @@ export class MongoModelService implements
     ModelExpiryUtil.registerCull(this);
   }
 
-  getWhereFilter<T extends ModelType>(cls: Class<T>, where: WhereClause<T>, checkExpiry = true): Record<string, unknown> {
-    return MongoUtil.extractWhereFilter(cls, where, checkExpiry);
+  getWhereFilter<T extends ModelType>(cls: Class<T>, where: WhereClause<T>, checkExpiry = true): Filter<T> {
+    return castTo(MongoUtil.extractWhereFilter(cls, where, checkExpiry));
+  }
+
+  getIdFilter<T extends ModelType>(cls: Class<T>, id: string, checkExpiry = true): Filter<T> {
+    return this.getWhereFilter(cls, castTo({ _id: MongoUtil.uuid(id) }), checkExpiry);
   }
 
   // Storage
@@ -120,73 +162,75 @@ export class MongoModelService implements
   /**
    * Get mongo collection
    */
-  async getStore<T extends ModelType>(cls: Class<T>): Promise<Collection> {
+  async getStore<T extends ModelType>(cls: Class<T>): Promise<Collection<T>> {
     return this.#db.collection(ModelRegistry.getStore(cls).toLowerCase().replace(/[^A-Za-z0-9_]+/g, '_'));
   }
 
   // Crud
   async get<T extends ModelType>(cls: Class<T>, id: string): Promise<T> {
     const store = await this.getStore(cls);
-    const result = await store.findOne(this.getWhereFilter<ModelType>(cls, { id }), {});
+    const result = await store.findOne(this.getIdFilter(cls, id), {});
     if (result) {
-      const res = await ModelCrudUtil.load(cls, result);
+      const res = await this.postLoad(cls, result);
       if (res) {
-        return MongoUtil.postLoadId(res);
+        return res;
       }
     }
     throw new NotFoundError(cls, id);
   }
 
   async create<T extends ModelType>(cls: Class<T>, item: OptionalId<T>): Promise<T> {
-    const cleaned: WithId<T, Binary> = castTo(await ModelCrudUtil.preStore(cls, item, this));
-    cleaned._id = MongoUtil.uuid(cleaned.id);
+    const cleaned = await ModelCrudUtil.preStore<WithId<T, Binary>>(cls, item, this);
+    const id = this.preUpdate(cleaned);
 
     const store = await this.getStore(cls);
     const result = await store.insertOne(castTo(cleaned));
     if (!result.insertedId) {
-      throw new ExistsError(cls, cleaned.id);
+      throw new ExistsError(cls, id);
     }
-    delete cleaned._id;
-    return cleaned;
+    return this.postUpdate(cleaned, id);
   }
 
   async update<T extends ModelType>(cls: Class<T>, item: T): Promise<T> {
     item = await ModelCrudUtil.preStore(cls, item, this);
+    const id = this.preUpdate(item);
     const store = await this.getStore(cls);
-    const res = await store.replaceOne(this.getWhereFilter<ModelType>(cls, { id: item.id }), item);
+    const res = await store.replaceOne(this.getIdFilter(cls, id), item);
     if (res.matchedCount === 0) {
-      throw new NotFoundError(cls, item.id);
+      throw new NotFoundError(cls, id);
     }
-    return item;
+    return this.postUpdate(item, id);
   }
 
   async upsert<T extends ModelType>(cls: Class<T>, item: OptionalId<T>): Promise<T> {
-    const cleaned = await ModelCrudUtil.preStore(cls, item, this);
+    const cleaned = await ModelCrudUtil.preStore<WithId<T, Binary>>(cls, item, this);
+    const id = this.preUpdate(cleaned);
     const store = await this.getStore(cls);
+
     try {
       await store.updateOne(
-        this.getWhereFilter<ModelType>(cls, { id: cleaned.id }, false),
+        this.getIdFilter(cls, id, false),
         { $set: cleaned },
         { upsert: true }
       );
     } catch (err) {
       if (err instanceof Error && err.message.includes('duplicate key error')) {
-        throw new ExistsError(cls, cleaned.id);
+        throw new ExistsError(cls, id);
       } else {
         throw err;
       }
     }
-    return cleaned;
+    return this.postUpdate(cleaned, id);
   }
 
   async updatePartial<T extends ModelType>(cls: Class<T>, item: Partial<T> & { id: string }, view?: string): Promise<T> {
     const store = await this.getStore(cls);
 
-    let final: Record<string, unknown> = await ModelCrudUtil.prePartialUpdate(cls, item, view);
+    const final = await ModelCrudUtil.prePartialUpdate(cls, item, view);
+    const simple = MongoUtil.extractSimple(cls, final, undefined, false);
 
-    const items = MongoUtil.extractSimple(cls, final, undefined, false);
-    final = Object
-      .entries(items)
+    const operation: Partial<T> = castTo(Object
+      .entries(simple)
       .reduce<Partial<Record<'$unset' | '$set', Record<string, unknown>>>>((acc, [k, v]) => {
         if (v === null || v === undefined) {
           (acc.$unset ??= {})[k] = v;
@@ -194,13 +238,13 @@ export class MongoModelService implements
           (acc.$set ??= {})[k] = v;
         }
         return acc;
-      }, {});
+      }, {}));
 
     const id = item.id;
 
     const res = await store.findOneAndUpdate(
-      this.getWhereFilter<ModelType>(cls, { id }),
-      final,
+      this.getIdFilter(cls, id),
+      operation,
       { returnDocument: 'after', includeResultMetadata: true }
     );
 
@@ -213,7 +257,7 @@ export class MongoModelService implements
 
   async delete<T extends ModelType>(cls: Class<T>, id: string): Promise<void> {
     const store = await this.getStore(cls);
-    const result = await store.deleteOne(this.getWhereFilter<ModelType>(cls, { id }, false));
+    const result = await store.deleteOne(this.getIdFilter(cls, id, false));
     if (result.deletedCount === 0) {
       throw new NotFoundError(cls, id);
     }
@@ -224,7 +268,7 @@ export class MongoModelService implements
     const cursor = store.find(this.getWhereFilter(cls, {}), { timeout: true }).batchSize(100);
     for await (const el of cursor) {
       try {
-        yield MongoUtil.postLoadId(await ModelCrudUtil.load(cls, el));
+        yield await this.postLoad(cls, el);
       } catch (err) {
         if (!(err instanceof NotFoundError)) {
           throw err;
@@ -294,7 +338,7 @@ export class MongoModelService implements
       return out;
     }
 
-    const store = await this.getStore(cls);
+    const store = await this.getStore<Partial<T> & ModelType>(cls);
     const bulk = store.initializeUnorderedBulkOp({ writeConcern: { w: 1 } });
     const { upsertedIds, insertedIds } = await ModelBulkUtil.preStore(cls, operations, this);
 
@@ -302,11 +346,14 @@ export class MongoModelService implements
 
     for (const op of operations) {
       if (op.insert) {
-        bulk.insert(MongoUtil.preInsertId(asFull(op.insert)));
+        this.preUpdate(op.insert);
+        bulk.insert(op.insert);
       } else if (op.upsert) {
-        bulk.find({ _id: MongoUtil.uuid(op.upsert.id!) }).upsert().updateOne({ $set: op.upsert });
+        const id = this.preUpdate(op.upsert);
+        bulk.find({ _id: MongoUtil.uuid(id!) }).upsert().updateOne({ $set: op.upsert });
       } else if (op.update) {
-        bulk.find({ _id: MongoUtil.uuid(op.update.id) }).update({ $set: op.update });
+        const id = this.preUpdate(op.update);
+        bulk.find({ _id: MongoUtil.uuid(id) }).update({ $set: op.update });
       } else if (op.delete) {
         bulk.find({ _id: MongoUtil.uuid(op.delete.id) }).deleteOne();
       }
@@ -314,13 +361,16 @@ export class MongoModelService implements
 
     const res = await bulk.execute({});
 
+    // Restore all ids
     for (const op of operations) {
-      if (op.insert) {
-        MongoUtil.postLoadId(asFull(op.insert));
+      const core = op.insert ?? op.upsert ?? op.update;
+      if (core) {
+        this.postUpdate(asFull(core));
       }
     }
-    for (const [index, _id] of TypedObject.entries(res.upsertedIds)) {
-      out.insertedIds.set(+index, MongoUtil.idToString(castTo(_id)));
+
+    for (const [index, _id] of TypedObject.entries<Record<string, string>>(res.upsertedIds)) {
+      out.insertedIds.set(+index, MongoUtil.idToString(_id));
     }
 
     if (out.counts) {
@@ -361,7 +411,7 @@ export class MongoModelService implements
     if (!result) {
       throw new NotFoundError(`${cls.name}: ${idx}`, key);
     }
-    return await ModelCrudUtil.load(cls, result);
+    return await this.postLoad(cls, result);
   }
 
   async deleteByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>): Promise<void> {
@@ -392,11 +442,11 @@ export class MongoModelService implements
       castTo(ModelIndexedUtil.projectIndex(cls, idx, body, { emptySortValue: { $exists: true } }))
     );
 
-    const sort = castTo<{ [ListIndexⲐ]: PlainIdx }>(idxCfg)[ListIndexⲐ] ??= MongoUtil.getPlainIndex(idxCfg);
+    const sort = castTo<{ [ListIndexSymbol]: PlainIdx }>(idxCfg)[ListIndexSymbol] ??= MongoUtil.getPlainIndex(idxCfg);
     const cursor = store.find(where, { timeout: true }).batchSize(100).sort(castTo(sort));
 
     for await (const el of cursor) {
-      yield (await MongoUtil.postLoadId(await ModelCrudUtil.load(cls, el)));
+      yield await this.postLoad(cls, el);
     }
   }
 
@@ -406,9 +456,9 @@ export class MongoModelService implements
 
     const col = await this.getStore(cls);
     const filter = MongoUtil.extractWhereFilter(cls, query.where);
-    const cursor = col.find<T>(filter, {});
+    const cursor = col.find(filter, {});
     const items = await MongoUtil.prepareCursor(cls, cursor, query).toArray();
-    return await Promise.all(items.map(r => ModelCrudUtil.load(cls, r).then(MongoUtil.postLoadId)));
+    return await Promise.all(items.map(r => this.postLoad(cls, r)));
   }
 
   async queryCount<T extends ModelType>(cls: Class<T>, query: ModelQuery<T>): Promise<number> {
@@ -430,15 +480,16 @@ export class MongoModelService implements
 
     const col = await this.getStore(cls);
     const item = await ModelCrudUtil.preStore(cls, data, this);
+    const id = this.preUpdate(item);
     const where = ModelQueryUtil.getWhereClause(cls, query.where);
-    where.id = item.id;
+    where.id = id;
 
     const filter = MongoUtil.extractWhereFilter(cls, where);
     const res = await col.replaceOne(filter, item);
     if (res.matchedCount === 0) {
-      throw new NotFoundError(cls, item.id);
+      throw new NotFoundError(cls, id);
     }
-    return item;
+    return this.postUpdate(item, id);
   }
 
   async deleteByQuery<T extends ModelType>(cls: Class<T>, query: ModelQuery<T>): Promise<number> {
@@ -454,7 +505,6 @@ export class MongoModelService implements
     await QueryVerifier.verify(cls, query);
 
     const item = await ModelCrudUtil.prePartialUpdate(cls, data);
-
     const col = await this.getStore(cls);
     const items = MongoUtil.extractSimple(cls, item);
     const final = Object.entries(items).reduce<Partial<Record<'$unset' | '$set', Record<string, unknown>>>>(
@@ -468,7 +518,7 @@ export class MongoModelService implements
       }, {});
 
     const filter = MongoUtil.extractWhereFilter(cls, query.where);
-    const res = await col.updateMany(filter, final);
+    const res = await col.updateMany(filter, castTo(final));
     return res.matchedCount;
   }
 
@@ -532,13 +582,12 @@ export class MongoModelService implements
       search = { $search: search, $language: 'en' };
     }
 
-    (query.sort ??= []).unshift({
-      // @ts-expect-error
+    (query.sort ??= []).unshift(castTo<(typeof query.sort[0])>({
       score: { $meta: 'textScore' }
-    });
+    }));
 
-    const cursor = col.find<T>({ $and: [{ $text: search }, filter] }, {});
+    const cursor = col.find(castTo({ $and: [{ $text: search }, filter] }), {});
     const items = await MongoUtil.prepareCursor(cls, cursor, query).toArray();
-    return await Promise.all(items.map(r => ModelCrudUtil.load(cls, r).then(MongoUtil.postLoadId)));
+    return await Promise.all(items.map(r => this.postLoad(cls, r)));
   }
 }

package/support/service.mongo.ts

@@ -1,6 +1,6 @@
 import type { ServiceDescriptor } from '@travetto/cli';
 
-const version = process.env.MONGO_VERSION ?? '7.0';
+const version = process.env.MONGO_VERSION || '8.0';
 
 export const service: ServiceDescriptor = {
   name: 'mongodb',