@travetto/model-mongo 6.0.0 → 7.0.0-rc.0

package/README.md

@@ -43,7 +43,7 @@ export class Init {
 }
 ```
 
-where the [MongoModelConfig](https://github.com/travetto/travetto/tree/main/module/model-mongo/src/config.ts#L11) is defined by:
+where the [MongoModelConfig](https://github.com/travetto/travetto/tree/main/module/model-mongo/src/config.ts#L10) is defined by:
 
 **Code: Structure of MongoModelConfig**
 ```typescript
@@ -81,7 +81,6 @@ export class MongoModelConfig {
   /**
    * Mongo client options
    */
-  @Field(Object)
   options: mongo.MongoClientOptions = {};
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "6.0.0",
+  "version": "7.0.0-rc.0",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "mongo",
@@ -25,11 +25,11 @@
     "directory": "module/model-mongo"
   },
   "dependencies": {
-    "@travetto/cli": "^6.0.0",
-    "@travetto/config": "^6.0.0",
-    "@travetto/model": "^6.0.0",
-    "@travetto/model-query": "^6.0.0",
-    "mongodb": "^6.16.0"
+    "@travetto/cli": "^7.0.0-rc.0",
+    "@travetto/config": "^7.0.0-rc.0",
+    "@travetto/model": "^7.0.0-rc.0",
+    "@travetto/model-query": "^7.0.0-rc.0",
+    "mongodb": "^7.0.0"
   },
   "travetto": {
     "displayName": "MongoDB Model Support"

package/src/config.ts

@@ -2,7 +2,6 @@ import type mongo from 'mongodb';
 
 import { TimeSpan, TimeUtil, RuntimeResources, Runtime } from '@travetto/runtime';
 import { Config } from '@travetto/config';
-import { Field } from '@travetto/schema';
 
 /**
  * Mongo model config
@@ -41,7 +40,6 @@ export class MongoModelConfig {
   /**
    * Mongo client options
    */
-  @Field(Object)
   options: mongo.MongoClientOptions = {};
 
   /**

package/src/internal/util.ts

@@ -5,7 +5,7 @@ import {
 import { AppError, castTo, Class, toConcrete, TypedObject } from '@travetto/runtime';
 import { type DistanceUnit, type PageableModelQuery, type WhereClause, ModelQueryUtil } from '@travetto/model-query';
 import type { ModelType, IndexField, IndexConfig } from '@travetto/model';
-import { DataUtil, SchemaRegistry, type Point } from '@travetto/schema';
+import { DataUtil, SchemaRegistryIndex, type Point } from '@travetto/schema';
 
 const PointImpl = toConcrete<Point>();
 
@@ -80,14 +80,14 @@ export class MongoUtil {
 
   /**/
   static extractSimple<T>(base: Class<T> | undefined, o: Record<string, unknown>, path: string = '', recursive: boolean = true): Record<string, unknown> {
-    const schema = base ? SchemaRegistry.get(base) : undefined;
+    const fields = base ? SchemaRegistryIndex.getOptionalConfig(base)?.fields : undefined;
     const out: Record<string, unknown> = {};
     const sub = o;
     const keys = Object.keys(sub);
     for (const key of keys) {
       const subpath = `${path}${key}`;
       const v: Record<string, unknown> = castTo(sub[key]);
-      const subField = schema?.totalView.schema[key];
+      const subField = fields?.[key];
 
       const isPlain = v && DataUtil.isPlainObject(v);
       const firstKey = isPlain ? Object.keys(v)[0] : '';
@@ -131,7 +131,7 @@ export class MongoUtil {
         } else if (firstKey && '$geoWithin' in v) {
           const coords: [number, number][] = castTo(v.$geoWithin);
           const first = coords[0];
-          const last = coords[coords.length - 1];
+          const last = coords.at(-1)!;
           // Connect if not
           if (first[0] !== last[0] || first[1] !== last[1]) {
             coords.push(first);
@@ -152,7 +152,7 @@ export class MongoUtil {
   static getExtraIndices<T extends ModelType>(cls: Class<T>): BasicIdx[] {
     const out: BasicIdx[] = [];
     const textFields: string[] = [];
-    SchemaRegistry.visitFields(cls, (field, path) => {
+    SchemaRegistryIndex.visitFields(cls, (field, path) => {
       if (field.type === PointImpl) {
         const name = [...path, field].map(x => x.name).join('.');
         out.push({ [name]: '2d' });

package/src/service.ts

@@ -7,7 +7,7 @@ import {
 } from 'mongodb';
 
 import {
-  ModelRegistry, ModelType, OptionalId, ModelCrudSupport, ModelStorageSupport,
+  ModelRegistryIndex, ModelType, OptionalId, ModelCrudSupport, ModelStorageSupport,
   ModelExpirySupport, ModelBulkSupport, ModelIndexedSupport, BulkOp, BulkResponse,
   NotFoundError, ExistsError, ModelBlobSupport,
   ModelCrudUtil, ModelIndexedUtil, ModelStorageUtil, ModelExpiryUtil, ModelBulkUtil, ModelBlobUtil,
@@ -107,7 +107,7 @@ export class MongoModelService implements
       writeConcern: { w: 1 }
     });
     await ModelStorageUtil.registerModelChangeListener(this);
-    ShutdownManager.onGracefulShutdown(() => this.client.close(), this);
+    ShutdownManager.onGracefulShutdown(() => this.client.close());
     ModelExpiryUtil.registerCull(this);
   }
 
@@ -128,7 +128,7 @@ export class MongoModelService implements
 
   async establishIndices<T extends ModelType>(cls: Class<T>): Promise<void> {
     const col = await this.getStore(cls);
-    const creating = MongoUtil.getIndices(cls, ModelRegistry.get(cls).indices);
+    const creating = MongoUtil.getIndices(cls, ModelRegistryIndex.getConfig(cls).indices);
     if (creating.length) {
       console.debug('Creating indexes', { indices: creating });
       for (const el of creating) {
@@ -158,7 +158,7 @@ export class MongoModelService implements
    * Get mongo 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, '_'));
+    return this.#db.collection(ModelRegistryIndex.getStoreName(cls).toLowerCase().replace(/[^A-Za-z0-9_]+/g, '_'));
   }
 
   // Crud
@@ -430,7 +430,7 @@ export class MongoModelService implements
 
   async * listByIndex<T extends ModelType>(cls: Class<T>, idx: string, body?: DeepPartial<T>): AsyncIterable<T> {
     const store = await this.getStore(cls);
-    const idxCfg = ModelRegistry.getIndex(cls, idx, ['sorted', 'unsorted']);
+    const idxCfg = ModelRegistryIndex.getIndex(cls, idx, ['sorted', 'unsorted']);
 
     const where = this.getWhereFilter(
       cls,

package/support/service.mongo.ts

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