@travetto/model-mongo 3.4.5 → 4.0.0-rc.1

package/README.md

@@ -48,7 +48,7 @@ where the [MongoModelConfig](https://github.com/travetto/travetto/tree/main/modu
 ```typescript
 import type mongo from 'mongodb';
 
-import { ResourceLoader, GlobalEnv, TimeSpan } from '@travetto/base';
+import { RuntimeResources, Env, TimeSpan } from '@travetto/base';
 import { Config } from '@travetto/config';
 import { Field } from '@travetto/schema';
 
@@ -111,8 +111,7 @@ export class MongoModelConfig {
    * Load all the ssl certs as needed
    */
   async postConstruct(): Promise<void> {
-    const resources = new ResourceLoader();
-    const resolve = (file: string): Promise<string> => resources.resolve(file).then(v => v, () => file);
+    const resolve = (file: string): Promise<string> => RuntimeResources.resolve(file).then(v => v, () => file);
 
     if (this.connectionString) {
       const details = new URL(this.connectionString);
@@ -152,7 +151,7 @@ export class MongoModelConfig {
       }
     }
 
-    if (GlobalEnv.devMode) {
+    if (!Env.production) {
       opts.waitQueueTimeoutMS ??= 1000 * 60 * 60 * 24; // Wait a day in dev mode
     }
   }
@@ -175,4 +174,4 @@ export class MongoModelConfig {
 }
 ```
 
-Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L13) annotation, and so these values can be overridden using the standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Configuration support") resolution paths.The SSL file options in `clientOptions` will automatically be resolved to files when given a path.  This path can be a [ResourceLoader](https://github.com/travetto/travetto/tree/main/module/base/src/resource.ts#L9) path or just a standard file path.
+Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L13) annotation, and so these values can be overridden using the standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Configuration support") resolution paths.The SSL file options in `clientOptions` will automatically be resolved to files when given a path.  This path can be a [ResourceLoader](https://github.com/travetto/travetto/tree/main/module/base/src/resource.ts#L10) path or just a standard file path.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "3.4.5",
+  "version": "4.0.0-rc.1",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "mongo",
@@ -25,13 +25,13 @@
     "directory": "module/model-mongo"
   },
   "dependencies": {
-    "@travetto/config": "^3.4.4",
-    "@travetto/model": "^3.4.5",
-    "@travetto/model-query": "^3.4.5",
+    "@travetto/config": "^4.0.0-rc.1",
+    "@travetto/model": "^4.0.0-rc.1",
+    "@travetto/model-query": "^4.0.0-rc.1",
     "mongodb": "^6.3.0"
   },
   "peerDependencies": {
-    "@travetto/command": "^3.4.3"
+    "@travetto/command": "^4.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/config.ts

@@ -1,6 +1,6 @@
 import type mongo from 'mongodb';
 
-import { ResourceLoader, GlobalEnv, TimeSpan } from '@travetto/base';
+import { RuntimeResources, Env, TimeSpan } from '@travetto/base';
 import { Config } from '@travetto/config';
 import { Field } from '@travetto/schema';
 
@@ -63,8 +63,7 @@ export class MongoModelConfig {
    * Load all the ssl certs as needed
    */
   async postConstruct(): Promise<void> {
-    const resources = new ResourceLoader();
-    const resolve = (file: string): Promise<string> => resources.resolve(file).then(v => v, () => file);
+    const resolve = (file: string): Promise<string> => RuntimeResources.resolve(file).then(v => v, () => file);
 
     if (this.connectionString) {
       const details = new URL(this.connectionString);
@@ -104,7 +103,7 @@ export class MongoModelConfig {
       }
     }
 
-    if (GlobalEnv.devMode) {
+    if (!Env.production) {
       opts.waitQueueTimeoutMS ??= 1000 * 60 * 60 * 24; // Wait a day in dev mode
     }
   }

package/src/internal/util.ts

@@ -1,9 +1,9 @@
 import * as mongo from 'mongodb';
 
-import { Class, DataUtil, ObjectUtil } from '@travetto/base';
+import { Class, ObjectUtil } from '@travetto/base';
 import { DistanceUnit, ModelQuery, Query, WhereClause } from '@travetto/model-query';
 import type { ModelType, IndexField } from '@travetto/model';
-import { SchemaRegistry } from '@travetto/schema';
+import { DataUtil, SchemaRegistry } from '@travetto/schema';
 import { ModelQueryUtil } from '@travetto/model-query/src/internal/service/query';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 

package/src/service.ts

@@ -1,6 +1,7 @@
 // Wildcard import needed here due to packaging issues
 import * as mongo from 'mongodb';
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 
 import {
   ModelRegistry, ModelType, OptionalId,
@@ -79,7 +80,7 @@ export class MongoModelService implements
       writeConcern: { w: 1 }
     });
     await ModelStorageUtil.registerModelChangeListener(this);
-    ShutdownManager.onShutdown(this, () => this.client.close());
+    ShutdownManager.onGracefulShutdown(() => this.client.close(), this);
     ModelExpiryUtil.registerCull(this);
   }
 
@@ -292,9 +293,7 @@ export class MongoModelService implements
       metadata: meta
     });
 
-    await new Promise<unknown>((resolve, reject) => {
-      input.pipe(writeStream).on('finish', resolve).on('error', reject);
-    });
+    await pipeline(input, writeStream);
   }
 
   async getStream(location: string): Promise<Readable> {
@@ -553,7 +552,7 @@ export class MongoModelService implements
   // Facet
   async facet<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, query?: ModelQuery<T>): Promise<{ key: string, count: number }[]> {
     const col = await this.getStore(cls);
-    const pipeline: object[] = [{
+    const aggs: object[] = [{
       $group: {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         _id: `$${field as string}`,
@@ -569,10 +568,10 @@ export class MongoModelService implements
       q = { $and: [q, MongoUtil.prepareQuery(cls, query).filter] };
     }
 
-    pipeline.unshift({ $match: q });
+    aggs.unshift({ $match: q });
 
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const result = (await col.aggregate(pipeline).toArray()) as { _id: mongo.ObjectId, count: number }[];
+    const result = (await col.aggregate(aggs).toArray()) as { _id: mongo.ObjectId, count: number }[];
 
     return result.map(val => ({
       key: MongoUtil.idToString(val._id),

package/support/service.mongo.ts

@@ -1,7 +1,6 @@
-import { Env } from '@travetto/base';
 import type { CommandService } from '@travetto/command';
 
-const version = Env.get('MONGO_VERSION', '7.0');
+const version = process.env.MONGO_VERSION ?? '7.0';
 
 export const service: CommandService = {
   name: 'mongodb',